diff --git a/.gitignore b/.gitignore
index f0bda9039..3211e2985 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ build
 build_output
 firmware.map
 firmware.asm
+tasmota.ino.cpp
 tasmota*.bin
 tasmota*.bin.gz
 tasmota*.map
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dbf41aaf..06d99d492 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,13 @@ All notable changes to this project will be documented in this file.
 ### Added
 - TLS in binary tasmota-zbbridge (#9620)
 
+### Changed
+- PlatformIO library structure redesigned for compilation speed by Jason2866
+
+### Fixed
+- Rule Break not working as expected when ONCE is enabled (#9245)
+- Rule expressions using mems corrupts character pool (#9301)
+
 ## [9.0.0.2] - 20201025
 ### Added
 - Support for Vietnamese language translations by Tâm.NT
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b67fefe6d..778200c95 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -19,13 +19,13 @@ See [migration path](https://tasmota.github.io/docs/Upgrading#migration-path) fo
 
 --- Major change in internal GPIO function representation ---
 
-8. Migrate to **Tasmota 9.x**
+8. Migrate to **Tasmota 9.1**
 
 While fallback or downgrading is common practice it was never supported due to Settings additions or changes in newer releases. Starting with release **v9.1.0 Imogen** the internal GPIO function representation has changed in such a way that fallback is only possible to the latest GPIO configuration before installing **v9.1.0**.
 
 ## Supported Core versions
 
-This release will be supported from ESP8266/Arduino library Core version **2.7.4.3** due to reported security and stability issues on previous Core version. This will also support gzipped binaries.
+This release will be supported from ESP8266/Arduino library Core version **2.7.4.5** due to reported security and stability issues on previous Core version. This will also support gzipped binaries.
 
 Support of Core versions before 2.7.1 has been removed.
 
@@ -39,7 +39,7 @@ For initial configuration this release supports Webserver based **WifiManager**
 
 ## Provided Binary Downloads
 
-The following binary downloads have been compiled with ESP8266/Arduino library core version **2.7.4.3**.
+The following binary downloads have been compiled with ESP8266/Arduino library core version **2.7.4.5**.
 
 - **tasmota.bin** = The Tasmota version with most drivers. **RECOMMENDED RELEASE BINARY**
 - **tasmota-BG.bin** to **tasmota-TW.bin** = The Tasmota version in different languages.
@@ -97,6 +97,7 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota
 - Rotary driver adjusted accordingly if Mi Desk Lamp module is selected (#9399)
 - Tasmota Arduino Core v2.7.4.5 allowing webpassword over 47 characters (#9687)
 - Webserver code optimizations (#9580, #9590)
+- PlatformIO library structure redesigned for compilation speed by Jason2866
 
 ### Fixed
 - Ledlink blink when no network connected regression from v8.3.1.4 (#9292)
@@ -112,6 +113,8 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota
 - Scripter memory alignment (#9608)
 - Zigbee battery percentage (#9607)
 - HassAnyKey anomaly (#9601)
+- Rule Break not working as expected when ONCE is enabled (#9245)
+- Rule expressions using mems corrupts character pool (#9301)
 
 ### Removed
 - Support for direct upgrade from Tasmota versions before v7.0
diff --git a/lib/FT5206_Library/.gitignore b/lib/FT5206_Library/.gitignore
deleted file mode 100755
index 9d2e4113a..000000000
--- a/lib/FT5206_Library/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.vscode
-.DS_Store
\ No newline at end of file
diff --git a/lib/FT5206_Library/README.md b/lib/FT5206_Library/README.md
deleted file mode 100755
index 2d6fffa6b..000000000
--- a/lib/FT5206_Library/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-FT5206 Library
-=====================================
\ No newline at end of file
diff --git a/lib/AT24C256_512/Eeprom24C128_256.cpp b/lib/default/AT24C256_512/Eeprom24C128_256.cpp
similarity index 100%
rename from lib/AT24C256_512/Eeprom24C128_256.cpp
rename to lib/default/AT24C256_512/Eeprom24C128_256.cpp
diff --git a/lib/AT24C256_512/Eeprom24C128_256.h b/lib/default/AT24C256_512/Eeprom24C128_256.h
similarity index 100%
rename from lib/AT24C256_512/Eeprom24C128_256.h
rename to lib/default/AT24C256_512/Eeprom24C128_256.h
diff --git a/lib/AT24C256_512/Eeprom24C512.cpp b/lib/default/AT24C256_512/Eeprom24C512.cpp
similarity index 100%
rename from lib/AT24C256_512/Eeprom24C512.cpp
rename to lib/default/AT24C256_512/Eeprom24C512.cpp
diff --git a/lib/AT24C256_512/Eeprom24C512.h b/lib/default/AT24C256_512/Eeprom24C512.h
similarity index 100%
rename from lib/AT24C256_512/Eeprom24C512.h
rename to lib/default/AT24C256_512/Eeprom24C512.h
diff --git a/lib/AT24C256_512/library.properties b/lib/default/AT24C256_512/library.properties
similarity index 100%
rename from lib/AT24C256_512/library.properties
rename to lib/default/AT24C256_512/library.properties
diff --git a/lib/PubSubClient-EspEasy-2.7.12/.gitignore b/lib/default/PubSubClient-EspEasy-2.7.12/.gitignore
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/.gitignore
rename to lib/default/PubSubClient-EspEasy-2.7.12/.gitignore
diff --git a/lib/PubSubClient-EspEasy-2.7.12/.travis.yml b/lib/default/PubSubClient-EspEasy-2.7.12/.travis.yml
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/.travis.yml
rename to lib/default/PubSubClient-EspEasy-2.7.12/.travis.yml
diff --git a/lib/PubSubClient-EspEasy-2.7.12/CHANGES.txt b/lib/default/PubSubClient-EspEasy-2.7.12/CHANGES.txt
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/CHANGES.txt
rename to lib/default/PubSubClient-EspEasy-2.7.12/CHANGES.txt
diff --git a/lib/PubSubClient-EspEasy-2.7.12/LICENSE.txt b/lib/default/PubSubClient-EspEasy-2.7.12/LICENSE.txt
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/LICENSE.txt
rename to lib/default/PubSubClient-EspEasy-2.7.12/LICENSE.txt
diff --git a/lib/PubSubClient-EspEasy-2.7.12/README.md b/lib/default/PubSubClient-EspEasy-2.7.12/README.md
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/README.md
rename to lib/default/PubSubClient-EspEasy-2.7.12/README.md
diff --git a/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_auth/mqtt_auth.ino b/lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_auth/mqtt_auth.ino
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_auth/mqtt_auth.ino
rename to lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_auth/mqtt_auth.ino
diff --git a/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_basic/mqtt_basic.ino b/lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_basic/mqtt_basic.ino
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_basic/mqtt_basic.ino
rename to lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_basic/mqtt_basic.ino
diff --git a/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_esp8266/mqtt_esp8266.ino b/lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_esp8266/mqtt_esp8266.ino
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_esp8266/mqtt_esp8266.ino
rename to lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_esp8266/mqtt_esp8266.ino
diff --git a/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_large_message/mqtt_large_message.ino b/lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_large_message/mqtt_large_message.ino
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_large_message/mqtt_large_message.ino
rename to lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_large_message/mqtt_large_message.ino
diff --git a/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino b/lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino
rename to lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino
diff --git a/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino b/lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino
rename to lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino
diff --git a/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_stream/mqtt_stream.ino b/lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_stream/mqtt_stream.ino
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_stream/mqtt_stream.ino
rename to lib/default/PubSubClient-EspEasy-2.7.12/examples/mqtt_stream/mqtt_stream.ino
diff --git a/lib/PubSubClient-EspEasy-2.7.12/keywords.txt b/lib/default/PubSubClient-EspEasy-2.7.12/keywords.txt
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/keywords.txt
rename to lib/default/PubSubClient-EspEasy-2.7.12/keywords.txt
diff --git a/lib/PubSubClient-EspEasy-2.7.12/library.json b/lib/default/PubSubClient-EspEasy-2.7.12/library.json
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/library.json
rename to lib/default/PubSubClient-EspEasy-2.7.12/library.json
diff --git a/lib/PubSubClient-EspEasy-2.7.12/library.properties b/lib/default/PubSubClient-EspEasy-2.7.12/library.properties
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/library.properties
rename to lib/default/PubSubClient-EspEasy-2.7.12/library.properties
diff --git a/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.cpp b/lib/default/PubSubClient-EspEasy-2.7.12/src/PubSubClient.cpp
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.cpp
rename to lib/default/PubSubClient-EspEasy-2.7.12/src/PubSubClient.cpp
diff --git a/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h b/lib/default/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h
rename to lib/default/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/.gitignore b/lib/default/PubSubClient-EspEasy-2.7.12/tests/.gitignore
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/.gitignore
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/.gitignore
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/Makefile b/lib/default/PubSubClient-EspEasy-2.7.12/tests/Makefile
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/Makefile
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/Makefile
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/README.md b/lib/default/PubSubClient-EspEasy-2.7.12/tests/README.md
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/README.md
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/README.md
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/connect_spec.cpp b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/connect_spec.cpp
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/connect_spec.cpp
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/connect_spec.cpp
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/keepalive_spec.cpp b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/keepalive_spec.cpp
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/keepalive_spec.cpp
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/keepalive_spec.cpp
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Arduino.h b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Arduino.h
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Arduino.h
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Arduino.h
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/BDDTest.cpp b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/BDDTest.cpp
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/BDDTest.cpp
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/BDDTest.cpp
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/BDDTest.h b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/BDDTest.h
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/BDDTest.h
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/BDDTest.h
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Buffer.cpp b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Buffer.cpp
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Buffer.cpp
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Buffer.cpp
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Buffer.h b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Buffer.h
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Buffer.h
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Buffer.h
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Client.h b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Client.h
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Client.h
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Client.h
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/IPAddress.cpp b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/IPAddress.cpp
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/IPAddress.cpp
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/IPAddress.cpp
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/IPAddress.h b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/IPAddress.h
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/IPAddress.h
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/IPAddress.h
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Print.h b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Print.h
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Print.h
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Print.h
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/ShimClient.cpp b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/ShimClient.cpp
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/ShimClient.cpp
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/ShimClient.cpp
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/ShimClient.h b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/ShimClient.h
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/ShimClient.h
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/ShimClient.h
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Stream.cpp b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Stream.cpp
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Stream.cpp
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Stream.cpp
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Stream.h b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Stream.h
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Stream.h
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/Stream.h
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/trace.h b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/trace.h
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/trace.h
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/lib/trace.h
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/publish_spec.cpp b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/publish_spec.cpp
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/publish_spec.cpp
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/publish_spec.cpp
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/receive_spec.cpp b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/receive_spec.cpp
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/receive_spec.cpp
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/receive_spec.cpp
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/src/subscribe_spec.cpp b/lib/default/PubSubClient-EspEasy-2.7.12/tests/src/subscribe_spec.cpp
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/src/subscribe_spec.cpp
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/src/subscribe_spec.cpp
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/testcases/__init__.py b/lib/default/PubSubClient-EspEasy-2.7.12/tests/testcases/__init__.py
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/testcases/__init__.py
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/testcases/__init__.py
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/testcases/mqtt_basic.py b/lib/default/PubSubClient-EspEasy-2.7.12/tests/testcases/mqtt_basic.py
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/testcases/mqtt_basic.py
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/testcases/mqtt_basic.py
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/testcases/mqtt_publish_in_callback.py b/lib/default/PubSubClient-EspEasy-2.7.12/tests/testcases/mqtt_publish_in_callback.py
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/testcases/mqtt_publish_in_callback.py
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/testcases/mqtt_publish_in_callback.py
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/testcases/settings.py b/lib/default/PubSubClient-EspEasy-2.7.12/tests/testcases/settings.py
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/testcases/settings.py
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/testcases/settings.py
diff --git a/lib/PubSubClient-EspEasy-2.7.12/tests/testsuite.py b/lib/default/PubSubClient-EspEasy-2.7.12/tests/testsuite.py
similarity index 100%
rename from lib/PubSubClient-EspEasy-2.7.12/tests/testsuite.py
rename to lib/default/PubSubClient-EspEasy-2.7.12/tests/testsuite.py
diff --git a/lib/TasmotaSerial-3.1.0/README.md b/lib/default/TasmotaSerial-3.1.0/README.md
similarity index 100%
rename from lib/TasmotaSerial-3.1.0/README.md
rename to lib/default/TasmotaSerial-3.1.0/README.md
diff --git a/lib/TasmotaSerial-3.1.0/examples/swsertest/swsertest.ino b/lib/default/TasmotaSerial-3.1.0/examples/swsertest/swsertest.ino
similarity index 100%
rename from lib/TasmotaSerial-3.1.0/examples/swsertest/swsertest.ino
rename to lib/default/TasmotaSerial-3.1.0/examples/swsertest/swsertest.ino
diff --git a/lib/TasmotaSerial-3.1.0/keywords.txt b/lib/default/TasmotaSerial-3.1.0/keywords.txt
similarity index 100%
rename from lib/TasmotaSerial-3.1.0/keywords.txt
rename to lib/default/TasmotaSerial-3.1.0/keywords.txt
diff --git a/lib/TasmotaSerial-3.1.0/library.json b/lib/default/TasmotaSerial-3.1.0/library.json
similarity index 100%
rename from lib/TasmotaSerial-3.1.0/library.json
rename to lib/default/TasmotaSerial-3.1.0/library.json
diff --git a/lib/TasmotaSerial-3.1.0/library.properties b/lib/default/TasmotaSerial-3.1.0/library.properties
similarity index 100%
rename from lib/TasmotaSerial-3.1.0/library.properties
rename to lib/default/TasmotaSerial-3.1.0/library.properties
diff --git a/lib/TasmotaSerial-3.1.0/src/TasmotaSerial.cpp b/lib/default/TasmotaSerial-3.1.0/src/TasmotaSerial.cpp
similarity index 100%
rename from lib/TasmotaSerial-3.1.0/src/TasmotaSerial.cpp
rename to lib/default/TasmotaSerial-3.1.0/src/TasmotaSerial.cpp
diff --git a/lib/TasmotaSerial-3.1.0/src/TasmotaSerial.h b/lib/default/TasmotaSerial-3.1.0/src/TasmotaSerial.h
similarity index 100%
rename from lib/TasmotaSerial-3.1.0/src/TasmotaSerial.h
rename to lib/default/TasmotaSerial-3.1.0/src/TasmotaSerial.h
diff --git a/lib/UdpListener/library.properties b/lib/default/UdpListener/library.properties
similarity index 100%
rename from lib/UdpListener/library.properties
rename to lib/default/UdpListener/library.properties
diff --git a/lib/UdpListener/src/UdpListener.h b/lib/default/UdpListener/src/UdpListener.h
similarity index 100%
rename from lib/UdpListener/src/UdpListener.h
rename to lib/default/UdpListener/src/UdpListener.h
diff --git a/lib/Unishox-1.0-shadinger/generator/generator.c b/lib/default/Unishox-1.0-shadinger/generator/generator.c
similarity index 100%
rename from lib/Unishox-1.0-shadinger/generator/generator.c
rename to lib/default/Unishox-1.0-shadinger/generator/generator.c
diff --git a/lib/Unishox-1.0-shadinger/generator/remapping.xlsx b/lib/default/Unishox-1.0-shadinger/generator/remapping.xlsx
similarity index 100%
rename from lib/Unishox-1.0-shadinger/generator/remapping.xlsx
rename to lib/default/Unishox-1.0-shadinger/generator/remapping.xlsx
diff --git a/lib/Unishox-1.0-shadinger/library.properties b/lib/default/Unishox-1.0-shadinger/library.properties
similarity index 100%
rename from lib/Unishox-1.0-shadinger/library.properties
rename to lib/default/Unishox-1.0-shadinger/library.properties
diff --git a/lib/Unishox-1.0-shadinger/python/unishox.py b/lib/default/Unishox-1.0-shadinger/python/unishox.py
similarity index 100%
rename from lib/Unishox-1.0-shadinger/python/unishox.py
rename to lib/default/Unishox-1.0-shadinger/python/unishox.py
diff --git a/lib/Unishox-1.0-shadinger/src/unishox.cpp b/lib/default/Unishox-1.0-shadinger/src/unishox.cpp
similarity index 100%
rename from lib/Unishox-1.0-shadinger/src/unishox.cpp
rename to lib/default/Unishox-1.0-shadinger/src/unishox.cpp
diff --git a/lib/Unishox-1.0-shadinger/src/unishox.h b/lib/default/Unishox-1.0-shadinger/src/unishox.h
similarity index 100%
rename from lib/Unishox-1.0-shadinger/src/unishox.h
rename to lib/default/Unishox-1.0-shadinger/src/unishox.h
diff --git a/lib/esp-knx-ip-0.5.2/DPT.h b/lib/default/headers/DPT.h
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/DPT.h
rename to lib/default/headers/DPT.h
diff --git a/lib/esp-knx-ip-0.5.2/esp-knx-ip.h b/lib/default/headers/esp-knx-ip.h
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/esp-knx-ip.h
rename to lib/default/headers/esp-knx-ip.h
diff --git a/lib/default/headers/readme.txt b/lib/default/headers/readme.txt
new file mode 100644
index 000000000..695df2dcb
--- /dev/null
+++ b/lib/default/headers/readme.txt
@@ -0,0 +1 @@
+KNX header files. Workaround to exclude KNX library when not needed
diff --git a/lib/jsmn-shadinger-1.0/README.md b/lib/default/jsmn-shadinger-1.0/README.md
similarity index 100%
rename from lib/jsmn-shadinger-1.0/README.md
rename to lib/default/jsmn-shadinger-1.0/README.md
diff --git a/lib/jsmn-shadinger-1.0/library.properties b/lib/default/jsmn-shadinger-1.0/library.properties
similarity index 100%
rename from lib/jsmn-shadinger-1.0/library.properties
rename to lib/default/jsmn-shadinger-1.0/library.properties
diff --git a/lib/jsmn-shadinger-1.0/src/JsonGenerator.cpp b/lib/default/jsmn-shadinger-1.0/src/JsonGenerator.cpp
similarity index 100%
rename from lib/jsmn-shadinger-1.0/src/JsonGenerator.cpp
rename to lib/default/jsmn-shadinger-1.0/src/JsonGenerator.cpp
diff --git a/lib/jsmn-shadinger-1.0/src/JsonGenerator.h b/lib/default/jsmn-shadinger-1.0/src/JsonGenerator.h
similarity index 100%
rename from lib/jsmn-shadinger-1.0/src/JsonGenerator.h
rename to lib/default/jsmn-shadinger-1.0/src/JsonGenerator.h
diff --git a/lib/jsmn-shadinger-1.0/src/JsonParser.cpp b/lib/default/jsmn-shadinger-1.0/src/JsonParser.cpp
similarity index 100%
rename from lib/jsmn-shadinger-1.0/src/JsonParser.cpp
rename to lib/default/jsmn-shadinger-1.0/src/JsonParser.cpp
diff --git a/lib/jsmn-shadinger-1.0/src/JsonParser.h b/lib/default/jsmn-shadinger-1.0/src/JsonParser.h
similarity index 100%
rename from lib/jsmn-shadinger-1.0/src/JsonParser.h
rename to lib/default/jsmn-shadinger-1.0/src/JsonParser.h
diff --git a/lib/jsmn-shadinger-1.0/src/jsmn.cpp b/lib/default/jsmn-shadinger-1.0/src/jsmn.cpp
similarity index 100%
rename from lib/jsmn-shadinger-1.0/src/jsmn.cpp
rename to lib/default/jsmn-shadinger-1.0/src/jsmn.cpp
diff --git a/lib/jsmn-shadinger-1.0/src/jsmn.h b/lib/default/jsmn-shadinger-1.0/src/jsmn.h
similarity index 100%
rename from lib/jsmn-shadinger-1.0/src/jsmn.h
rename to lib/default/jsmn-shadinger-1.0/src/jsmn.h
diff --git a/lib/jsmn-shadinger-1.0/test/test-json.cpp b/lib/default/jsmn-shadinger-1.0/test/test-json.cpp
similarity index 100%
rename from lib/jsmn-shadinger-1.0/test/test-json.cpp
rename to lib/default/jsmn-shadinger-1.0/test/test-json.cpp
diff --git a/lib/ESP8266Audio/.github/workflows/pr-or-master-push.yml b/lib/lib_audio/ESP8266Audio/.github/workflows/pr-or-master-push.yml
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/.github/workflows/pr-or-master-push.yml
rename to lib/lib_audio/ESP8266Audio/.github/workflows/pr-or-master-push.yml
diff --git a/lib/ESP8266Audio/LICENSE b/lib/lib_audio/ESP8266Audio/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/LICENSE
rename to lib/lib_audio/ESP8266Audio/LICENSE
diff --git a/lib/ESP8266Audio/README.md b/lib/lib_audio/ESP8266Audio/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/README.md
rename to lib/lib_audio/ESP8266Audio/README.md
diff --git a/lib/ESP8266Audio/examples/MixerSample/MixerSample.ino b/lib/lib_audio/ESP8266Audio/examples/MixerSample/MixerSample.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/MixerSample/MixerSample.ino
rename to lib/lib_audio/ESP8266Audio/examples/MixerSample/MixerSample.ino
diff --git a/lib/ESP8266Audio/examples/MixerSample/viola.h b/lib/lib_audio/ESP8266Audio/examples/MixerSample/viola.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/MixerSample/viola.h
rename to lib/lib_audio/ESP8266Audio/examples/MixerSample/viola.h
diff --git a/lib/ESP8266Audio/examples/PlayAACFromPROGMEM/PlayAACFromPROGMEM.ino b/lib/lib_audio/ESP8266Audio/examples/PlayAACFromPROGMEM/PlayAACFromPROGMEM.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayAACFromPROGMEM/PlayAACFromPROGMEM.ino
rename to lib/lib_audio/ESP8266Audio/examples/PlayAACFromPROGMEM/PlayAACFromPROGMEM.ino
diff --git a/lib/ESP8266Audio/examples/PlayAACFromPROGMEM/homer.aac b/lib/lib_audio/ESP8266Audio/examples/PlayAACFromPROGMEM/homer.aac
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayAACFromPROGMEM/homer.aac
rename to lib/lib_audio/ESP8266Audio/examples/PlayAACFromPROGMEM/homer.aac
diff --git a/lib/ESP8266Audio/examples/PlayAACFromPROGMEM/sampleaac.h b/lib/lib_audio/ESP8266Audio/examples/PlayAACFromPROGMEM/sampleaac.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayAACFromPROGMEM/sampleaac.h
rename to lib/lib_audio/ESP8266Audio/examples/PlayAACFromPROGMEM/sampleaac.h
diff --git a/lib/ESP8266Audio/examples/PlayFLAC-SD-SPDIF/PlayFLAC-SD-SPDIF.ino b/lib/lib_audio/ESP8266Audio/examples/PlayFLAC-SD-SPDIF/PlayFLAC-SD-SPDIF.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayFLAC-SD-SPDIF/PlayFLAC-SD-SPDIF.ino
rename to lib/lib_audio/ESP8266Audio/examples/PlayFLAC-SD-SPDIF/PlayFLAC-SD-SPDIF.ino
diff --git a/lib/ESP8266Audio/examples/PlayFLACFromPROGMEMToDAC/PlayFLACFromPROGMEMToDAC.ino b/lib/lib_audio/ESP8266Audio/examples/PlayFLACFromPROGMEMToDAC/PlayFLACFromPROGMEMToDAC.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayFLACFromPROGMEMToDAC/PlayFLACFromPROGMEMToDAC.ino
rename to lib/lib_audio/ESP8266Audio/examples/PlayFLACFromPROGMEMToDAC/PlayFLACFromPROGMEMToDAC.ino
diff --git a/lib/ESP8266Audio/examples/PlayFLACFromPROGMEMToDAC/sample.h b/lib/lib_audio/ESP8266Audio/examples/PlayFLACFromPROGMEMToDAC/sample.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayFLACFromPROGMEMToDAC/sample.h
rename to lib/lib_audio/ESP8266Audio/examples/PlayFLACFromPROGMEMToDAC/sample.h
diff --git a/lib/ESP8266Audio/examples/PlayMIDIFromLittleFS/PlayMIDIFromLittleFS.ino b/lib/lib_audio/ESP8266Audio/examples/PlayMIDIFromLittleFS/PlayMIDIFromLittleFS.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayMIDIFromLittleFS/PlayMIDIFromLittleFS.ino
rename to lib/lib_audio/ESP8266Audio/examples/PlayMIDIFromLittleFS/PlayMIDIFromLittleFS.ino
diff --git a/lib/ESP8266Audio/examples/PlayMIDIFromLittleFS/data/1mgm.sf2 b/lib/lib_audio/ESP8266Audio/examples/PlayMIDIFromLittleFS/data/1mgm.sf2
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayMIDIFromLittleFS/data/1mgm.sf2
rename to lib/lib_audio/ESP8266Audio/examples/PlayMIDIFromLittleFS/data/1mgm.sf2
diff --git a/lib/ESP8266Audio/examples/PlayMIDIFromLittleFS/data/furelise.mid b/lib/lib_audio/ESP8266Audio/examples/PlayMIDIFromLittleFS/data/furelise.mid
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayMIDIFromLittleFS/data/furelise.mid
rename to lib/lib_audio/ESP8266Audio/examples/PlayMIDIFromLittleFS/data/furelise.mid
diff --git a/lib/ESP8266Audio/examples/PlayMIDIFromSPIFFS/PlayMIDIFromSPIFFS.ino b/lib/lib_audio/ESP8266Audio/examples/PlayMIDIFromSPIFFS/PlayMIDIFromSPIFFS.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayMIDIFromSPIFFS/PlayMIDIFromSPIFFS.ino
rename to lib/lib_audio/ESP8266Audio/examples/PlayMIDIFromSPIFFS/PlayMIDIFromSPIFFS.ino
diff --git a/lib/ESP8266Audio/examples/PlayMIDIFromSPIFFS/data/1mgm.sf2 b/lib/lib_audio/ESP8266Audio/examples/PlayMIDIFromSPIFFS/data/1mgm.sf2
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayMIDIFromSPIFFS/data/1mgm.sf2
rename to lib/lib_audio/ESP8266Audio/examples/PlayMIDIFromSPIFFS/data/1mgm.sf2
diff --git a/lib/ESP8266Audio/examples/PlayMIDIFromSPIFFS/data/furelise.mid b/lib/lib_audio/ESP8266Audio/examples/PlayMIDIFromSPIFFS/data/furelise.mid
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayMIDIFromSPIFFS/data/furelise.mid
rename to lib/lib_audio/ESP8266Audio/examples/PlayMIDIFromSPIFFS/data/furelise.mid
diff --git a/lib/ESP8266Audio/examples/PlayMODFromPROGMEMToDAC/PlayMODFromPROGMEMToDAC.ino b/lib/lib_audio/ESP8266Audio/examples/PlayMODFromPROGMEMToDAC/PlayMODFromPROGMEMToDAC.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayMODFromPROGMEMToDAC/PlayMODFromPROGMEMToDAC.ino
rename to lib/lib_audio/ESP8266Audio/examples/PlayMODFromPROGMEMToDAC/PlayMODFromPROGMEMToDAC.ino
diff --git a/lib/ESP8266Audio/examples/PlayMODFromPROGMEMToDAC/enigma.h b/lib/lib_audio/ESP8266Audio/examples/PlayMODFromPROGMEMToDAC/enigma.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayMODFromPROGMEMToDAC/enigma.h
rename to lib/lib_audio/ESP8266Audio/examples/PlayMODFromPROGMEMToDAC/enigma.h
diff --git a/lib/ESP8266Audio/examples/PlayMP3FromSPIFFS/PlayMP3FromSPIFFS.ino b/lib/lib_audio/ESP8266Audio/examples/PlayMP3FromSPIFFS/PlayMP3FromSPIFFS.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayMP3FromSPIFFS/PlayMP3FromSPIFFS.ino
rename to lib/lib_audio/ESP8266Audio/examples/PlayMP3FromSPIFFS/PlayMP3FromSPIFFS.ino
diff --git a/lib/ESP8266Audio/examples/PlayMP3FromSPIFFS/data/pno-cs.mp3 b/lib/lib_audio/ESP8266Audio/examples/PlayMP3FromSPIFFS/data/pno-cs.mp3
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayMP3FromSPIFFS/data/pno-cs.mp3
rename to lib/lib_audio/ESP8266Audio/examples/PlayMP3FromSPIFFS/data/pno-cs.mp3
diff --git a/lib/ESP8266Audio/examples/PlayMP3ToSPDIF/PlayMP3ToSPDIF.ino b/lib/lib_audio/ESP8266Audio/examples/PlayMP3ToSPDIF/PlayMP3ToSPDIF.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayMP3ToSPDIF/PlayMP3ToSPDIF.ino
rename to lib/lib_audio/ESP8266Audio/examples/PlayMP3ToSPDIF/PlayMP3ToSPDIF.ino
diff --git a/lib/ESP8266Audio/examples/PlayOpusFromSPIFFS/PlayOpusFromSPIFFS.ino b/lib/lib_audio/ESP8266Audio/examples/PlayOpusFromSPIFFS/PlayOpusFromSPIFFS.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayOpusFromSPIFFS/PlayOpusFromSPIFFS.ino
rename to lib/lib_audio/ESP8266Audio/examples/PlayOpusFromSPIFFS/PlayOpusFromSPIFFS.ino
diff --git a/lib/ESP8266Audio/examples/PlayOpusFromSPIFFS/data/gs-16b-2c-44100hz.opus b/lib/lib_audio/ESP8266Audio/examples/PlayOpusFromSPIFFS/data/gs-16b-2c-44100hz.opus
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayOpusFromSPIFFS/data/gs-16b-2c-44100hz.opus
rename to lib/lib_audio/ESP8266Audio/examples/PlayOpusFromSPIFFS/data/gs-16b-2c-44100hz.opus
diff --git a/lib/ESP8266Audio/examples/PlayRTTTLToI2SDAC/PlayRTTTLToI2SDAC.ino b/lib/lib_audio/ESP8266Audio/examples/PlayRTTTLToI2SDAC/PlayRTTTLToI2SDAC.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayRTTTLToI2SDAC/PlayRTTTLToI2SDAC.ino
rename to lib/lib_audio/ESP8266Audio/examples/PlayRTTTLToI2SDAC/PlayRTTTLToI2SDAC.ino
diff --git a/lib/ESP8266Audio/examples/PlayWAVFromPROGMEM/PlayWAVFromPROGMEM.ino b/lib/lib_audio/ESP8266Audio/examples/PlayWAVFromPROGMEM/PlayWAVFromPROGMEM.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayWAVFromPROGMEM/PlayWAVFromPROGMEM.ino
rename to lib/lib_audio/ESP8266Audio/examples/PlayWAVFromPROGMEM/PlayWAVFromPROGMEM.ino
diff --git a/lib/ESP8266Audio/examples/PlayWAVFromPROGMEM/viola.h b/lib/lib_audio/ESP8266Audio/examples/PlayWAVFromPROGMEM/viola.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/PlayWAVFromPROGMEM/viola.h
rename to lib/lib_audio/ESP8266Audio/examples/PlayWAVFromPROGMEM/viola.h
diff --git a/lib/ESP8266Audio/examples/StreamMP3FromHTTP/StreamMP3FromHTTP.ino b/lib/lib_audio/ESP8266Audio/examples/StreamMP3FromHTTP/StreamMP3FromHTTP.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/StreamMP3FromHTTP/StreamMP3FromHTTP.ino
rename to lib/lib_audio/ESP8266Audio/examples/StreamMP3FromHTTP/StreamMP3FromHTTP.ino
diff --git a/lib/ESP8266Audio/examples/StreamMP3FromHTTP_SPIRAM/Schema_Spiram.png b/lib/lib_audio/ESP8266Audio/examples/StreamMP3FromHTTP_SPIRAM/Schema_Spiram.png
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/StreamMP3FromHTTP_SPIRAM/Schema_Spiram.png
rename to lib/lib_audio/ESP8266Audio/examples/StreamMP3FromHTTP_SPIRAM/Schema_Spiram.png
diff --git a/lib/ESP8266Audio/examples/StreamMP3FromHTTP_SPIRAM/StreamMP3FromHTTP_SPIRAM.ino b/lib/lib_audio/ESP8266Audio/examples/StreamMP3FromHTTP_SPIRAM/StreamMP3FromHTTP_SPIRAM.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/StreamMP3FromHTTP_SPIRAM/StreamMP3FromHTTP_SPIRAM.ino
rename to lib/lib_audio/ESP8266Audio/examples/StreamMP3FromHTTP_SPIRAM/StreamMP3FromHTTP_SPIRAM.ino
diff --git a/lib/ESP8266Audio/examples/TalkingClockI2S/TalkingClockI2S.ino b/lib/lib_audio/ESP8266Audio/examples/TalkingClockI2S/TalkingClockI2S.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/TalkingClockI2S/TalkingClockI2S.ino
rename to lib/lib_audio/ESP8266Audio/examples/TalkingClockI2S/TalkingClockI2S.ino
diff --git a/lib/ESP8266Audio/examples/WebRadio/WebRadio.ino b/lib/lib_audio/ESP8266Audio/examples/WebRadio/WebRadio.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/WebRadio/WebRadio.ino
rename to lib/lib_audio/ESP8266Audio/examples/WebRadio/WebRadio.ino
diff --git a/lib/ESP8266Audio/examples/WebRadio/web.cpp b/lib/lib_audio/ESP8266Audio/examples/WebRadio/web.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/WebRadio/web.cpp
rename to lib/lib_audio/ESP8266Audio/examples/WebRadio/web.cpp
diff --git a/lib/ESP8266Audio/examples/WebRadio/web.h b/lib/lib_audio/ESP8266Audio/examples/WebRadio/web.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/examples/WebRadio/web.h
rename to lib/lib_audio/ESP8266Audio/examples/WebRadio/web.h
diff --git a/lib/ESP8266Audio/keywords.txt b/lib/lib_audio/ESP8266Audio/keywords.txt
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/keywords.txt
rename to lib/lib_audio/ESP8266Audio/keywords.txt
diff --git a/lib/ESP8266Audio/library.json b/lib/lib_audio/ESP8266Audio/library.json
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/library.json
rename to lib/lib_audio/ESP8266Audio/library.json
diff --git a/lib/ESP8266Audio/library.properties b/lib/lib_audio/ESP8266Audio/library.properties
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/library.properties
rename to lib/lib_audio/ESP8266Audio/library.properties
diff --git a/lib/ESP8266Audio/src/AudioFileSource.h b/lib/lib_audio/ESP8266Audio/src/AudioFileSource.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSource.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSource.h
diff --git a/lib/ESP8266Audio/src/AudioFileSourceBuffer.cpp b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceBuffer.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceBuffer.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceBuffer.cpp
diff --git a/lib/ESP8266Audio/src/AudioFileSourceBuffer.h b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceBuffer.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceBuffer.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceBuffer.h
diff --git a/lib/ESP8266Audio/src/AudioFileSourceFATFS.h b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceFATFS.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceFATFS.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceFATFS.h
diff --git a/lib/ESP8266Audio/src/AudioFileSourceFS.cpp b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceFS.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceFS.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceFS.cpp
diff --git a/lib/ESP8266Audio/src/AudioFileSourceFS.h b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceFS.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceFS.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceFS.h
diff --git a/lib/ESP8266Audio/src/AudioFileSourceHTTPStream.cpp b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceHTTPStream.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceHTTPStream.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceHTTPStream.cpp
diff --git a/lib/ESP8266Audio/src/AudioFileSourceHTTPStream.h b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceHTTPStream.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceHTTPStream.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceHTTPStream.h
diff --git a/lib/ESP8266Audio/src/AudioFileSourceICYStream.cpp b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceICYStream.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceICYStream.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceICYStream.cpp
diff --git a/lib/ESP8266Audio/src/AudioFileSourceICYStream.h b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceICYStream.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceICYStream.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceICYStream.h
diff --git a/lib/ESP8266Audio/src/AudioFileSourceID3.cpp b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceID3.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceID3.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceID3.cpp
diff --git a/lib/ESP8266Audio/src/AudioFileSourceID3.h b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceID3.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceID3.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceID3.h
diff --git a/lib/ESP8266Audio/src/AudioFileSourceLittleFS.h b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceLittleFS.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceLittleFS.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceLittleFS.h
diff --git a/lib/ESP8266Audio/src/AudioFileSourcePROGMEM.cpp b/lib/lib_audio/ESP8266Audio/src/AudioFileSourcePROGMEM.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourcePROGMEM.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourcePROGMEM.cpp
diff --git a/lib/ESP8266Audio/src/AudioFileSourcePROGMEM.h b/lib/lib_audio/ESP8266Audio/src/AudioFileSourcePROGMEM.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourcePROGMEM.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourcePROGMEM.h
diff --git a/lib/ESP8266Audio/src/AudioFileSourceSD.cpp b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceSD.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceSD.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceSD.cpp
diff --git a/lib/ESP8266Audio/src/AudioFileSourceSD.h b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceSD.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceSD.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceSD.h
diff --git a/lib/ESP8266Audio/src/AudioFileSourceSPIFFS.h b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceSPIFFS.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceSPIFFS.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceSPIFFS.h
diff --git a/lib/ESP8266Audio/src/AudioFileSourceSPIRAMBuffer.cpp b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceSPIRAMBuffer.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceSPIRAMBuffer.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceSPIRAMBuffer.cpp
diff --git a/lib/ESP8266Audio/src/AudioFileSourceSPIRAMBuffer.h b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceSPIRAMBuffer.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceSPIRAMBuffer.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceSPIRAMBuffer.h
diff --git a/lib/ESP8266Audio/src/AudioFileSourceSTDIO.cpp b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceSTDIO.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceSTDIO.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceSTDIO.cpp
diff --git a/lib/ESP8266Audio/src/AudioFileSourceSTDIO.h b/lib/lib_audio/ESP8266Audio/src/AudioFileSourceSTDIO.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileSourceSTDIO.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileSourceSTDIO.h
diff --git a/lib/ESP8266Audio/src/AudioFileStream.cpp b/lib/lib_audio/ESP8266Audio/src/AudioFileStream.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileStream.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioFileStream.cpp
diff --git a/lib/ESP8266Audio/src/AudioFileStream.h b/lib/lib_audio/ESP8266Audio/src/AudioFileStream.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioFileStream.h
rename to lib/lib_audio/ESP8266Audio/src/AudioFileStream.h
diff --git a/lib/ESP8266Audio/src/AudioGenerator.h b/lib/lib_audio/ESP8266Audio/src/AudioGenerator.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGenerator.h
rename to lib/lib_audio/ESP8266Audio/src/AudioGenerator.h
diff --git a/lib/ESP8266Audio/src/AudioGeneratorAAC.cpp b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorAAC.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorAAC.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorAAC.cpp
diff --git a/lib/ESP8266Audio/src/AudioGeneratorAAC.h b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorAAC.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorAAC.h
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorAAC.h
diff --git a/lib/ESP8266Audio/src/AudioGeneratorFLAC.cpp b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorFLAC.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorFLAC.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorFLAC.cpp
diff --git a/lib/ESP8266Audio/src/AudioGeneratorFLAC.h b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorFLAC.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorFLAC.h
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorFLAC.h
diff --git a/lib/ESP8266Audio/src/AudioGeneratorMIDI.cpp b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorMIDI.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorMIDI.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorMIDI.cpp
diff --git a/lib/ESP8266Audio/src/AudioGeneratorMIDI.h b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorMIDI.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorMIDI.h
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorMIDI.h
diff --git a/lib/ESP8266Audio/src/AudioGeneratorMOD.cpp b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorMOD.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorMOD.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorMOD.cpp
diff --git a/lib/ESP8266Audio/src/AudioGeneratorMOD.h b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorMOD.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorMOD.h
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorMOD.h
diff --git a/lib/ESP8266Audio/src/AudioGeneratorMP3.cpp b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorMP3.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorMP3.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorMP3.cpp
diff --git a/lib/ESP8266Audio/src/AudioGeneratorMP3.h b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorMP3.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorMP3.h
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorMP3.h
diff --git a/lib/ESP8266Audio/src/AudioGeneratorMP3a.cpp b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorMP3a.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorMP3a.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorMP3a.cpp
diff --git a/lib/ESP8266Audio/src/AudioGeneratorMP3a.h b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorMP3a.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorMP3a.h
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorMP3a.h
diff --git a/lib/ESP8266Audio/src/AudioGeneratorOpus.cpp b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorOpus.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorOpus.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorOpus.cpp
diff --git a/lib/ESP8266Audio/src/AudioGeneratorOpus.h b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorOpus.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorOpus.h
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorOpus.h
diff --git a/lib/ESP8266Audio/src/AudioGeneratorRTTTL.cpp b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorRTTTL.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorRTTTL.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorRTTTL.cpp
diff --git a/lib/ESP8266Audio/src/AudioGeneratorRTTTL.h b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorRTTTL.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorRTTTL.h
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorRTTTL.h
diff --git a/lib/ESP8266Audio/src/AudioGeneratorTalkie.cpp b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorTalkie.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorTalkie.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorTalkie.cpp
diff --git a/lib/ESP8266Audio/src/AudioGeneratorTalkie.h b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorTalkie.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorTalkie.h
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorTalkie.h
diff --git a/lib/ESP8266Audio/src/AudioGeneratorWAV.cpp b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorWAV.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorWAV.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorWAV.cpp
diff --git a/lib/ESP8266Audio/src/AudioGeneratorWAV.h b/lib/lib_audio/ESP8266Audio/src/AudioGeneratorWAV.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioGeneratorWAV.h
rename to lib/lib_audio/ESP8266Audio/src/AudioGeneratorWAV.h
diff --git a/lib/ESP8266Audio/src/AudioLogger.cpp b/lib/lib_audio/ESP8266Audio/src/AudioLogger.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioLogger.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioLogger.cpp
diff --git a/lib/ESP8266Audio/src/AudioLogger.h b/lib/lib_audio/ESP8266Audio/src/AudioLogger.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioLogger.h
rename to lib/lib_audio/ESP8266Audio/src/AudioLogger.h
diff --git a/lib/ESP8266Audio/src/AudioOutput.h b/lib/lib_audio/ESP8266Audio/src/AudioOutput.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutput.h
rename to lib/lib_audio/ESP8266Audio/src/AudioOutput.h
diff --git a/lib/ESP8266Audio/src/AudioOutputBuffer.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputBuffer.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputBuffer.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputBuffer.cpp
diff --git a/lib/ESP8266Audio/src/AudioOutputBuffer.h b/lib/lib_audio/ESP8266Audio/src/AudioOutputBuffer.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputBuffer.h
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputBuffer.h
diff --git a/lib/ESP8266Audio/src/AudioOutputFilterDecimate.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputFilterDecimate.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputFilterDecimate.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputFilterDecimate.cpp
diff --git a/lib/ESP8266Audio/src/AudioOutputFilterDecimate.h b/lib/lib_audio/ESP8266Audio/src/AudioOutputFilterDecimate.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputFilterDecimate.h
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputFilterDecimate.h
diff --git a/lib/ESP8266Audio/src/AudioOutputI2S.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputI2S.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.cpp
diff --git a/lib/ESP8266Audio/src/AudioOutputI2S.h b/lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputI2S.h
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.h
diff --git a/lib/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp
diff --git a/lib/ESP8266Audio/src/AudioOutputI2SNoDAC.h b/lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputI2SNoDAC.h
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.h
diff --git a/lib/ESP8266Audio/src/AudioOutputMixer.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputMixer.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputMixer.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputMixer.cpp
diff --git a/lib/ESP8266Audio/src/AudioOutputMixer.h b/lib/lib_audio/ESP8266Audio/src/AudioOutputMixer.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputMixer.h
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputMixer.h
diff --git a/lib/ESP8266Audio/src/AudioOutputNull.h b/lib/lib_audio/ESP8266Audio/src/AudioOutputNull.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputNull.h
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputNull.h
diff --git a/lib/ESP8266Audio/src/AudioOutputSPDIF.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputSPDIF.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputSPDIF.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputSPDIF.cpp
diff --git a/lib/ESP8266Audio/src/AudioOutputSPDIF.h b/lib/lib_audio/ESP8266Audio/src/AudioOutputSPDIF.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputSPDIF.h
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputSPDIF.h
diff --git a/lib/ESP8266Audio/src/AudioOutputSPIFFSWAV.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputSPIFFSWAV.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputSPIFFSWAV.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputSPIFFSWAV.cpp
diff --git a/lib/ESP8266Audio/src/AudioOutputSPIFFSWAV.h b/lib/lib_audio/ESP8266Audio/src/AudioOutputSPIFFSWAV.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputSPIFFSWAV.h
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputSPIFFSWAV.h
diff --git a/lib/ESP8266Audio/src/AudioOutputSTDIO.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputSTDIO.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputSTDIO.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputSTDIO.cpp
diff --git a/lib/ESP8266Audio/src/AudioOutputSTDIO.h b/lib/lib_audio/ESP8266Audio/src/AudioOutputSTDIO.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputSTDIO.h
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputSTDIO.h
diff --git a/lib/ESP8266Audio/src/AudioOutputSerialWAV.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputSerialWAV.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputSerialWAV.cpp
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputSerialWAV.cpp
diff --git a/lib/ESP8266Audio/src/AudioOutputSerialWAV.h b/lib/lib_audio/ESP8266Audio/src/AudioOutputSerialWAV.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioOutputSerialWAV.h
rename to lib/lib_audio/ESP8266Audio/src/AudioOutputSerialWAV.h
diff --git a/lib/ESP8266Audio/src/AudioStatus.h b/lib/lib_audio/ESP8266Audio/src/AudioStatus.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/AudioStatus.h
rename to lib/lib_audio/ESP8266Audio/src/AudioStatus.h
diff --git a/lib/ESP8266Audio/src/driver/SinglePinI2SDriver.cpp b/lib/lib_audio/ESP8266Audio/src/driver/SinglePinI2SDriver.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/driver/SinglePinI2SDriver.cpp
rename to lib/lib_audio/ESP8266Audio/src/driver/SinglePinI2SDriver.cpp
diff --git a/lib/ESP8266Audio/src/driver/SinglePinI2SDriver.h b/lib/lib_audio/ESP8266Audio/src/driver/SinglePinI2SDriver.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/driver/SinglePinI2SDriver.h
rename to lib/lib_audio/ESP8266Audio/src/driver/SinglePinI2SDriver.h
diff --git a/lib/ESP8266Audio/src/libflac/AUTHORS b/lib/lib_audio/ESP8266Audio/src/libflac/AUTHORS
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/AUTHORS
rename to lib/lib_audio/ESP8266Audio/src/libflac/AUTHORS
diff --git a/lib/ESP8266Audio/src/libflac/COPYING.FDL b/lib/lib_audio/ESP8266Audio/src/libflac/COPYING.FDL
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/COPYING.FDL
rename to lib/lib_audio/ESP8266Audio/src/libflac/COPYING.FDL
diff --git a/lib/ESP8266Audio/src/libflac/COPYING.GPL b/lib/lib_audio/ESP8266Audio/src/libflac/COPYING.GPL
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/COPYING.GPL
rename to lib/lib_audio/ESP8266Audio/src/libflac/COPYING.GPL
diff --git a/lib/ESP8266Audio/src/libflac/COPYING.LGPL b/lib/lib_audio/ESP8266Audio/src/libflac/COPYING.LGPL
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/COPYING.LGPL
rename to lib/lib_audio/ESP8266Audio/src/libflac/COPYING.LGPL
diff --git a/lib/ESP8266Audio/src/libflac/COPYING.Xiph b/lib/lib_audio/ESP8266Audio/src/libflac/COPYING.Xiph
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/COPYING.Xiph
rename to lib/lib_audio/ESP8266Audio/src/libflac/COPYING.Xiph
diff --git a/lib/ESP8266Audio/src/libflac/FLAC/assert.h b/lib/lib_audio/ESP8266Audio/src/libflac/FLAC/assert.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/FLAC/assert.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/FLAC/assert.h
diff --git a/lib/ESP8266Audio/src/libflac/FLAC/callback.h b/lib/lib_audio/ESP8266Audio/src/libflac/FLAC/callback.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/FLAC/callback.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/FLAC/callback.h
diff --git a/lib/ESP8266Audio/src/libflac/FLAC/export.h b/lib/lib_audio/ESP8266Audio/src/libflac/FLAC/export.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/FLAC/export.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/FLAC/export.h
diff --git a/lib/ESP8266Audio/src/libflac/FLAC/format.h b/lib/lib_audio/ESP8266Audio/src/libflac/FLAC/format.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/FLAC/format.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/FLAC/format.h
diff --git a/lib/ESP8266Audio/src/libflac/FLAC/metadata.h b/lib/lib_audio/ESP8266Audio/src/libflac/FLAC/metadata.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/FLAC/metadata.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/FLAC/metadata.h
diff --git a/lib/ESP8266Audio/src/libflac/FLAC/ordinals.h b/lib/lib_audio/ESP8266Audio/src/libflac/FLAC/ordinals.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/FLAC/ordinals.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/FLAC/ordinals.h
diff --git a/lib/ESP8266Audio/src/libflac/FLAC/stream_decoder.h b/lib/lib_audio/ESP8266Audio/src/libflac/FLAC/stream_decoder.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/FLAC/stream_decoder.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/FLAC/stream_decoder.h
diff --git a/lib/ESP8266Audio/src/libflac/README b/lib/lib_audio/ESP8266Audio/src/libflac/README
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/README
rename to lib/lib_audio/ESP8266Audio/src/libflac/README
diff --git a/lib/ESP8266Audio/src/libflac/README.ESP8266 b/lib/lib_audio/ESP8266Audio/src/libflac/README.ESP8266
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/README.ESP8266
rename to lib/lib_audio/ESP8266Audio/src/libflac/README.ESP8266
diff --git a/lib/ESP8266Audio/src/libflac/bitmath.c b/lib/lib_audio/ESP8266Audio/src/libflac/bitmath.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/bitmath.c
rename to lib/lib_audio/ESP8266Audio/src/libflac/bitmath.c
diff --git a/lib/ESP8266Audio/src/libflac/bitreader.c b/lib/lib_audio/ESP8266Audio/src/libflac/bitreader.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/bitreader.c
rename to lib/lib_audio/ESP8266Audio/src/libflac/bitreader.c
diff --git a/lib/ESP8266Audio/src/libflac/config.h b/lib/lib_audio/ESP8266Audio/src/libflac/config.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/config.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/config.h
diff --git a/lib/ESP8266Audio/src/libflac/cpu.c b/lib/lib_audio/ESP8266Audio/src/libflac/cpu.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/cpu.c
rename to lib/lib_audio/ESP8266Audio/src/libflac/cpu.c
diff --git a/lib/ESP8266Audio/src/libflac/crc.c b/lib/lib_audio/ESP8266Audio/src/libflac/crc.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/crc.c
rename to lib/lib_audio/ESP8266Audio/src/libflac/crc.c
diff --git a/lib/ESP8266Audio/src/libflac/fixed.c b/lib/lib_audio/ESP8266Audio/src/libflac/fixed.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/fixed.c
rename to lib/lib_audio/ESP8266Audio/src/libflac/fixed.c
diff --git a/lib/ESP8266Audio/src/libflac/float.c b/lib/lib_audio/ESP8266Audio/src/libflac/float.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/float.c
rename to lib/lib_audio/ESP8266Audio/src/libflac/float.c
diff --git a/lib/ESP8266Audio/src/libflac/format.c b/lib/lib_audio/ESP8266Audio/src/libflac/format.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/format.c
rename to lib/lib_audio/ESP8266Audio/src/libflac/format.c
diff --git a/lib/ESP8266Audio/src/libflac/lpc.c b/lib/lib_audio/ESP8266Audio/src/libflac/lpc.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/lpc.c
rename to lib/lib_audio/ESP8266Audio/src/libflac/lpc.c
diff --git a/lib/ESP8266Audio/src/libflac/md5.c b/lib/lib_audio/ESP8266Audio/src/libflac/md5.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/md5.c
rename to lib/lib_audio/ESP8266Audio/src/libflac/md5.c
diff --git a/lib/ESP8266Audio/src/libflac/memory.c b/lib/lib_audio/ESP8266Audio/src/libflac/memory.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/memory.c
rename to lib/lib_audio/ESP8266Audio/src/libflac/memory.c
diff --git a/lib/ESP8266Audio/src/libflac/private/bitmath.h b/lib/lib_audio/ESP8266Audio/src/libflac/private/bitmath.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/private/bitmath.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/private/bitmath.h
diff --git a/lib/ESP8266Audio/src/libflac/private/bitreader.h b/lib/lib_audio/ESP8266Audio/src/libflac/private/bitreader.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/private/bitreader.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/private/bitreader.h
diff --git a/lib/ESP8266Audio/src/libflac/private/cpu.h b/lib/lib_audio/ESP8266Audio/src/libflac/private/cpu.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/private/cpu.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/private/cpu.h
diff --git a/lib/ESP8266Audio/src/libflac/private/crc.h b/lib/lib_audio/ESP8266Audio/src/libflac/private/crc.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/private/crc.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/private/crc.h
diff --git a/lib/ESP8266Audio/src/libflac/private/fixed.h b/lib/lib_audio/ESP8266Audio/src/libflac/private/fixed.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/private/fixed.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/private/fixed.h
diff --git a/lib/ESP8266Audio/src/libflac/private/float.h b/lib/lib_audio/ESP8266Audio/src/libflac/private/float.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/private/float.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/private/float.h
diff --git a/lib/ESP8266Audio/src/libflac/private/format.h b/lib/lib_audio/ESP8266Audio/src/libflac/private/format.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/private/format.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/private/format.h
diff --git a/lib/ESP8266Audio/src/libflac/private/lpc.h b/lib/lib_audio/ESP8266Audio/src/libflac/private/lpc.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/private/lpc.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/private/lpc.h
diff --git a/lib/ESP8266Audio/src/libflac/private/macros.h b/lib/lib_audio/ESP8266Audio/src/libflac/private/macros.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/private/macros.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/private/macros.h
diff --git a/lib/ESP8266Audio/src/libflac/private/md5.h b/lib/lib_audio/ESP8266Audio/src/libflac/private/md5.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/private/md5.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/private/md5.h
diff --git a/lib/ESP8266Audio/src/libflac/private/memory.h b/lib/lib_audio/ESP8266Audio/src/libflac/private/memory.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/private/memory.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/private/memory.h
diff --git a/lib/ESP8266Audio/src/libflac/private/metadata.h b/lib/lib_audio/ESP8266Audio/src/libflac/private/metadata.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/private/metadata.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/private/metadata.h
diff --git a/lib/ESP8266Audio/src/libflac/private/window.h b/lib/lib_audio/ESP8266Audio/src/libflac/private/window.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/private/window.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/private/window.h
diff --git a/lib/ESP8266Audio/src/libflac/protected/all.h b/lib/lib_audio/ESP8266Audio/src/libflac/protected/all.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/protected/all.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/protected/all.h
diff --git a/lib/ESP8266Audio/src/libflac/protected/stream_decoder.h b/lib/lib_audio/ESP8266Audio/src/libflac/protected/stream_decoder.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/protected/stream_decoder.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/protected/stream_decoder.h
diff --git a/lib/ESP8266Audio/src/libflac/protected/stream_encoder.h b/lib/lib_audio/ESP8266Audio/src/libflac/protected/stream_encoder.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/protected/stream_encoder.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/protected/stream_encoder.h
diff --git a/lib/ESP8266Audio/src/libflac/share/alloc.h b/lib/lib_audio/ESP8266Audio/src/libflac/share/alloc.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/share/alloc.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/share/alloc.h
diff --git a/lib/ESP8266Audio/src/libflac/share/compat.h b/lib/lib_audio/ESP8266Audio/src/libflac/share/compat.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/share/compat.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/share/compat.h
diff --git a/lib/ESP8266Audio/src/libflac/share/endswap.h b/lib/lib_audio/ESP8266Audio/src/libflac/share/endswap.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/share/endswap.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/share/endswap.h
diff --git a/lib/ESP8266Audio/src/libflac/share/getopt.h b/lib/lib_audio/ESP8266Audio/src/libflac/share/getopt.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/share/getopt.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/share/getopt.h
diff --git a/lib/ESP8266Audio/src/libflac/share/macros.h b/lib/lib_audio/ESP8266Audio/src/libflac/share/macros.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/share/macros.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/share/macros.h
diff --git a/lib/ESP8266Audio/src/libflac/share/private.h b/lib/lib_audio/ESP8266Audio/src/libflac/share/private.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/share/private.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/share/private.h
diff --git a/lib/ESP8266Audio/src/libflac/share/safe_str.h b/lib/lib_audio/ESP8266Audio/src/libflac/share/safe_str.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/share/safe_str.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/share/safe_str.h
diff --git a/lib/ESP8266Audio/src/libflac/share/utf8.h b/lib/lib_audio/ESP8266Audio/src/libflac/share/utf8.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/share/utf8.h
rename to lib/lib_audio/ESP8266Audio/src/libflac/share/utf8.h
diff --git a/lib/ESP8266Audio/src/libflac/stream_decoder.c b/lib/lib_audio/ESP8266Audio/src/libflac/stream_decoder.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/stream_decoder.c
rename to lib/lib_audio/ESP8266Audio/src/libflac/stream_decoder.c
diff --git a/lib/ESP8266Audio/src/libflac/window.c b/lib/lib_audio/ESP8266Audio/src/libflac/window.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libflac/window.c
rename to lib/lib_audio/ESP8266Audio/src/libflac/window.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/aaccommon.h b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/aaccommon.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/aaccommon.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/aaccommon.h
diff --git a/lib/ESP8266Audio/src/libhelix-aac/aacdec.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/aacdec.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/aacdec.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/aacdec.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/aacdec.h b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/aacdec.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/aacdec.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/aacdec.h
diff --git a/lib/ESP8266Audio/src/libhelix-aac/aactabs.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/aactabs.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/aactabs.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/aactabs.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/assembly.h b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/assembly.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/assembly.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/assembly.h
diff --git a/lib/ESP8266Audio/src/libhelix-aac/bitstream.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/bitstream.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/bitstream.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/bitstream.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/bitstream.h b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/bitstream.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/bitstream.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/bitstream.h
diff --git a/lib/ESP8266Audio/src/libhelix-aac/buffers.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/buffers.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/buffers.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/buffers.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/coder.h b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/coder.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/coder.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/coder.h
diff --git a/lib/ESP8266Audio/src/libhelix-aac/dct4.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/dct4.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/dct4.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/dct4.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/decelmnt.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/decelmnt.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/decelmnt.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/decelmnt.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/dequant.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/dequant.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/dequant.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/dequant.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/fft.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/fft.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/fft.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/fft.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/filefmt.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/filefmt.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/filefmt.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/filefmt.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/huffman.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/huffman.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/huffman.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/huffman.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/hufftabs.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/hufftabs.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/hufftabs.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/hufftabs.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/imdct.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/imdct.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/imdct.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/imdct.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/noiseless.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/noiseless.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/noiseless.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/noiseless.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/pns.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/pns.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/pns.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/pns.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/readme.txt b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/readme.txt
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/readme.txt
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/readme.txt
diff --git a/lib/ESP8266Audio/src/libhelix-aac/sbr.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbr.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/sbr.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbr.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/sbr.h b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbr.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/sbr.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbr.h
diff --git a/lib/ESP8266Audio/src/libhelix-aac/sbrfft.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrfft.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/sbrfft.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrfft.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/sbrfreq.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrfreq.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/sbrfreq.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrfreq.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/sbrhfadj.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrhfadj.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/sbrhfadj.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrhfadj.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/sbrhfgen.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrhfgen.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/sbrhfgen.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrhfgen.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/sbrhuff.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrhuff.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/sbrhuff.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrhuff.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/sbrimdct.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrimdct.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/sbrimdct.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrimdct.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/sbrmath.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrmath.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/sbrmath.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrmath.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/sbrqmf.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrqmf.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/sbrqmf.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrqmf.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/sbrside.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrside.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/sbrside.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrside.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/sbrtabs.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrtabs.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/sbrtabs.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/sbrtabs.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/statname.h b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/statname.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/statname.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/statname.h
diff --git a/lib/ESP8266Audio/src/libhelix-aac/stproc.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/stproc.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/stproc.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/stproc.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/tns.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/tns.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/tns.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/tns.c
diff --git a/lib/ESP8266Audio/src/libhelix-aac/trigtabs.c b/lib/lib_audio/ESP8266Audio/src/libhelix-aac/trigtabs.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-aac/trigtabs.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-aac/trigtabs.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/LICENSE.txt b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/LICENSE.txt
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/LICENSE.txt
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/LICENSE.txt
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/RCSL.txt b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/RCSL.txt
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/RCSL.txt
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/RCSL.txt
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/RPSL.txt b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/RPSL.txt
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/RPSL.txt
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/RPSL.txt
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/assembly.h b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/assembly.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/assembly.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/assembly.h
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/bitstream.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/bitstream.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/bitstream.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/bitstream.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/buffers.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/buffers.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/buffers.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/buffers.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/coder.h b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/coder.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/coder.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/coder.h
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/dct32.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/dct32.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/dct32.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/dct32.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/dequant.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/dequant.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/dequant.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/dequant.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/dqchan.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/dqchan.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/dqchan.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/dqchan.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/huffman.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/huffman.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/huffman.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/huffman.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/hufftabs.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/hufftabs.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/hufftabs.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/hufftabs.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/imdct.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/imdct.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/imdct.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/imdct.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/mp3common.h b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/mp3common.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/mp3common.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/mp3common.h
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/mp3dec.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/mp3dec.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/mp3dec.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/mp3dec.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/mp3dec.h b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/mp3dec.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/mp3dec.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/mp3dec.h
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/mp3tabs.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/mp3tabs.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/mp3tabs.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/mp3tabs.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/mpadecobjfixpt.h b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/mpadecobjfixpt.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/mpadecobjfixpt.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/mpadecobjfixpt.h
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/player.h b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/player.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/player.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/player.h
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/polyphase.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/polyphase.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/polyphase.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/polyphase.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/scalfact.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/scalfact.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/scalfact.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/scalfact.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/statname.h b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/statname.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/statname.h
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/statname.h
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/stproc.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/stproc.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/stproc.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/stproc.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/subband.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/subband.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/subband.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/subband.c
diff --git a/lib/ESP8266Audio/src/libhelix-mp3/trigtabs.c b/lib/lib_audio/ESP8266Audio/src/libhelix-mp3/trigtabs.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libhelix-mp3/trigtabs.c
rename to lib/lib_audio/ESP8266Audio/src/libhelix-mp3/trigtabs.c
diff --git a/lib/ESP8266Audio/src/libmad/CHANGES b/lib/lib_audio/ESP8266Audio/src/libmad/CHANGES
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/CHANGES
rename to lib/lib_audio/ESP8266Audio/src/libmad/CHANGES
diff --git a/lib/ESP8266Audio/src/libmad/COPYING b/lib/lib_audio/ESP8266Audio/src/libmad/COPYING
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/COPYING
rename to lib/lib_audio/ESP8266Audio/src/libmad/COPYING
diff --git a/lib/ESP8266Audio/src/libmad/COPYRIGHT b/lib/lib_audio/ESP8266Audio/src/libmad/COPYRIGHT
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/COPYRIGHT
rename to lib/lib_audio/ESP8266Audio/src/libmad/COPYRIGHT
diff --git a/lib/ESP8266Audio/src/libmad/CREDITS b/lib/lib_audio/ESP8266Audio/src/libmad/CREDITS
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/CREDITS
rename to lib/lib_audio/ESP8266Audio/src/libmad/CREDITS
diff --git a/lib/ESP8266Audio/src/libmad/D.dat.h b/lib/lib_audio/ESP8266Audio/src/libmad/D.dat.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/D.dat.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/D.dat.h
diff --git a/lib/ESP8266Audio/src/libmad/LICENSE b/lib/lib_audio/ESP8266Audio/src/libmad/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/LICENSE
rename to lib/lib_audio/ESP8266Audio/src/libmad/LICENSE
diff --git a/lib/ESP8266Audio/src/libmad/README b/lib/lib_audio/ESP8266Audio/src/libmad/README
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/README
rename to lib/lib_audio/ESP8266Audio/src/libmad/README
diff --git a/lib/ESP8266Audio/src/libmad/README.ESP8266 b/lib/lib_audio/ESP8266Audio/src/libmad/README.ESP8266
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/README.ESP8266
rename to lib/lib_audio/ESP8266Audio/src/libmad/README.ESP8266
diff --git a/lib/ESP8266Audio/src/libmad/TODO b/lib/lib_audio/ESP8266Audio/src/libmad/TODO
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/TODO
rename to lib/lib_audio/ESP8266Audio/src/libmad/TODO
diff --git a/lib/ESP8266Audio/src/libmad/VERSION b/lib/lib_audio/ESP8266Audio/src/libmad/VERSION
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/VERSION
rename to lib/lib_audio/ESP8266Audio/src/libmad/VERSION
diff --git a/lib/ESP8266Audio/src/libmad/bit.c b/lib/lib_audio/ESP8266Audio/src/libmad/bit.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/bit.c
rename to lib/lib_audio/ESP8266Audio/src/libmad/bit.c
diff --git a/lib/ESP8266Audio/src/libmad/bit.h b/lib/lib_audio/ESP8266Audio/src/libmad/bit.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/bit.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/bit.h
diff --git a/lib/ESP8266Audio/src/libmad/config.h b/lib/lib_audio/ESP8266Audio/src/libmad/config.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/config.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/config.h
diff --git a/lib/ESP8266Audio/src/libmad/decoder.c b/lib/lib_audio/ESP8266Audio/src/libmad/decoder.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/decoder.c
rename to lib/lib_audio/ESP8266Audio/src/libmad/decoder.c
diff --git a/lib/ESP8266Audio/src/libmad/decoder.h b/lib/lib_audio/ESP8266Audio/src/libmad/decoder.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/decoder.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/decoder.h
diff --git a/lib/ESP8266Audio/src/libmad/fixed.c b/lib/lib_audio/ESP8266Audio/src/libmad/fixed.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/fixed.c
rename to lib/lib_audio/ESP8266Audio/src/libmad/fixed.c
diff --git a/lib/ESP8266Audio/src/libmad/fixed.h b/lib/lib_audio/ESP8266Audio/src/libmad/fixed.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/fixed.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/fixed.h
diff --git a/lib/ESP8266Audio/src/libmad/frame.c b/lib/lib_audio/ESP8266Audio/src/libmad/frame.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/frame.c
rename to lib/lib_audio/ESP8266Audio/src/libmad/frame.c
diff --git a/lib/ESP8266Audio/src/libmad/frame.h b/lib/lib_audio/ESP8266Audio/src/libmad/frame.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/frame.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/frame.h
diff --git a/lib/ESP8266Audio/src/libmad/global.h b/lib/lib_audio/ESP8266Audio/src/libmad/global.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/global.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/global.h
diff --git a/lib/ESP8266Audio/src/libmad/huffman.c b/lib/lib_audio/ESP8266Audio/src/libmad/huffman.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/huffman.c
rename to lib/lib_audio/ESP8266Audio/src/libmad/huffman.c
diff --git a/lib/ESP8266Audio/src/libmad/huffman.h b/lib/lib_audio/ESP8266Audio/src/libmad/huffman.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/huffman.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/huffman.h
diff --git a/lib/ESP8266Audio/src/libmad/imdct_s.dat.h b/lib/lib_audio/ESP8266Audio/src/libmad/imdct_s.dat.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/imdct_s.dat.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/imdct_s.dat.h
diff --git a/lib/ESP8266Audio/src/libmad/layer3.c b/lib/lib_audio/ESP8266Audio/src/libmad/layer3.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/layer3.c
rename to lib/lib_audio/ESP8266Audio/src/libmad/layer3.c
diff --git a/lib/ESP8266Audio/src/libmad/layer3.h b/lib/lib_audio/ESP8266Audio/src/libmad/layer3.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/layer3.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/layer3.h
diff --git a/lib/ESP8266Audio/src/libmad/mad.h b/lib/lib_audio/ESP8266Audio/src/libmad/mad.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/mad.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/mad.h
diff --git a/lib/ESP8266Audio/src/libmad/mad.h.sed b/lib/lib_audio/ESP8266Audio/src/libmad/mad.h.sed
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/mad.h.sed
rename to lib/lib_audio/ESP8266Audio/src/libmad/mad.h.sed
diff --git a/lib/ESP8266Audio/src/libmad/qc_table.dat.h b/lib/lib_audio/ESP8266Audio/src/libmad/qc_table.dat.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/qc_table.dat.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/qc_table.dat.h
diff --git a/lib/ESP8266Audio/src/libmad/rq_table.dat.h b/lib/lib_audio/ESP8266Audio/src/libmad/rq_table.dat.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/rq_table.dat.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/rq_table.dat.h
diff --git a/lib/ESP8266Audio/src/libmad/sf_table.dat.h b/lib/lib_audio/ESP8266Audio/src/libmad/sf_table.dat.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/sf_table.dat.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/sf_table.dat.h
diff --git a/lib/ESP8266Audio/src/libmad/stream.c b/lib/lib_audio/ESP8266Audio/src/libmad/stream.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/stream.c
rename to lib/lib_audio/ESP8266Audio/src/libmad/stream.c
diff --git a/lib/ESP8266Audio/src/libmad/stream.h b/lib/lib_audio/ESP8266Audio/src/libmad/stream.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/stream.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/stream.h
diff --git a/lib/ESP8266Audio/src/libmad/synth.c b/lib/lib_audio/ESP8266Audio/src/libmad/synth.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/synth.c
rename to lib/lib_audio/ESP8266Audio/src/libmad/synth.c
diff --git a/lib/ESP8266Audio/src/libmad/synth.h b/lib/lib_audio/ESP8266Audio/src/libmad/synth.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/synth.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/synth.h
diff --git a/lib/ESP8266Audio/src/libmad/timer.c b/lib/lib_audio/ESP8266Audio/src/libmad/timer.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/timer.c
rename to lib/lib_audio/ESP8266Audio/src/libmad/timer.c
diff --git a/lib/ESP8266Audio/src/libmad/timer.h b/lib/lib_audio/ESP8266Audio/src/libmad/timer.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/timer.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/timer.h
diff --git a/lib/ESP8266Audio/src/libmad/version.c b/lib/lib_audio/ESP8266Audio/src/libmad/version.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/version.c
rename to lib/lib_audio/ESP8266Audio/src/libmad/version.c
diff --git a/lib/ESP8266Audio/src/libmad/version.h b/lib/lib_audio/ESP8266Audio/src/libmad/version.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libmad/version.h
rename to lib/lib_audio/ESP8266Audio/src/libmad/version.h
diff --git a/lib/ESP8266Audio/src/libogg/AUTHORS b/lib/lib_audio/ESP8266Audio/src/libogg/AUTHORS
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libogg/AUTHORS
rename to lib/lib_audio/ESP8266Audio/src/libogg/AUTHORS
diff --git a/lib/ESP8266Audio/src/libogg/CHANGES b/lib/lib_audio/ESP8266Audio/src/libogg/CHANGES
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libogg/CHANGES
rename to lib/lib_audio/ESP8266Audio/src/libogg/CHANGES
diff --git a/lib/ESP8266Audio/src/libogg/COPYING b/lib/lib_audio/ESP8266Audio/src/libogg/COPYING
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libogg/COPYING
rename to lib/lib_audio/ESP8266Audio/src/libogg/COPYING
diff --git a/lib/ESP8266Audio/src/libogg/README.esp8266.md b/lib/lib_audio/ESP8266Audio/src/libogg/README.esp8266.md
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libogg/README.esp8266.md
rename to lib/lib_audio/ESP8266Audio/src/libogg/README.esp8266.md
diff --git a/lib/ESP8266Audio/src/libogg/README.md b/lib/lib_audio/ESP8266Audio/src/libogg/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libogg/README.md
rename to lib/lib_audio/ESP8266Audio/src/libogg/README.md
diff --git a/lib/ESP8266Audio/src/libogg/bitwise.c b/lib/lib_audio/ESP8266Audio/src/libogg/bitwise.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libogg/bitwise.c
rename to lib/lib_audio/ESP8266Audio/src/libogg/bitwise.c
diff --git a/lib/ESP8266Audio/src/libogg/config.h b/lib/lib_audio/ESP8266Audio/src/libogg/config.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libogg/config.h
rename to lib/lib_audio/ESP8266Audio/src/libogg/config.h
diff --git a/lib/ESP8266Audio/src/libogg/crctable.h b/lib/lib_audio/ESP8266Audio/src/libogg/crctable.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libogg/crctable.h
rename to lib/lib_audio/ESP8266Audio/src/libogg/crctable.h
diff --git a/lib/ESP8266Audio/src/libogg/framing.c b/lib/lib_audio/ESP8266Audio/src/libogg/framing.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libogg/framing.c
rename to lib/lib_audio/ESP8266Audio/src/libogg/framing.c
diff --git a/lib/ESP8266Audio/src/libogg/ogg.pc b/lib/lib_audio/ESP8266Audio/src/libogg/ogg.pc
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libogg/ogg.pc
rename to lib/lib_audio/ESP8266Audio/src/libogg/ogg.pc
diff --git a/lib/ESP8266Audio/src/libogg/ogg/config_types.h b/lib/lib_audio/ESP8266Audio/src/libogg/ogg/config_types.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libogg/ogg/config_types.h
rename to lib/lib_audio/ESP8266Audio/src/libogg/ogg/config_types.h
diff --git a/lib/ESP8266Audio/src/libogg/ogg/ogg.h b/lib/lib_audio/ESP8266Audio/src/libogg/ogg/ogg.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libogg/ogg/ogg.h
rename to lib/lib_audio/ESP8266Audio/src/libogg/ogg/ogg.h
diff --git a/lib/ESP8266Audio/src/libogg/ogg/os_types.h b/lib/lib_audio/ESP8266Audio/src/libogg/ogg/os_types.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libogg/ogg/os_types.h
rename to lib/lib_audio/ESP8266Audio/src/libogg/ogg/os_types.h
diff --git a/lib/ESP8266Audio/src/libopus/AUTHORS b/lib/lib_audio/ESP8266Audio/src/libopus/AUTHORS
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/AUTHORS
rename to lib/lib_audio/ESP8266Audio/src/libopus/AUTHORS
diff --git a/lib/ESP8266Audio/src/libopus/COPYING b/lib/lib_audio/ESP8266Audio/src/libopus/COPYING
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/COPYING
rename to lib/lib_audio/ESP8266Audio/src/libopus/COPYING
diff --git a/lib/ESP8266Audio/src/libopus/ChangeLog b/lib/lib_audio/ESP8266Audio/src/libopus/ChangeLog
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/ChangeLog
rename to lib/lib_audio/ESP8266Audio/src/libopus/ChangeLog
diff --git a/lib/ESP8266Audio/src/libopus/INSTALL b/lib/lib_audio/ESP8266Audio/src/libopus/INSTALL
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/INSTALL
rename to lib/lib_audio/ESP8266Audio/src/libopus/INSTALL
diff --git a/lib/ESP8266Audio/src/libopus/NEWS b/lib/lib_audio/ESP8266Audio/src/libopus/NEWS
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/NEWS
rename to lib/lib_audio/ESP8266Audio/src/libopus/NEWS
diff --git a/lib/ESP8266Audio/src/libopus/README b/lib/lib_audio/ESP8266Audio/src/libopus/README
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/README
rename to lib/lib_audio/ESP8266Audio/src/libopus/README
diff --git a/lib/ESP8266Audio/src/libopus/analysis.h b/lib/lib_audio/ESP8266Audio/src/libopus/analysis.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/analysis.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/analysis.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/_kiss_fft_guts.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/_kiss_fft_guts.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/_kiss_fft_guts.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/_kiss_fft_guts.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/arch.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/arch.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/arch.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/arch.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/bands.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/bands.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/bands.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/bands.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/bands.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/bands.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/bands.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/bands.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/celt.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/celt.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/celt.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/celt.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/celt.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/celt.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/celt.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/celt.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/celt_decoder.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/celt_decoder.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/celt_decoder.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/celt_decoder.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/celt_encoder.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/celt_encoder.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/celt_encoder.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/celt_encoder.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/celt_lpc.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/celt_lpc.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/celt_lpc.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/celt_lpc.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/celt_lpc.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/celt_lpc.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/celt_lpc.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/celt_lpc.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/cpu_support.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/cpu_support.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/cpu_support.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/cpu_support.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/cwrs.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/cwrs.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/cwrs.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/cwrs.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/cwrs.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/cwrs.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/cwrs.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/cwrs.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/ecintrin.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/ecintrin.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/ecintrin.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/ecintrin.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/entcode.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/entcode.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/entcode.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/entcode.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/entcode.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/entcode.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/entcode.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/entcode.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/entdec.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/entdec.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/entdec.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/entdec.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/entdec.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/entdec.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/entdec.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/entdec.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/entenc.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/entenc.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/entenc.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/entenc.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/entenc.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/entenc.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/entenc.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/entenc.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/fixed_debug.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/fixed_debug.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/fixed_debug.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/fixed_debug.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/fixed_generic.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/fixed_generic.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/fixed_generic.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/fixed_generic.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/float_cast.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/float_cast.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/float_cast.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/float_cast.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/kiss_fft.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/kiss_fft.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/kiss_fft.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/kiss_fft.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/kiss_fft.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/kiss_fft.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/kiss_fft.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/kiss_fft.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/laplace.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/laplace.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/laplace.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/laplace.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/laplace.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/laplace.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/laplace.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/laplace.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/mathops.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/mathops.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/mathops.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/mathops.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/mathops.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/mathops.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/mathops.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/mathops.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/mdct.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/mdct.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/mdct.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/mdct.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/mdct.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/mdct.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/mdct.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/mdct.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/mfrngcod.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/mfrngcod.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/mfrngcod.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/mfrngcod.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/modes.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/modes.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/modes.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/modes.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/modes.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/modes.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/modes.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/modes.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/os_support.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/os_support.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/os_support.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/os_support.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/pitch.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/pitch.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/pitch.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/pitch.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/pitch.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/pitch.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/pitch.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/pitch.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/quant_bands.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/quant_bands.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/quant_bands.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/quant_bands.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/quant_bands.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/quant_bands.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/quant_bands.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/quant_bands.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/rate.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/rate.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/rate.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/rate.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/rate.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/rate.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/rate.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/rate.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/stack_alloc.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/stack_alloc.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/stack_alloc.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/stack_alloc.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/static_modes_fixed.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/static_modes_fixed.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/static_modes_fixed.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/static_modes_fixed.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/static_modes_float.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/static_modes_float.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/static_modes_float.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/static_modes_float.h
diff --git a/lib/ESP8266Audio/src/libopus/celt/vq.c b/lib/lib_audio/ESP8266Audio/src/libopus/celt/vq.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/vq.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/vq.c
diff --git a/lib/ESP8266Audio/src/libopus/celt/vq.h b/lib/lib_audio/ESP8266Audio/src/libopus/celt/vq.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/celt/vq.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/celt/vq.h
diff --git a/lib/ESP8266Audio/src/libopus/config.h b/lib/lib_audio/ESP8266Audio/src/libopus/config.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/config.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/config.h
diff --git a/lib/ESP8266Audio/src/libopus/mapping_matrix.c b/lib/lib_audio/ESP8266Audio/src/libopus/mapping_matrix.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/mapping_matrix.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/mapping_matrix.c
diff --git a/lib/ESP8266Audio/src/libopus/mapping_matrix.h b/lib/lib_audio/ESP8266Audio/src/libopus/mapping_matrix.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/mapping_matrix.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/mapping_matrix.h
diff --git a/lib/ESP8266Audio/src/libopus/mlp.h b/lib/lib_audio/ESP8266Audio/src/libopus/mlp.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/mlp.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/mlp.h
diff --git a/lib/ESP8266Audio/src/libopus/opus.c b/lib/lib_audio/ESP8266Audio/src/libopus/opus.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus.c
diff --git a/lib/ESP8266Audio/src/libopus/opus.h b/lib/lib_audio/ESP8266Audio/src/libopus/opus.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus.h
diff --git a/lib/ESP8266Audio/src/libopus/opus.pc b/lib/lib_audio/ESP8266Audio/src/libopus/opus.pc
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus.pc
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus.pc
diff --git a/lib/ESP8266Audio/src/libopus/opus_custom.h b/lib/lib_audio/ESP8266Audio/src/libopus/opus_custom.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus_custom.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus_custom.h
diff --git a/lib/ESP8266Audio/src/libopus/opus_decoder.c b/lib/lib_audio/ESP8266Audio/src/libopus/opus_decoder.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus_decoder.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus_decoder.c
diff --git a/lib/ESP8266Audio/src/libopus/opus_defines.h b/lib/lib_audio/ESP8266Audio/src/libopus/opus_defines.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus_defines.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus_defines.h
diff --git a/lib/ESP8266Audio/src/libopus/opus_encoder.c b/lib/lib_audio/ESP8266Audio/src/libopus/opus_encoder.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus_encoder.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus_encoder.c
diff --git a/lib/ESP8266Audio/src/libopus/opus_multistream.c b/lib/lib_audio/ESP8266Audio/src/libopus/opus_multistream.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus_multistream.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus_multistream.c
diff --git a/lib/ESP8266Audio/src/libopus/opus_multistream.h b/lib/lib_audio/ESP8266Audio/src/libopus/opus_multistream.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus_multistream.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus_multistream.h
diff --git a/lib/ESP8266Audio/src/libopus/opus_multistream_decoder.c b/lib/lib_audio/ESP8266Audio/src/libopus/opus_multistream_decoder.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus_multistream_decoder.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus_multistream_decoder.c
diff --git a/lib/ESP8266Audio/src/libopus/opus_multistream_encoder.c b/lib/lib_audio/ESP8266Audio/src/libopus/opus_multistream_encoder.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus_multistream_encoder.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus_multistream_encoder.c
diff --git a/lib/ESP8266Audio/src/libopus/opus_private.h b/lib/lib_audio/ESP8266Audio/src/libopus/opus_private.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus_private.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus_private.h
diff --git a/lib/ESP8266Audio/src/libopus/opus_projection.h b/lib/lib_audio/ESP8266Audio/src/libopus/opus_projection.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus_projection.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus_projection.h
diff --git a/lib/ESP8266Audio/src/libopus/opus_projection_decoder.c b/lib/lib_audio/ESP8266Audio/src/libopus/opus_projection_decoder.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus_projection_decoder.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus_projection_decoder.c
diff --git a/lib/ESP8266Audio/src/libopus/opus_projection_encoder.c b/lib/lib_audio/ESP8266Audio/src/libopus/opus_projection_encoder.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus_projection_encoder.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus_projection_encoder.c
diff --git a/lib/ESP8266Audio/src/libopus/opus_types.h b/lib/lib_audio/ESP8266Audio/src/libopus/opus_types.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/opus_types.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/opus_types.h
diff --git a/lib/ESP8266Audio/src/libopus/repacketizer.c b/lib/lib_audio/ESP8266Audio/src/libopus/repacketizer.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/repacketizer.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/repacketizer.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/A2NLSF.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/A2NLSF.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/A2NLSF.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/A2NLSF.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/API.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/API.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/API.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/API.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/CNG.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/CNG.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/CNG.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/CNG.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/HP_variable_cutoff.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/HP_variable_cutoff.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/HP_variable_cutoff.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/HP_variable_cutoff.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/Inlines.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/Inlines.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/Inlines.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/Inlines.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/LPC_analysis_filter.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/LPC_analysis_filter.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/LPC_analysis_filter.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/LPC_analysis_filter.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/LPC_fit.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/LPC_fit.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/LPC_fit.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/LPC_fit.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/LPC_inv_pred_gain.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/LPC_inv_pred_gain.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/LPC_inv_pred_gain.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/LPC_inv_pred_gain.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/LP_variable_cutoff.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/LP_variable_cutoff.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/LP_variable_cutoff.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/LP_variable_cutoff.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/MacroCount.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/MacroCount.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/MacroCount.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/MacroCount.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/MacroDebug.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/MacroDebug.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/MacroDebug.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/MacroDebug.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/NLSF2A.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF2A.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/NLSF2A.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF2A.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/NLSF_VQ.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_VQ.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/NLSF_VQ.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_VQ.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/NLSF_VQ_weights_laroia.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_VQ_weights_laroia.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/NLSF_VQ_weights_laroia.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_VQ_weights_laroia.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/NLSF_decode.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_decode.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/NLSF_decode.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_decode.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/NLSF_del_dec_quant.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_del_dec_quant.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/NLSF_del_dec_quant.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_del_dec_quant.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/NLSF_encode.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_encode.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/NLSF_encode.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_encode.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/NLSF_stabilize.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_stabilize.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/NLSF_stabilize.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_stabilize.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/NLSF_unpack.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_unpack.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/NLSF_unpack.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/NLSF_unpack.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/NSQ.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/NSQ.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/NSQ.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/NSQ.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/NSQ.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/NSQ.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/NSQ.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/NSQ.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/NSQ_del_dec.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/NSQ_del_dec.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/NSQ_del_dec.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/NSQ_del_dec.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/PLC.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/PLC.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/PLC.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/PLC.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/PLC.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/PLC.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/PLC.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/PLC.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/SigProc_FIX.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/SigProc_FIX.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/SigProc_FIX.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/SigProc_FIX.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/VAD.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/VAD.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/VAD.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/VAD.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/VQ_WMat_EC.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/VQ_WMat_EC.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/VQ_WMat_EC.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/VQ_WMat_EC.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/ana_filt_bank_1.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/ana_filt_bank_1.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/ana_filt_bank_1.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/ana_filt_bank_1.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/biquad_alt.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/biquad_alt.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/biquad_alt.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/biquad_alt.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/bwexpander.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/bwexpander.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/bwexpander.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/bwexpander.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/bwexpander_32.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/bwexpander_32.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/bwexpander_32.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/bwexpander_32.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/check_control_input.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/check_control_input.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/check_control_input.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/check_control_input.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/code_signs.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/code_signs.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/code_signs.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/code_signs.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/control.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/control.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/control.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/control.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/control_SNR.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/control_SNR.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/control_SNR.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/control_SNR.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/control_audio_bandwidth.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/control_audio_bandwidth.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/control_audio_bandwidth.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/control_audio_bandwidth.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/control_codec.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/control_codec.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/control_codec.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/control_codec.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/debug.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/debug.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/debug.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/debug.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/debug.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/debug.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/debug.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/debug.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/dec_API.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/dec_API.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/dec_API.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/dec_API.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/decode_core.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/decode_core.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/decode_core.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/decode_core.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/decode_frame.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/decode_frame.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/decode_frame.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/decode_frame.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/decode_indices.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/decode_indices.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/decode_indices.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/decode_indices.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/decode_parameters.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/decode_parameters.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/decode_parameters.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/decode_parameters.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/decode_pitch.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/decode_pitch.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/decode_pitch.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/decode_pitch.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/decode_pulses.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/decode_pulses.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/decode_pulses.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/decode_pulses.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/decoder_set_fs.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/decoder_set_fs.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/decoder_set_fs.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/decoder_set_fs.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/define.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/define.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/define.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/define.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/enc_API.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/enc_API.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/enc_API.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/enc_API.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/encode_indices.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/encode_indices.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/encode_indices.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/encode_indices.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/encode_pulses.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/encode_pulses.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/encode_pulses.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/encode_pulses.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/errors.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/errors.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/errors.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/errors.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/LTP_analysis_filter_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/LTP_analysis_filter_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/LTP_analysis_filter_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/LTP_analysis_filter_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/LTP_analysis_filter_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/LTP_analysis_filter_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/LTP_analysis_filter_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/LTP_analysis_filter_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/LTP_analysis_filter_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/LTP_analysis_filter_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/LTP_analysis_filter_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/LTP_analysis_filter_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/LTP_scale_ctrl_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/LTP_scale_ctrl_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/LTP_scale_ctrl_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/LTP_scale_ctrl_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/LTP_scale_ctrl_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/LTP_scale_ctrl_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/LTP_scale_ctrl_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/LTP_scale_ctrl_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/LTP_scale_ctrl_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/LTP_scale_ctrl_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/LTP_scale_ctrl_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/LTP_scale_ctrl_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/apply_sine_window_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/apply_sine_window_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/apply_sine_window_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/apply_sine_window_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/apply_sine_window_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/apply_sine_window_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/apply_sine_window_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/apply_sine_window_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/apply_sine_window_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/apply_sine_window_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/apply_sine_window_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/apply_sine_window_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/autocorr_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/autocorr_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/autocorr_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/autocorr_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/autocorr_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/autocorr_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/autocorr_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/autocorr_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/autocorr_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/autocorr_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/autocorr_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/autocorr_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/burg_modified_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/burg_modified_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/burg_modified_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/burg_modified_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/burg_modified_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/burg_modified_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/burg_modified_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/burg_modified_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/burg_modified_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/burg_modified_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/burg_modified_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/burg_modified_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/corrMatrix_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/corrMatrix_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/corrMatrix_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/corrMatrix_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/corrMatrix_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/corrMatrix_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/corrMatrix_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/corrMatrix_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/corrMatrix_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/corrMatrix_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/corrMatrix_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/corrMatrix_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/encode_frame_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/encode_frame_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/encode_frame_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/encode_frame_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/encode_frame_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/encode_frame_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/encode_frame_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/encode_frame_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/encode_frame_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/encode_frame_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/encode_frame_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/encode_frame_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/find_LPC_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_LPC_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/find_LPC_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_LPC_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/find_LPC_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_LPC_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/find_LPC_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_LPC_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/find_LPC_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_LPC_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/find_LPC_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_LPC_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/find_LTP_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_LTP_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/find_LTP_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_LTP_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/find_LTP_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_LTP_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/find_LTP_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_LTP_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/find_LTP_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_LTP_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/find_LTP_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_LTP_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/find_pitch_lags_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_pitch_lags_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/find_pitch_lags_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_pitch_lags_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/find_pitch_lags_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_pitch_lags_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/find_pitch_lags_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_pitch_lags_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/find_pitch_lags_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_pitch_lags_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/find_pitch_lags_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_pitch_lags_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/find_pred_coefs_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_pred_coefs_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/find_pred_coefs_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_pred_coefs_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/find_pred_coefs_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_pred_coefs_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/find_pred_coefs_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_pred_coefs_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/find_pred_coefs_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_pred_coefs_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/find_pred_coefs_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/find_pred_coefs_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/k2a_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/k2a_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/k2a_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/k2a_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/k2a_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/k2a_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/k2a_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/k2a_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/k2a_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/k2a_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/k2a_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/k2a_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/k2a_Q16_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/k2a_Q16_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/k2a_Q16_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/k2a_Q16_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/k2a_Q16_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/k2a_Q16_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/k2a_Q16_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/k2a_Q16_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/k2a_Q16_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/k2a_Q16_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/k2a_Q16_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/k2a_Q16_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/main_FIX.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/main_FIX.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/main_FIX.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/main_FIX.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/noise_shape_analysis_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/noise_shape_analysis_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/noise_shape_analysis_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/noise_shape_analysis_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/noise_shape_analysis_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/noise_shape_analysis_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/noise_shape_analysis_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/noise_shape_analysis_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/noise_shape_analysis_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/noise_shape_analysis_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/noise_shape_analysis_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/noise_shape_analysis_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/pitch_analysis_core_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/pitch_analysis_core_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/pitch_analysis_core_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/pitch_analysis_core_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/pitch_analysis_core_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/pitch_analysis_core_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/pitch_analysis_core_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/pitch_analysis_core_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/pitch_analysis_core_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/pitch_analysis_core_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/pitch_analysis_core_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/pitch_analysis_core_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/process_gains_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/process_gains_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/process_gains_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/process_gains_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/process_gains_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/process_gains_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/process_gains_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/process_gains_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/process_gains_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/process_gains_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/process_gains_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/process_gains_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/regularize_correlations_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/regularize_correlations_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/regularize_correlations_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/regularize_correlations_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/regularize_correlations_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/regularize_correlations_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/regularize_correlations_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/regularize_correlations_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/regularize_correlations_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/regularize_correlations_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/regularize_correlations_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/regularize_correlations_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/residual_energy16_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/residual_energy16_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/residual_energy16_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/residual_energy16_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/residual_energy16_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/residual_energy16_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/residual_energy16_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/residual_energy16_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/residual_energy16_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/residual_energy16_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/residual_energy16_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/residual_energy16_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/residual_energy_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/residual_energy_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/residual_energy_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/residual_energy_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/residual_energy_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/residual_energy_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/residual_energy_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/residual_energy_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/residual_energy_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/residual_energy_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/residual_energy_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/residual_energy_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/schur64_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/schur64_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/schur64_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/schur64_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/schur64_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/schur64_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/schur64_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/schur64_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/schur64_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/schur64_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/schur64_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/schur64_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/schur_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/schur_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/schur_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/schur_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/schur_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/schur_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/schur_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/schur_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/schur_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/schur_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/schur_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/schur_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/structs_FIX.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/structs_FIX.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/structs_FIX.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/structs_FIX.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/vector_ops_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/vector_ops_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/vector_ops_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/vector_ops_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/vector_ops_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/vector_ops_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/vector_ops_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/vector_ops_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/vector_ops_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/vector_ops_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/vector_ops_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/vector_ops_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/warped_autocorrelation_FIX.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/warped_autocorrelation_FIX.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/warped_autocorrelation_FIX.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/warped_autocorrelation_FIX.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/warped_autocorrelation_FIX.lo b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/warped_autocorrelation_FIX.lo
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/warped_autocorrelation_FIX.lo
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/warped_autocorrelation_FIX.lo
diff --git a/lib/ESP8266Audio/src/libopus/silk/fixed/warped_autocorrelation_FIX.o b/lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/warped_autocorrelation_FIX.o
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/fixed/warped_autocorrelation_FIX.o
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/fixed/warped_autocorrelation_FIX.o
diff --git a/lib/ESP8266Audio/src/libopus/silk/gain_quant.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/gain_quant.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/gain_quant.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/gain_quant.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/init_decoder.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/init_decoder.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/init_decoder.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/init_decoder.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/init_encoder.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/init_encoder.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/init_encoder.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/init_encoder.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/inner_prod_aligned.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/inner_prod_aligned.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/inner_prod_aligned.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/inner_prod_aligned.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/interpolate.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/interpolate.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/interpolate.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/interpolate.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/lin2log.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/lin2log.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/lin2log.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/lin2log.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/log2lin.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/log2lin.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/log2lin.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/log2lin.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/macros.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/macros.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/macros.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/macros.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/main.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/main.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/main.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/main.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/pitch_est_defines.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/pitch_est_defines.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/pitch_est_defines.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/pitch_est_defines.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/pitch_est_tables.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/pitch_est_tables.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/pitch_est_tables.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/pitch_est_tables.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/process_NLSFs.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/process_NLSFs.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/process_NLSFs.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/process_NLSFs.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/quant_LTP_gains.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/quant_LTP_gains.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/quant_LTP_gains.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/quant_LTP_gains.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/resampler.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/resampler.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/resampler_down2.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_down2.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/resampler_down2.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_down2.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/resampler_down2_3.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_down2_3.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/resampler_down2_3.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_down2_3.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/resampler_private.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_private.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/resampler_private.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_private.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/resampler_private_AR2.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_private_AR2.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/resampler_private_AR2.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_private_AR2.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/resampler_private_IIR_FIR.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_private_IIR_FIR.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/resampler_private_IIR_FIR.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_private_IIR_FIR.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/resampler_private_down_FIR.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_private_down_FIR.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/resampler_private_down_FIR.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_private_down_FIR.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/resampler_private_up2_HQ.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_private_up2_HQ.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/resampler_private_up2_HQ.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_private_up2_HQ.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/resampler_rom.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_rom.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/resampler_rom.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_rom.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/resampler_rom.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_rom.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/resampler_rom.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_rom.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/resampler_structs.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_structs.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/resampler_structs.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/resampler_structs.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/shell_coder.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/shell_coder.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/shell_coder.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/shell_coder.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/sigm_Q15.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/sigm_Q15.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/sigm_Q15.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/sigm_Q15.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/sort.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/sort.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/sort.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/sort.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/stereo_LR_to_MS.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/stereo_LR_to_MS.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/stereo_LR_to_MS.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/stereo_LR_to_MS.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/stereo_MS_to_LR.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/stereo_MS_to_LR.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/stereo_MS_to_LR.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/stereo_MS_to_LR.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/stereo_decode_pred.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/stereo_decode_pred.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/stereo_decode_pred.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/stereo_decode_pred.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/stereo_encode_pred.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/stereo_encode_pred.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/stereo_encode_pred.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/stereo_encode_pred.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/stereo_find_predictor.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/stereo_find_predictor.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/stereo_find_predictor.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/stereo_find_predictor.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/stereo_quant_pred.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/stereo_quant_pred.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/stereo_quant_pred.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/stereo_quant_pred.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/structs.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/structs.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/structs.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/structs.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/sum_sqr_shift.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/sum_sqr_shift.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/sum_sqr_shift.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/sum_sqr_shift.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/table_LSF_cos.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/table_LSF_cos.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/table_LSF_cos.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/table_LSF_cos.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/tables.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/tables.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/tables.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/tables.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/tables_LTP.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_LTP.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/tables_LTP.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_LTP.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/tables_NLSF_CB_NB_MB.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_NLSF_CB_NB_MB.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/tables_NLSF_CB_NB_MB.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_NLSF_CB_NB_MB.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/tables_NLSF_CB_WB.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_NLSF_CB_WB.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/tables_NLSF_CB_WB.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_NLSF_CB_WB.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/tables_gain.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_gain.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/tables_gain.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_gain.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/tables_other.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_other.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/tables_other.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_other.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/tables_pitch_lag.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_pitch_lag.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/tables_pitch_lag.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_pitch_lag.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/tables_pulses_per_block.c b/lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_pulses_per_block.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/tables_pulses_per_block.c
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/tables_pulses_per_block.c
diff --git a/lib/ESP8266Audio/src/libopus/silk/tuning_parameters.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/tuning_parameters.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/tuning_parameters.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/tuning_parameters.h
diff --git a/lib/ESP8266Audio/src/libopus/silk/typedef.h b/lib/lib_audio/ESP8266Audio/src/libopus/silk/typedef.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/silk/typedef.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/silk/typedef.h
diff --git a/lib/ESP8266Audio/src/libopus/tansig_table.h b/lib/lib_audio/ESP8266Audio/src/libopus/tansig_table.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libopus/tansig_table.h
rename to lib/lib_audio/ESP8266Audio/src/libopus/tansig_table.h
diff --git a/lib/ESP8266Audio/src/libtinysoundfont/LICENSE b/lib/lib_audio/ESP8266Audio/src/libtinysoundfont/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libtinysoundfont/LICENSE
rename to lib/lib_audio/ESP8266Audio/src/libtinysoundfont/LICENSE
diff --git a/lib/ESP8266Audio/src/libtinysoundfont/README.ESP8266 b/lib/lib_audio/ESP8266Audio/src/libtinysoundfont/README.ESP8266
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libtinysoundfont/README.ESP8266
rename to lib/lib_audio/ESP8266Audio/src/libtinysoundfont/README.ESP8266
diff --git a/lib/ESP8266Audio/src/libtinysoundfont/README.md b/lib/lib_audio/ESP8266Audio/src/libtinysoundfont/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libtinysoundfont/README.md
rename to lib/lib_audio/ESP8266Audio/src/libtinysoundfont/README.md
diff --git a/lib/ESP8266Audio/src/libtinysoundfont/tsf.h b/lib/lib_audio/ESP8266Audio/src/libtinysoundfont/tsf.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/libtinysoundfont/tsf.h
rename to lib/lib_audio/ESP8266Audio/src/libtinysoundfont/tsf.h
diff --git a/lib/ESP8266Audio/src/opusfile/AUTHORS b/lib/lib_audio/ESP8266Audio/src/opusfile/AUTHORS
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/opusfile/AUTHORS
rename to lib/lib_audio/ESP8266Audio/src/opusfile/AUTHORS
diff --git a/lib/ESP8266Audio/src/opusfile/COPYING b/lib/lib_audio/ESP8266Audio/src/opusfile/COPYING
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/opusfile/COPYING
rename to lib/lib_audio/ESP8266Audio/src/opusfile/COPYING
diff --git a/lib/ESP8266Audio/src/opusfile/README.esp8266.md b/lib/lib_audio/ESP8266Audio/src/opusfile/README.esp8266.md
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/opusfile/README.esp8266.md
rename to lib/lib_audio/ESP8266Audio/src/opusfile/README.esp8266.md
diff --git a/lib/ESP8266Audio/src/opusfile/README.md b/lib/lib_audio/ESP8266Audio/src/opusfile/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/opusfile/README.md
rename to lib/lib_audio/ESP8266Audio/src/opusfile/README.md
diff --git a/lib/ESP8266Audio/src/opusfile/config.h b/lib/lib_audio/ESP8266Audio/src/opusfile/config.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/opusfile/config.h
rename to lib/lib_audio/ESP8266Audio/src/opusfile/config.h
diff --git a/lib/ESP8266Audio/src/opusfile/info.c b/lib/lib_audio/ESP8266Audio/src/opusfile/info.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/opusfile/info.c
rename to lib/lib_audio/ESP8266Audio/src/opusfile/info.c
diff --git a/lib/ESP8266Audio/src/opusfile/internal.c b/lib/lib_audio/ESP8266Audio/src/opusfile/internal.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/opusfile/internal.c
rename to lib/lib_audio/ESP8266Audio/src/opusfile/internal.c
diff --git a/lib/ESP8266Audio/src/opusfile/internal.h b/lib/lib_audio/ESP8266Audio/src/opusfile/internal.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/opusfile/internal.h
rename to lib/lib_audio/ESP8266Audio/src/opusfile/internal.h
diff --git a/lib/ESP8266Audio/src/opusfile/opusfile.c b/lib/lib_audio/ESP8266Audio/src/opusfile/opusfile.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/opusfile/opusfile.c
rename to lib/lib_audio/ESP8266Audio/src/opusfile/opusfile.c
diff --git a/lib/ESP8266Audio/src/opusfile/opusfile.h b/lib/lib_audio/ESP8266Audio/src/opusfile/opusfile.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/opusfile/opusfile.h
rename to lib/lib_audio/ESP8266Audio/src/opusfile/opusfile.h
diff --git a/lib/ESP8266Audio/src/opusfile/opusfile.pc b/lib/lib_audio/ESP8266Audio/src/opusfile/opusfile.pc
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/opusfile/opusfile.pc
rename to lib/lib_audio/ESP8266Audio/src/opusfile/opusfile.pc
diff --git a/lib/ESP8266Audio/src/opusfile/stream.c b/lib/lib_audio/ESP8266Audio/src/opusfile/stream.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/opusfile/stream.c
rename to lib/lib_audio/ESP8266Audio/src/opusfile/stream.c
diff --git a/lib/ESP8266Audio/src/spiram-fast.h b/lib/lib_audio/ESP8266Audio/src/spiram-fast.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/src/spiram-fast.h
rename to lib/lib_audio/ESP8266Audio/src/spiram-fast.h
diff --git a/lib/ESP8266Audio/tests/common.sh b/lib/lib_audio/ESP8266Audio/tests/common.sh
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/tests/common.sh
rename to lib/lib_audio/ESP8266Audio/tests/common.sh
diff --git a/lib/ESP8266Audio/tests/host/Arduino.h b/lib/lib_audio/ESP8266Audio/tests/host/Arduino.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/tests/host/Arduino.h
rename to lib/lib_audio/ESP8266Audio/tests/host/Arduino.h
diff --git a/lib/ESP8266Audio/tests/host/Makefile b/lib/lib_audio/ESP8266Audio/tests/host/Makefile
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/tests/host/Makefile
rename to lib/lib_audio/ESP8266Audio/tests/host/Makefile
diff --git a/lib/ESP8266Audio/tests/host/Serial.cpp b/lib/lib_audio/ESP8266Audio/tests/host/Serial.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/tests/host/Serial.cpp
rename to lib/lib_audio/ESP8266Audio/tests/host/Serial.cpp
diff --git a/lib/ESP8266Audio/tests/host/aac.cpp b/lib/lib_audio/ESP8266Audio/tests/host/aac.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/tests/host/aac.cpp
rename to lib/lib_audio/ESP8266Audio/tests/host/aac.cpp
diff --git a/lib/ESP8266Audio/tests/host/midi.cpp b/lib/lib_audio/ESP8266Audio/tests/host/midi.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/tests/host/midi.cpp
rename to lib/lib_audio/ESP8266Audio/tests/host/midi.cpp
diff --git a/lib/ESP8266Audio/tests/host/mp3.cpp b/lib/lib_audio/ESP8266Audio/tests/host/mp3.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/tests/host/mp3.cpp
rename to lib/lib_audio/ESP8266Audio/tests/host/mp3.cpp
diff --git a/lib/ESP8266Audio/tests/host/opus.cpp b/lib/lib_audio/ESP8266Audio/tests/host/opus.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/tests/host/opus.cpp
rename to lib/lib_audio/ESP8266Audio/tests/host/opus.cpp
diff --git a/lib/ESP8266Audio/tests/host/pgmspace.h b/lib/lib_audio/ESP8266Audio/tests/host/pgmspace.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/tests/host/pgmspace.h
rename to lib/lib_audio/ESP8266Audio/tests/host/pgmspace.h
diff --git a/lib/ESP8266Audio/tests/host/test_8u_16.wav b/lib/lib_audio/ESP8266Audio/tests/host/test_8u_16.wav
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/tests/host/test_8u_16.wav
rename to lib/lib_audio/ESP8266Audio/tests/host/test_8u_16.wav
diff --git a/lib/ESP8266Audio/tests/host/wav.cpp b/lib/lib_audio/ESP8266Audio/tests/host/wav.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266Audio/tests/host/wav.cpp
rename to lib/lib_audio/ESP8266Audio/tests/host/wav.cpp
diff --git a/lib/ESP8266SAM/README.md b/lib/lib_audio/ESP8266SAM/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/README.md
rename to lib/lib_audio/ESP8266SAM/README.md
diff --git a/lib/ESP8266SAM/examples/Speak/Speak.ino b/lib/lib_audio/ESP8266SAM/examples/Speak/Speak.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/examples/Speak/Speak.ino
rename to lib/lib_audio/ESP8266SAM/examples/Speak/Speak.ino
diff --git a/lib/ESP8266SAM/library.json b/lib/lib_audio/ESP8266SAM/library.json
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/library.json
rename to lib/lib_audio/ESP8266SAM/library.json
diff --git a/lib/ESP8266SAM/library.properties b/lib/lib_audio/ESP8266SAM/library.properties
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/library.properties
rename to lib/lib_audio/ESP8266SAM/library.properties
diff --git a/lib/ESP8266SAM/src/ESP8266SAM.cpp b/lib/lib_audio/ESP8266SAM/src/ESP8266SAM.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/ESP8266SAM.cpp
rename to lib/lib_audio/ESP8266SAM/src/ESP8266SAM.cpp
diff --git a/lib/ESP8266SAM/src/ESP8266SAM.h b/lib/lib_audio/ESP8266SAM/src/ESP8266SAM.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/ESP8266SAM.h
rename to lib/lib_audio/ESP8266SAM/src/ESP8266SAM.h
diff --git a/lib/ESP8266SAM/src/ReciterTabs.h b/lib/lib_audio/ESP8266SAM/src/ReciterTabs.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/ReciterTabs.h
rename to lib/lib_audio/ESP8266SAM/src/ReciterTabs.h
diff --git a/lib/ESP8266SAM/src/RenderTabs.h b/lib/lib_audio/ESP8266SAM/src/RenderTabs.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/RenderTabs.h
rename to lib/lib_audio/ESP8266SAM/src/RenderTabs.h
diff --git a/lib/ESP8266SAM/src/SamData.h b/lib/lib_audio/ESP8266SAM/src/SamData.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/SamData.h
rename to lib/lib_audio/ESP8266SAM/src/SamData.h
diff --git a/lib/ESP8266SAM/src/SamTabs.h b/lib/lib_audio/ESP8266SAM/src/SamTabs.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/SamTabs.h
rename to lib/lib_audio/ESP8266SAM/src/SamTabs.h
diff --git a/lib/ESP8266SAM/src/reciter.c b/lib/lib_audio/ESP8266SAM/src/reciter.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/reciter.c
rename to lib/lib_audio/ESP8266SAM/src/reciter.c
diff --git a/lib/ESP8266SAM/src/reciter.h b/lib/lib_audio/ESP8266SAM/src/reciter.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/reciter.h
rename to lib/lib_audio/ESP8266SAM/src/reciter.h
diff --git a/lib/ESP8266SAM/src/render.c b/lib/lib_audio/ESP8266SAM/src/render.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/render.c
rename to lib/lib_audio/ESP8266SAM/src/render.c
diff --git a/lib/ESP8266SAM/src/render.h b/lib/lib_audio/ESP8266SAM/src/render.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/render.h
rename to lib/lib_audio/ESP8266SAM/src/render.h
diff --git a/lib/ESP8266SAM/src/sam.c b/lib/lib_audio/ESP8266SAM/src/sam.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/sam.c
rename to lib/lib_audio/ESP8266SAM/src/sam.c
diff --git a/lib/ESP8266SAM/src/sam.h b/lib/lib_audio/ESP8266SAM/src/sam.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/sam.h
rename to lib/lib_audio/ESP8266SAM/src/sam.h
diff --git a/lib/ESP8266SAM/src/samdebug.c b/lib/lib_audio/ESP8266SAM/src/samdebug.c
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/samdebug.c
rename to lib/lib_audio/ESP8266SAM/src/samdebug.c
diff --git a/lib/ESP8266SAM/src/samdebug.h b/lib/lib_audio/ESP8266SAM/src/samdebug.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/ESP8266SAM/src/samdebug.h
rename to lib/lib_audio/ESP8266SAM/src/samdebug.h
diff --git a/lib/C2Programmer-1.0.0/README.md b/lib/lib_basic/C2Programmer-1.0.0/README.md
similarity index 100%
rename from lib/C2Programmer-1.0.0/README.md
rename to lib/lib_basic/C2Programmer-1.0.0/README.md
diff --git a/lib/C2Programmer-1.0.0/keywords.txt b/lib/lib_basic/C2Programmer-1.0.0/keywords.txt
similarity index 100%
rename from lib/C2Programmer-1.0.0/keywords.txt
rename to lib/lib_basic/C2Programmer-1.0.0/keywords.txt
diff --git a/lib/C2Programmer-1.0.0/library.json b/lib/lib_basic/C2Programmer-1.0.0/library.json
similarity index 100%
rename from lib/C2Programmer-1.0.0/library.json
rename to lib/lib_basic/C2Programmer-1.0.0/library.json
diff --git a/lib/C2Programmer-1.0.0/library.properties b/lib/lib_basic/C2Programmer-1.0.0/library.properties
similarity index 100%
rename from lib/C2Programmer-1.0.0/library.properties
rename to lib/lib_basic/C2Programmer-1.0.0/library.properties
diff --git a/lib/C2Programmer-1.0.0/src/c2.cpp b/lib/lib_basic/C2Programmer-1.0.0/src/c2.cpp
similarity index 100%
rename from lib/C2Programmer-1.0.0/src/c2.cpp
rename to lib/lib_basic/C2Programmer-1.0.0/src/c2.cpp
diff --git a/lib/C2Programmer-1.0.0/src/c2.h b/lib/lib_basic/C2Programmer-1.0.0/src/c2.h
similarity index 100%
rename from lib/C2Programmer-1.0.0/src/c2.h
rename to lib/lib_basic/C2Programmer-1.0.0/src/c2.h
diff --git a/lib/C2Programmer-1.0.0/src/ihx.cpp b/lib/lib_basic/C2Programmer-1.0.0/src/ihx.cpp
similarity index 100%
rename from lib/C2Programmer-1.0.0/src/ihx.cpp
rename to lib/lib_basic/C2Programmer-1.0.0/src/ihx.cpp
diff --git a/lib/C2Programmer-1.0.0/src/ihx.h b/lib/lib_basic/C2Programmer-1.0.0/src/ihx.h
similarity index 100%
rename from lib/C2Programmer-1.0.0/src/ihx.h
rename to lib/lib_basic/C2Programmer-1.0.0/src/ihx.h
diff --git a/lib/IRremoteESP8266-2.7.11/.github/CONTRIBUTING.md b/lib/lib_basic/IRremoteESP8266-2.7.11/.github/CONTRIBUTING.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/.github/CONTRIBUTING.md
rename to lib/lib_basic/IRremoteESP8266-2.7.11/.github/CONTRIBUTING.md
diff --git a/lib/IRremoteESP8266-2.7.11/.github/Contributors.md b/lib/lib_basic/IRremoteESP8266-2.7.11/.github/Contributors.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/.github/Contributors.md
rename to lib/lib_basic/IRremoteESP8266-2.7.11/.github/Contributors.md
diff --git a/lib/IRremoteESP8266-2.7.11/.github/issue_template.md b/lib/lib_basic/IRremoteESP8266-2.7.11/.github/issue_template.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/.github/issue_template.md
rename to lib/lib_basic/IRremoteESP8266-2.7.11/.github/issue_template.md
diff --git a/lib/IRremoteESP8266-2.7.11/.gitignore b/lib/lib_basic/IRremoteESP8266-2.7.11/.gitignore
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/.gitignore
rename to lib/lib_basic/IRremoteESP8266-2.7.11/.gitignore
diff --git a/lib/IRremoteESP8266-2.7.11/.gitmodules b/lib/lib_basic/IRremoteESP8266-2.7.11/.gitmodules
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/.gitmodules
rename to lib/lib_basic/IRremoteESP8266-2.7.11/.gitmodules
diff --git a/lib/IRremoteESP8266-2.7.11/.style.yapf b/lib/lib_basic/IRremoteESP8266-2.7.11/.style.yapf
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/.style.yapf
rename to lib/lib_basic/IRremoteESP8266-2.7.11/.style.yapf
diff --git a/lib/IRremoteESP8266-2.7.11/.travis.yml b/lib/lib_basic/IRremoteESP8266-2.7.11/.travis.yml
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/.travis.yml
rename to lib/lib_basic/IRremoteESP8266-2.7.11/.travis.yml
diff --git a/lib/IRremoteESP8266-2.7.11/CPPLINT.cfg b/lib/lib_basic/IRremoteESP8266-2.7.11/CPPLINT.cfg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/CPPLINT.cfg
rename to lib/lib_basic/IRremoteESP8266-2.7.11/CPPLINT.cfg
diff --git a/lib/IRremoteESP8266-2.7.11/Doxyfile b/lib/lib_basic/IRremoteESP8266-2.7.11/Doxyfile
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/Doxyfile
rename to lib/lib_basic/IRremoteESP8266-2.7.11/Doxyfile
diff --git a/lib/IRremoteESP8266-2.7.11/LICENSE.txt b/lib/lib_basic/IRremoteESP8266-2.7.11/LICENSE.txt
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/LICENSE.txt
rename to lib/lib_basic/IRremoteESP8266-2.7.11/LICENSE.txt
diff --git a/lib/IRremoteESP8266-2.7.11/README.md b/lib/lib_basic/IRremoteESP8266-2.7.11/README.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/README.md
rename to lib/lib_basic/IRremoteESP8266-2.7.11/README.md
diff --git a/lib/IRremoteESP8266-2.7.11/README_fr.md b/lib/lib_basic/IRremoteESP8266-2.7.11/README_fr.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/README_fr.md
rename to lib/lib_basic/IRremoteESP8266-2.7.11/README_fr.md
diff --git a/lib/IRremoteESP8266-2.7.11/ReleaseNotes.md b/lib/lib_basic/IRremoteESP8266-2.7.11/ReleaseNotes.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/ReleaseNotes.md
rename to lib/lib_basic/IRremoteESP8266-2.7.11/ReleaseNotes.md
diff --git a/lib/IRremoteESP8266-2.7.11/SupportedProtocols.md b/lib/lib_basic/IRremoteESP8266-2.7.11/SupportedProtocols.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/SupportedProtocols.md
rename to lib/lib_basic/IRremoteESP8266-2.7.11/SupportedProtocols.md
diff --git a/lib/IRremoteESP8266-2.7.11/docs/README.md b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/README.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/README.md
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/README.md
diff --git a/lib/IRremoteESP8266-2.7.11/docs/README_fr.md b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/README_fr.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/README_fr.md
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/README_fr.md
diff --git a/lib/IRremoteESP8266-2.7.11/docs/_config.yml b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/_config.yml
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/_config.yml
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/_config.yml
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRac_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRac_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRac_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRac_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRac_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRac_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRac_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRac_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRac_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRac_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRac_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRac_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRrecv_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRrecv_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRrecv_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRrecv_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRrecv_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRrecv_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRrecv_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRrecv_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRrecv_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRrecv_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRrecv_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRrecv_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRremoteESP8266_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRremoteESP8266_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRremoteESP8266_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRremoteESP8266_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRremoteESP8266_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRremoteESP8266_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRremoteESP8266_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRremoteESP8266_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRsend_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRsend_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRsend_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRsend_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRsend_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRsend_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRsend_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRsend_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRsend_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRsend_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRsend_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRsend_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtext_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtext_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtext_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtext_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtext_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtext_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtext_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtext_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtext_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtext_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtext_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtext_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtimer_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtimer_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtimer_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtimer_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtimer_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtimer_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtimer_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtimer_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtimer_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtimer_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtimer_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRtimer_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRutils_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRutils_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRutils_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRutils_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRutils_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRutils_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRutils_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRutils_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRutils_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRutils_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/IRutils_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/IRutils_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/README_8md.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/README_8md.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/README_8md.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/README_8md.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/annotated.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/annotated.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/annotated.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/annotated.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/bc_s.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/bc_s.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/bc_s.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/bc_s.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/bdwn.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/bdwn.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/bdwn.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/bdwn.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAirwellAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRAmcorAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRArgoAC__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCarrierAc64__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoolixAC__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRCoronaAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin128__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin152__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin160__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin176__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin216__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin2__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikin64__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDaikinESP__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRDelonghiAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRElectraAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRFujitsuAC__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGoodweatherAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRGreeAC__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierACYRW02__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHaierAC__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc1__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__inherit__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__inherit__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__inherit__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__inherit__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__inherit__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__inherit__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__inherit__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__inherit__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__inherit__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__inherit__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__inherit__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc344__inherit__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc3__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__inherit__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__inherit__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__inherit__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__inherit__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__inherit__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__inherit__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__inherit__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__inherit__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__inherit__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__inherit__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__inherit__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc424__inherit__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRHitachiAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRKelvinatorAC__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRLgAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMideaAC__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi112__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishi136__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiAC__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy152Ac__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRMitsubishiHeavy88Ac__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRNeoclimaAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRPanasonicAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSamsungAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSanyoAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRSharpAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTcl112Ac__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTechnibelAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTecoAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRToshibaAC__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTranscoldAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRTrotecESP__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVestelAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRVoltas__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRWhirlpoolAc__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRac__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRrecv__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRsend-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRsend-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRsend-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRsend-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRsend.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRsend.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRsend.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRsend.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRtimer-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRtimer-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRtimer-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRtimer-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRtimer.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRtimer.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRtimer.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classIRtimer.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classTimerMs-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classTimerMs-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classTimerMs-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classTimerMs-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classTimerMs.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classTimerMs.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classTimerMs.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classTimerMs.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classdecode__results-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classdecode__results-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classdecode__results-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classdecode__results-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classdecode__results.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classdecode__results.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classdecode__results.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classdecode__results.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classes.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classes.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/classes.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/classes.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/closed.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/closed.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/closed.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/closed.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/de-CH_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/de-CH_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/de-CH_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/de-CH_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/de-CH_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/de-CH_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/de-CH_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/de-CH_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/de-DE_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/de-DE_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/de-DE_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/de-DE_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/de-DE_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/de-DE_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/de-DE_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/de-DE_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/defaults_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/defaults_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/defaults_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/defaults_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/defaults_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/defaults_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/defaults_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/defaults_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/deprecated.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/deprecated.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/deprecated.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/deprecated.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/dir_49e56c817e5e54854c35e136979f97ca.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/dir_49e56c817e5e54854c35e136979f97ca.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/dir_49e56c817e5e54854c35e136979f97ca.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/dir_49e56c817e5e54854c35e136979f97ca.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/dir_84fe998d1eb06414cc389ad334e77e63.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/dir_84fe998d1eb06414cc389ad334e77e63.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/dir_84fe998d1eb06414cc389ad334e77e63.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/dir_84fe998d1eb06414cc389ad334e77e63.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/doc.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/doc.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/doc.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/doc.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/doxygen.css b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/doxygen.css
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/doxygen.css
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/doxygen.css
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/doxygen.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/doxygen.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/doxygen.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/doxygen.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/doxygen__index_8md.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/doxygen__index_8md.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/doxygen__index_8md.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/doxygen__index_8md.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/dynsections.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/dynsections.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/dynsections.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/dynsections.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-AU_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-AU_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-AU_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-AU_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-AU_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-AU_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-AU_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-AU_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-IE_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-IE_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-IE_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-IE_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-IE_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-IE_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-IE_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-IE_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-UK_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-UK_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-UK_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-UK_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-UK_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-UK_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-UK_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-UK_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-US_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-US_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-US_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-US_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-US_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-US_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/en-US_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/en-US_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/es-ES_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/es-ES_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/es-ES_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/es-ES_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/es-ES_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/es-ES_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/es-ES_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/es-ES_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/files.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/files.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/files.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/files.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/folderclosed.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/folderclosed.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/folderclosed.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/folderclosed.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/folderopen.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/folderopen.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/folderopen.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/folderopen.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/fr-FR_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/fr-FR_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/fr-FR_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/fr-FR_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/fr-FR_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/fr-FR_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/fr-FR_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/fr-FR_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_a.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_a.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_a.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_a.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_b.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_b.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_b.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_b.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_c.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_c.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_c.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_c.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_d.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_d.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_d.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_d.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_e.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_e.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_e.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_e.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_f.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_f.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_f.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_f.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_a.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_a.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_a.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_a.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_b.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_b.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_b.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_b.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_c.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_c.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_c.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_c.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_d.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_d.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_d.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_d.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_e.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_e.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_e.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_e.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_f.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_f.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_f.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_f.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_g.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_g.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_g.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_g.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_i.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_i.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_i.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_i.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_k.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_k.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_k.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_k.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_l.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_l.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_l.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_l.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_m.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_m.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_m.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_m.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_n.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_n.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_n.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_n.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_o.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_o.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_o.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_o.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_p.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_p.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_p.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_p.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_r.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_r.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_r.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_r.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_s.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_s.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_s.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_s.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_t.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_t.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_t.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_t.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_u.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_u.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_u.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_u.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_v.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_v.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_v.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_v.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_w.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_w.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_w.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_w.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_~.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_~.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_~.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_func_~.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_g.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_g.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_g.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_g.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_i.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_i.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_i.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_i.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_k.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_k.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_k.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_k.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_l.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_l.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_l.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_l.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_m.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_m.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_m.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_m.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_n.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_n.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_n.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_n.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_o.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_o.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_o.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_o.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_p.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_p.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_p.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_p.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_q.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_q.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_q.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_q.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_r.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_r.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_r.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_r.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_rela.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_rela.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_rela.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_rela.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_s.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_s.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_s.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_s.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_t.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_t.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_t.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_t.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_u.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_u.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_u.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_u.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_v.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_v.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_v.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_v.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_a.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_a.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_a.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_a.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_b.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_b.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_b.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_b.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_c.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_c.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_c.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_c.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_d.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_d.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_d.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_d.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_e.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_e.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_e.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_e.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_f.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_f.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_f.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_f.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_i.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_i.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_i.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_i.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_l.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_l.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_l.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_l.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_m.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_m.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_m.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_m.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_n.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_n.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_n.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_n.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_o.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_o.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_o.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_o.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_p.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_p.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_p.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_p.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_q.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_q.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_q.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_q.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_r.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_r.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_r.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_r.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_s.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_s.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_s.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_s.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_t.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_t.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_t.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_t.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_u.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_u.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_u.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_u.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_v.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_v.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_v.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_v.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_w.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_w.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_w.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_w.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_x.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_x.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_x.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_x.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_z.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_z.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_z.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_vars_z.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_w.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_w.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_w.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_w.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_x.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_x.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_x.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_x.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_z.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_z.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_z.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_z.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_~.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_~.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_~.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/functions_~.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_a.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_a.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_a.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_a.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_c.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_c.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_c.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_c.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_d.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_d.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_d.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_d.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_e.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_e.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_e.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_e.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_enum.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_enum.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_enum.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_enum.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_eval.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_eval.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_eval.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_eval.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_f.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_f.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_f.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_f.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_func.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_func.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_func.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_func.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_g.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_g.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_g.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_g.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_i.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_i.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_i.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_i.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_j.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_j.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_j.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_j.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_k.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_k.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_k.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_k.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_l.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_l.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_l.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_l.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_m.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_m.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_m.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_m.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_n.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_n.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_n.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_n.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_p.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_p.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_p.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_p.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_r.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_r.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_r.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_r.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_s.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_s.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_s.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_s.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_t.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_t.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_t.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_t.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_type.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_type.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_type.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_type.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_u.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_u.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_u.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_u.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_v.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_v.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_v.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_v.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_vars.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_vars.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_vars.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_vars.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_vars_i.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_vars_i.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_vars_i.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_vars_i.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_vars_k.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_vars_k.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_vars_k.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_vars_k.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_w.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_w.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_w.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_w.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_x.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_x.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_x.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_x.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_y.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_y.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_y.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_y.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_z.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_z.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_z.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/globals_z.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/graph_legend.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/graph_legend.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/graph_legend.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/graph_legend.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/graph_legend.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/graph_legend.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/graph_legend.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/graph_legend.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/graph_legend.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/graph_legend.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/graph_legend.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/graph_legend.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/hierarchy.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/hierarchy.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/hierarchy.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/hierarchy.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/i18n_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/i18n_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/i18n_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/i18n_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/i18n_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/i18n_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/i18n_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/i18n_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/index.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/index.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/index.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/index.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_0.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_0.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_0.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_0.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_0.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_0.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_0.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_0.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_0.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_0.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_0.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_0.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_1.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_1.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_1.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_1.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_1.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_1.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_1.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_1.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_1.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_1.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_1.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_1.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_10.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_10.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_10.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_10.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_10.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_10.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_10.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_10.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_10.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_10.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_10.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_10.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_11.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_11.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_11.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_11.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_11.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_11.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_11.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_11.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_11.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_11.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_11.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_11.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_12.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_12.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_12.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_12.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_12.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_12.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_12.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_12.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_12.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_12.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_12.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_12.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_13.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_13.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_13.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_13.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_13.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_13.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_13.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_13.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_13.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_13.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_13.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_13.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_14.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_14.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_14.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_14.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_14.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_14.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_14.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_14.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_14.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_14.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_14.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_14.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_15.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_15.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_15.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_15.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_15.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_15.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_15.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_15.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_15.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_15.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_15.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_15.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_16.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_16.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_16.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_16.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_16.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_16.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_16.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_16.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_16.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_16.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_16.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_16.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_17.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_17.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_17.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_17.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_17.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_17.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_17.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_17.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_17.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_17.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_17.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_17.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_18.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_18.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_18.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_18.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_18.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_18.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_18.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_18.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_18.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_18.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_18.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_18.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_19.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_19.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_19.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_19.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_19.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_19.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_19.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_19.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_19.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_19.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_19.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_19.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_2.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_2.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_2.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_2.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_2.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_2.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_2.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_2.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_2.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_2.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_2.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_2.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_20.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_20.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_20.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_20.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_20.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_20.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_20.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_20.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_20.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_20.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_20.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_20.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_21.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_21.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_21.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_21.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_21.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_21.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_21.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_21.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_21.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_21.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_21.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_21.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_22.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_22.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_22.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_22.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_22.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_22.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_22.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_22.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_22.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_22.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_22.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_22.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_23.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_23.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_23.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_23.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_23.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_23.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_23.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_23.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_23.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_23.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_23.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_23.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_24.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_24.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_24.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_24.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_24.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_24.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_24.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_24.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_24.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_24.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_24.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_24.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_25.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_25.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_25.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_25.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_25.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_25.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_25.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_25.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_25.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_25.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_25.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_25.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_26.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_26.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_26.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_26.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_26.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_26.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_26.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_26.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_26.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_26.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_26.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_26.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_27.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_27.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_27.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_27.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_27.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_27.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_27.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_27.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_27.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_27.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_27.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_27.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_28.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_28.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_28.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_28.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_28.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_28.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_28.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_28.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_28.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_28.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_28.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_28.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_29.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_29.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_29.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_29.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_29.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_29.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_29.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_29.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_29.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_29.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_29.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_29.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_3.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_3.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_3.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_3.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_3.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_3.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_3.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_3.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_3.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_3.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_3.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_3.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_30.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_30.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_30.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_30.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_30.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_30.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_30.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_30.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_30.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_30.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_30.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_30.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_31.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_31.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_31.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_31.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_31.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_31.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_31.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_31.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_31.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_31.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_31.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_31.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_32.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_32.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_32.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_32.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_32.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_32.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_32.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_32.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_32.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_32.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_32.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_32.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_33.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_33.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_33.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_33.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_33.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_33.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_33.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_33.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_33.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_33.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_33.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_33.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_34.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_34.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_34.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_34.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_34.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_34.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_34.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_34.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_34.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_34.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_34.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_34.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_35.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_35.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_35.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_35.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_35.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_35.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_35.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_35.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_35.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_35.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_35.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_35.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_36.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_36.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_36.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_36.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_36.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_36.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_36.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_36.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_36.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_36.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_36.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_36.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_37.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_37.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_37.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_37.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_37.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_37.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_37.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_37.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_37.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_37.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_37.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_37.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_38.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_38.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_38.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_38.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_38.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_38.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_38.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_38.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_38.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_38.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_38.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_38.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_39.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_39.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_39.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_39.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_39.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_39.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_39.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_39.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_39.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_39.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_39.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_39.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_4.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_4.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_4.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_4.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_4.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_4.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_4.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_4.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_4.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_4.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_4.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_4.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_40.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_40.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_40.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_40.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_40.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_40.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_40.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_40.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_40.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_40.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_40.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_40.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_41.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_41.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_41.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_41.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_41.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_41.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_41.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_41.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_41.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_41.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_41.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_41.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_42.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_42.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_42.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_42.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_42.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_42.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_42.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_42.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_42.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_42.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_42.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_42.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_43.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_43.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_43.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_43.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_43.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_43.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_43.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_43.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_43.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_43.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_43.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_43.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_44.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_44.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_44.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_44.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_44.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_44.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_44.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_44.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_44.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_44.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_44.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_44.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_45.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_45.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_45.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_45.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_45.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_45.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_45.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_45.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_45.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_45.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_45.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_45.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_46.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_46.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_46.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_46.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_46.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_46.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_46.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_46.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_46.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_46.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_46.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_46.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_47.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_47.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_47.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_47.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_47.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_47.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_47.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_47.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_47.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_47.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_47.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_47.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_48.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_48.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_48.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_48.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_48.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_48.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_48.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_48.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_48.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_48.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_48.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_48.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_49.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_49.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_49.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_49.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_49.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_49.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_49.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_49.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_49.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_49.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_49.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_49.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_5.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_5.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_5.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_5.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_5.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_5.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_5.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_5.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_5.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_5.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_5.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_5.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_50.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_50.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_50.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_50.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_50.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_50.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_50.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_50.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_50.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_50.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_50.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_50.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_51.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_51.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_51.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_51.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_51.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_51.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_51.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_51.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_51.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_51.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_51.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_51.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_52.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_52.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_52.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_52.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_52.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_52.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_52.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_52.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_52.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_52.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_52.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_52.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_53.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_53.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_53.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_53.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_53.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_53.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_53.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_53.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_53.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_53.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_53.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_53.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_54.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_54.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_54.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_54.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_54.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_54.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_54.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_54.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_54.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_54.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_54.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_54.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_55.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_55.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_55.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_55.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_55.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_55.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_55.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_55.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_55.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_55.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_55.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_55.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_56.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_56.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_56.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_56.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_56.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_56.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_56.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_56.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_56.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_56.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_56.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_56.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_57.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_57.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_57.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_57.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_57.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_57.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_57.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_57.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_57.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_57.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_57.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_57.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_58.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_58.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_58.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_58.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_58.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_58.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_58.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_58.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_58.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_58.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_58.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_58.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_59.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_59.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_59.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_59.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_59.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_59.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_59.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_59.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_59.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_59.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_59.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_59.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_6.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_6.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_6.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_6.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_6.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_6.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_6.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_6.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_6.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_6.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_6.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_6.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_60.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_60.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_60.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_60.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_60.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_60.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_60.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_60.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_60.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_60.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_60.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_60.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_61.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_61.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_61.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_61.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_61.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_61.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_61.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_61.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_61.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_61.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_61.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_61.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_62.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_62.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_62.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_62.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_62.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_62.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_62.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_62.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_62.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_62.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_62.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_62.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_63.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_63.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_63.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_63.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_63.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_63.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_63.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_63.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_63.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_63.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_63.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_63.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_64.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_64.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_64.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_64.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_64.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_64.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_64.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_64.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_64.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_64.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_64.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_64.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_65.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_65.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_65.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_65.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_65.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_65.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_65.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_65.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_65.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_65.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_65.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_65.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_66.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_66.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_66.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_66.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_66.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_66.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_66.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_66.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_66.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_66.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_66.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_66.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_67.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_67.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_67.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_67.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_67.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_67.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_67.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_67.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_67.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_67.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_67.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_67.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_68.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_68.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_68.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_68.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_68.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_68.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_68.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_68.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_68.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_68.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_68.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_68.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_7.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_7.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_7.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_7.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_7.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_7.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_7.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_7.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_7.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_7.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_7.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_7.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_8.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_8.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_8.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_8.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_8.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_8.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_8.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_8.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_8.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_8.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_8.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_8.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_9.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_9.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_9.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_9.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_9.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_9.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_9.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_9.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_9.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_9.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_9.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherit_graph_9.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherits.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherits.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/inherits.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/inherits.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Airwell_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Airwell_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Airwell_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Airwell_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Airwell_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Airwell_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Airwell_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Airwell_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Airwell_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Airwell_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Airwell_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Airwell_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Aiwa_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Aiwa_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Aiwa_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Aiwa_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Amcor_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Amcor_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Amcor_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Amcor_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Amcor_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Amcor_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Amcor_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Amcor_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Amcor_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Amcor_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Amcor_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Amcor_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Argo_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Argo_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Argo_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Argo_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Argo_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Argo_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Argo_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Argo_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Argo_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Argo_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Argo_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Argo_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Carrier_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Carrier_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Carrier_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Carrier_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Carrier_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Carrier_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Carrier_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Carrier_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Carrier_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Carrier_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Carrier_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Carrier_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Coolix_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Coolix_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Coolix_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Coolix_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Coolix_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Coolix_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Coolix_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Coolix_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Coolix_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Coolix_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Coolix_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Coolix_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Corona_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Corona_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Corona_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Corona_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Corona_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Corona_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Corona_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Corona_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Corona_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Corona_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Corona_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Corona_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Daikin_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Daikin_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Daikin_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Daikin_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Daikin_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Daikin_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Daikin_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Daikin_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Daikin_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Daikin_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Daikin_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Daikin_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Delonghi_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Delonghi_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Delonghi_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Delonghi_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Delonghi_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Delonghi_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Delonghi_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Delonghi_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Delonghi_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Delonghi_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Delonghi_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Delonghi_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Denon_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Denon_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Denon_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Denon_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Dish_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Dish_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Dish_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Dish_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Doshisha_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Doshisha_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Doshisha_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Doshisha_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Electra_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Electra_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Electra_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Electra_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Electra_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Electra_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Electra_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Electra_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Electra_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Electra_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Electra_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Electra_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Epson_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Epson_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Epson_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Epson_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Fujitsu_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Fujitsu_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Fujitsu_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Fujitsu_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Fujitsu_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Fujitsu_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Fujitsu_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Fujitsu_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Fujitsu_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Fujitsu_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Fujitsu_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Fujitsu_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__GICable_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__GICable_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__GICable_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__GICable_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__GlobalCache_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__GlobalCache_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__GlobalCache_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__GlobalCache_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Goodweather_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Goodweather_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Goodweather_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Goodweather_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Goodweather_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Goodweather_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Goodweather_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Goodweather_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Goodweather_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Goodweather_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Goodweather_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Goodweather_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Gree_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Gree_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Gree_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Gree_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Gree_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Gree_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Gree_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Gree_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Gree_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Gree_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Gree_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Gree_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Haier_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Haier_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Haier_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Haier_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Haier_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Haier_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Haier_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Haier_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Haier_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Haier_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Haier_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Haier_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Hitachi_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Hitachi_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Hitachi_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Hitachi_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Hitachi_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Hitachi_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Hitachi_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Hitachi_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Hitachi_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Hitachi_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Hitachi_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Hitachi_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Inax_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Inax_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Inax_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Inax_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__JVC_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__JVC_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__JVC_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__JVC_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Kelvinator_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Kelvinator_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Kelvinator_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Kelvinator_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Kelvinator_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Kelvinator_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Kelvinator_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Kelvinator_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Kelvinator_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Kelvinator_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Kelvinator_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Kelvinator_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__LG_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__LG_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__LG_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__LG_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__LG_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__LG_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__LG_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__LG_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__LG_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__LG_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__LG_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__LG_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Lasertag_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Lasertag_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Lasertag_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Lasertag_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Lego_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Lego_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Lego_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Lego_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Lutron_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Lutron_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Lutron_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Lutron_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MWM_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MWM_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MWM_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MWM_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Magiquest_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Magiquest_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Magiquest_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Magiquest_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Magiquest_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Magiquest_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Magiquest_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Magiquest_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Magiquest_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Magiquest_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Magiquest_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Magiquest_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Metz_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Metz_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Metz_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Metz_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Midea_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Midea_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Midea_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Midea_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Midea_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Midea_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Midea_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Midea_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Midea_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Midea_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Midea_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Midea_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MitsubishiHeavy_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MitsubishiHeavy_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MitsubishiHeavy_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MitsubishiHeavy_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MitsubishiHeavy_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MitsubishiHeavy_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MitsubishiHeavy_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MitsubishiHeavy_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MitsubishiHeavy_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MitsubishiHeavy_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MitsubishiHeavy_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__MitsubishiHeavy_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Mitsubishi_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Mitsubishi_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Mitsubishi_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Mitsubishi_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Mitsubishi_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Mitsubishi_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Mitsubishi_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Mitsubishi_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Mitsubishi_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Mitsubishi_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Mitsubishi_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Mitsubishi_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Multibrackets_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Multibrackets_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Multibrackets_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Multibrackets_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__NEC_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__NEC_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__NEC_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__NEC_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__NEC_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__NEC_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__NEC_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__NEC_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__NEC_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__NEC_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__NEC_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__NEC_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Neoclima_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Neoclima_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Neoclima_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Neoclima_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Neoclima_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Neoclima_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Neoclima_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Neoclima_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Neoclima_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Neoclima_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Neoclima_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Neoclima_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Nikai_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Nikai_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Nikai_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Nikai_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Panasonic_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Panasonic_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Panasonic_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Panasonic_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Panasonic_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Panasonic_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Panasonic_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Panasonic_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Panasonic_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Panasonic_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Panasonic_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Panasonic_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Pioneer_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Pioneer_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Pioneer_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Pioneer_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Pronto_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Pronto_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Pronto_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Pronto_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__RC5__RC6_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__RC5__RC6_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__RC5__RC6_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__RC5__RC6_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__RCMM_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__RCMM_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__RCMM_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__RCMM_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Samsung_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Samsung_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Samsung_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Samsung_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Samsung_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Samsung_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Samsung_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Samsung_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Samsung_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Samsung_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Samsung_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Samsung_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sanyo_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sanyo_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sanyo_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sanyo_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sanyo_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sanyo_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sanyo_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sanyo_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sanyo_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sanyo_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sanyo_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sanyo_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sharp_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sharp_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sharp_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sharp_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sharp_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sharp_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sharp_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sharp_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sharp_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sharp_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sharp_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sharp_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sherwood_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sherwood_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sherwood_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sherwood_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sony_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sony_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sony_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Sony_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Symphony_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Symphony_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Symphony_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Symphony_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Tcl_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Tcl_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Tcl_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Tcl_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Tcl_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Tcl_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Tcl_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Tcl_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Tcl_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Tcl_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Tcl_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Tcl_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Technibel_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Technibel_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Technibel_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Technibel_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Technibel_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Technibel_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Technibel_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Technibel_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Technibel_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Technibel_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Technibel_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Technibel_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Teco_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Teco_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Teco_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Teco_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Teco_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Teco_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Teco_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Teco_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Teco_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Teco_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Teco_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Teco_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Toshiba_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Toshiba_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Toshiba_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Toshiba_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Toshiba_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Toshiba_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Toshiba_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Toshiba_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Toshiba_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Toshiba_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Toshiba_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Toshiba_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Transcold_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Transcold_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Transcold_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Transcold_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Transcold_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Transcold_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Transcold_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Transcold_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Transcold_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Transcold_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Transcold_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Transcold_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Trotec_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Trotec_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Trotec_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Trotec_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Trotec_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Trotec_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Trotec_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Trotec_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Trotec_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Trotec_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Trotec_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Trotec_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Vestel_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Vestel_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Vestel_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Vestel_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Vestel_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Vestel_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Vestel_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Vestel_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Vestel_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Vestel_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Vestel_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Vestel_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Voltas_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Voltas_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Voltas_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Voltas_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Voltas_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Voltas_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Voltas_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Voltas_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Voltas_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Voltas_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Voltas_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Voltas_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whirlpool_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whirlpool_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whirlpool_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whirlpool_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whirlpool_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whirlpool_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whirlpool_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whirlpool_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whirlpool_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whirlpool_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whirlpool_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whirlpool_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whynter_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whynter_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whynter_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Whynter_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Zepeal_8cpp.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Zepeal_8cpp.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Zepeal_8cpp.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/ir__Zepeal_8cpp.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/it-IT_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/it-IT_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/it-IT_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/it-IT_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/it-IT_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/it-IT_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/it-IT_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/it-IT_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/jquery.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/jquery.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/jquery.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/jquery.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/md_src_locale_README.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/md_src_locale_README.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/md_src_locale_README.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/md_src_locale_README.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/menu.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/menu.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/menu.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/menu.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/menudata.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/menudata.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/menudata.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/menudata.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespaceIRAcUtils.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespaceIRAcUtils.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespaceIRAcUtils.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespaceIRAcUtils.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespaceirutils.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespaceirutils.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespaceirutils.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespaceirutils.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacemembers.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacemembers.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacemembers.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacemembers.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacemembers_enum.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacemembers_enum.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacemembers_enum.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacemembers_enum.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacemembers_func.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacemembers_func.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacemembers_func.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacemembers_func.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespaces.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespaces.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespaces.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespaces.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacestdAc.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacestdAc.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacestdAc.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/namespacestdAc.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/nav_f.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/nav_f.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/nav_f.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/nav_f.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/nav_g.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/nav_g.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/nav_g.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/nav_g.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/nav_h.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/nav_h.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/nav_h.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/nav_h.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/open.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/open.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/open.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/open.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/pages.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/pages.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/pages.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/pages.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_0.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_0.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_0.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_0.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_0.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_0.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_0.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_0.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_10.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_10.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_10.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_10.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_10.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_10.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_10.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_10.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_11.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_11.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_11.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_11.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_11.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_11.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_11.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_11.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_12.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_12.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_12.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_12.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_12.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_12.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_12.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_12.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_13.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_13.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_13.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_13.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_13.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_13.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_13.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_13.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_14.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_14.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_14.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_14.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_14.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_14.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_14.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_14.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_15.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_15.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_15.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_15.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_15.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_15.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_15.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_15.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_16.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_16.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_16.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_16.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_16.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_16.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_16.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_16.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_17.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_17.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_17.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_17.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_17.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_17.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_17.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_17.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_18.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_18.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_18.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_18.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_18.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_18.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_18.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_18.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_19.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_19.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_19.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_19.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_19.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_19.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_19.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_19.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1a.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1a.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1a.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1a.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1a.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1a.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1a.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1a.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1b.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1b.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1b.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1b.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1b.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1b.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1b.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_1b.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_2.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_2.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_2.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_2.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_2.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_2.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_2.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_2.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_3.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_3.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_3.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_3.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_3.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_3.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_3.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_3.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_4.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_4.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_4.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_4.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_4.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_4.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_4.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_4.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_5.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_5.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_5.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_5.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_5.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_5.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_5.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_5.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_6.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_6.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_6.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_6.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_6.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_6.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_6.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_6.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_7.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_7.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_7.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_7.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_7.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_7.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_7.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_7.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_8.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_8.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_8.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_8.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_8.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_8.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_8.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_8.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_9.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_9.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_9.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_9.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_9.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_9.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_9.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_9.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_a.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_a.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_a.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_a.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_a.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_a.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_a.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_a.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_b.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_b.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_b.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_b.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_b.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_b.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_b.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_b.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_c.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_c.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_c.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_c.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_c.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_c.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_c.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_c.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_d.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_d.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_d.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_d.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_d.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_d.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_d.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_d.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_e.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_e.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_e.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_e.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_e.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_e.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_e.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_e.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_f.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_f.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_f.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_f.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_f.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_f.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_f.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/all_f.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_0.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_0.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_0.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_0.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_0.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_0.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_0.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_0.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_1.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_1.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_1.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_1.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_1.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_1.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_1.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_1.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_2.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_2.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_2.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_2.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_2.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_2.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_2.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_2.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_3.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_3.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_3.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_3.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_3.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_3.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_3.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_3.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_4.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_4.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_4.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_4.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_4.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_4.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_4.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_4.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_5.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_5.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_5.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_5.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_5.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_5.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_5.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_5.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_6.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_6.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_6.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_6.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_6.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_6.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_6.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_6.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_7.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_7.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_7.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_7.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_7.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_7.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_7.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_7.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_8.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_8.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_8.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_8.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_8.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_8.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_8.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_8.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_9.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_9.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_9.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_9.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_9.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_9.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_9.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/classes_9.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/close.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/close.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/close.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/close.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_0.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_0.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_0.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_0.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_0.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_0.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_0.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_0.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_1.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_1.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_1.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_1.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_1.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_1.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_1.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_1.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_2.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_2.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_2.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_2.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_2.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_2.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_2.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_2.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_3.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_3.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_3.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_3.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_3.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_3.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_3.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_3.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_4.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_4.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_4.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_4.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_4.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_4.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_4.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_4.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_5.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_5.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_5.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_5.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_5.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_5.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_5.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_5.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_6.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_6.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_6.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_6.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_6.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_6.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_6.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_6.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_7.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_7.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_7.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_7.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_7.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_7.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_7.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_7.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_8.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_8.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_8.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_8.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_8.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_8.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_8.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_8.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_9.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_9.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_9.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_9.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_9.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_9.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_9.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enums_9.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_0.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_0.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_0.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_0.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_0.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_0.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_0.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_0.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_1.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_1.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_1.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_1.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_1.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_1.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_1.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_1.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_10.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_10.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_10.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_10.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_10.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_10.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_10.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_10.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_11.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_11.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_11.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_11.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_11.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_11.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_11.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_11.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_12.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_12.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_12.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_12.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_12.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_12.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_12.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_12.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_13.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_13.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_13.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_13.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_13.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_13.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_13.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_13.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_14.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_14.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_14.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_14.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_14.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_14.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_14.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_14.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_15.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_15.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_15.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_15.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_15.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_15.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_15.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_15.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_2.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_2.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_2.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_2.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_2.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_2.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_2.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_2.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_3.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_3.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_3.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_3.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_3.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_3.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_3.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_3.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_4.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_4.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_4.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_4.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_4.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_4.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_4.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_4.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_5.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_5.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_5.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_5.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_5.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_5.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_5.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_5.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_6.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_6.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_6.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_6.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_6.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_6.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_6.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_6.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_7.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_7.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_7.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_7.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_7.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_7.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_7.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_7.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_8.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_8.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_8.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_8.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_8.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_8.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_8.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_8.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_9.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_9.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_9.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_9.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_9.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_9.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_9.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_9.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_a.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_a.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_a.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_a.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_a.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_a.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_a.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_a.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_b.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_b.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_b.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_b.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_b.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_b.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_b.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_b.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_c.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_c.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_c.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_c.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_c.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_c.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_c.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_c.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_d.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_d.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_d.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_d.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_d.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_d.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_d.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_d.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_e.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_e.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_e.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_e.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_e.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_e.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_e.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_e.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_f.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_f.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_f.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_f.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_f.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_f.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_f.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/enumvalues_f.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_0.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_0.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_0.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_0.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_0.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_0.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_0.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_0.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_1.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_1.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_1.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_1.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_1.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_1.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_1.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_1.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_2.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_2.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_2.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_2.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_2.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_2.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_2.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_2.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_3.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_3.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_3.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_3.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_3.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_3.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_3.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_3.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_4.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_4.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_4.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_4.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_4.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_4.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_4.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_4.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_5.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_5.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_5.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_5.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_5.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_5.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_5.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/files_5.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_0.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_0.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_0.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_0.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_0.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_0.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_0.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_0.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_1.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_1.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_1.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_1.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_1.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_1.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_1.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_1.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_10.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_10.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_10.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_10.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_10.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_10.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_10.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_10.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_11.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_11.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_11.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_11.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_11.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_11.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_11.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_11.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_12.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_12.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_12.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_12.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_12.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_12.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_12.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_12.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_13.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_13.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_13.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_13.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_13.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_13.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_13.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_13.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_14.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_14.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_14.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_14.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_14.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_14.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_14.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_14.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_15.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_15.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_15.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_15.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_15.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_15.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_15.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_15.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_16.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_16.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_16.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_16.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_16.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_16.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_16.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_16.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_17.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_17.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_17.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_17.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_17.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_17.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_17.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_17.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_2.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_2.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_2.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_2.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_2.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_2.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_2.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_2.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_3.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_3.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_3.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_3.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_3.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_3.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_3.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_3.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_4.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_4.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_4.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_4.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_4.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_4.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_4.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_4.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_5.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_5.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_5.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_5.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_5.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_5.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_5.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_5.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_6.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_6.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_6.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_6.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_6.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_6.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_6.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_6.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_7.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_7.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_7.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_7.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_7.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_7.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_7.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_7.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_8.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_8.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_8.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_8.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_8.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_8.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_8.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_8.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_9.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_9.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_9.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_9.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_9.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_9.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_9.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_9.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_a.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_a.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_a.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_a.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_a.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_a.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_a.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_a.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_b.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_b.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_b.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_b.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_b.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_b.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_b.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_b.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_c.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_c.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_c.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_c.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_c.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_c.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_c.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_c.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_d.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_d.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_d.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_d.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_d.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_d.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_d.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_d.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_e.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_e.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_e.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_e.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_e.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_e.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_e.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_e.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_f.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_f.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_f.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_f.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_f.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_f.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_f.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/functions_f.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/mag_sel.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/mag_sel.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/mag_sel.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/mag_sel.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_0.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_0.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_0.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_0.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_0.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_0.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_0.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_0.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_1.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_1.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_1.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_1.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_1.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_1.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_1.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/namespaces_1.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/nomatches.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/nomatches.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/nomatches.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/nomatches.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_0.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_0.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_0.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_0.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_0.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_0.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_0.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_0.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_1.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_1.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_1.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_1.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_1.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_1.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_1.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_1.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_2.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_2.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_2.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_2.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_2.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_2.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_2.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/pages_2.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/related_0.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/related_0.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/related_0.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/related_0.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/related_0.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/related_0.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/related_0.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/related_0.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search.css b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search.css
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search.css
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search.css
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search_l.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search_l.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search_l.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search_l.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search_m.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search_m.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search_m.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search_m.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search_r.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search_r.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search_r.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/search_r.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/searchdata.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/searchdata.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/searchdata.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/searchdata.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/typedefs_0.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/typedefs_0.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/typedefs_0.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/typedefs_0.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/typedefs_0.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/typedefs_0.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/typedefs_0.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/typedefs_0.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_0.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_0.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_0.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_0.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_0.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_0.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_0.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_0.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_1.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_1.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_1.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_1.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_1.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_1.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_1.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_1.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_10.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_10.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_10.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_10.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_10.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_10.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_10.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_10.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_11.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_11.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_11.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_11.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_11.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_11.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_11.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_11.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_12.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_12.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_12.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_12.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_12.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_12.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_12.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_12.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_13.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_13.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_13.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_13.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_13.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_13.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_13.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_13.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_14.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_14.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_14.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_14.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_14.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_14.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_14.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_14.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_15.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_15.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_15.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_15.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_15.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_15.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_15.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_15.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_16.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_16.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_16.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_16.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_16.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_16.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_16.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_16.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_17.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_17.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_17.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_17.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_17.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_17.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_17.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_17.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_2.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_2.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_2.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_2.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_2.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_2.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_2.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_2.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_3.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_3.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_3.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_3.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_3.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_3.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_3.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_3.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_4.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_4.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_4.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_4.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_4.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_4.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_4.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_4.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_5.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_5.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_5.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_5.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_5.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_5.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_5.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_5.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_6.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_6.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_6.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_6.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_6.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_6.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_6.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_6.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_7.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_7.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_7.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_7.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_7.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_7.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_7.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_7.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_8.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_8.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_8.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_8.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_8.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_8.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_8.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_8.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_9.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_9.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_9.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_9.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_9.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_9.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_9.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_9.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_a.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_a.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_a.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_a.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_a.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_a.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_a.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_a.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_b.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_b.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_b.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_b.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_b.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_b.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_b.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_b.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_c.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_c.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_c.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_c.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_c.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_c.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_c.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_c.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_d.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_d.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_d.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_d.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_d.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_d.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_d.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_d.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_e.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_e.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_e.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_e.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_e.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_e.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_e.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_e.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_f.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_f.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_f.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_f.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_f.js b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_f.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_f.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/search/variables_f.js
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/splitbar.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/splitbar.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/splitbar.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/splitbar.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structCoronaSection-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structCoronaSection-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structCoronaSection-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structCoronaSection-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structCoronaSection.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structCoronaSection.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structCoronaSection.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structCoronaSection.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structirparams__t-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structirparams__t-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structirparams__t-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structirparams__t-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structirparams__t.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structirparams__t.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structirparams__t.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structirparams__t.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structmatch__result__t-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structmatch__result__t-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structmatch__result__t-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structmatch__result__t-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structmatch__result__t.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structmatch__result__t.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structmatch__result__t.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structmatch__result__t.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structstdAc_1_1state__t-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structstdAc_1_1state__t-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structstdAc_1_1state__t-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structstdAc_1_1state__t-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structstdAc_1_1state__t.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structstdAc_1_1state__t.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/structstdAc_1_1state__t.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/structstdAc_1_1state__t.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/sync_off.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/sync_off.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/sync_off.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/sync_off.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/sync_on.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/sync_on.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/sync_on.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/sync_on.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_a.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_a.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_a.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_a.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_b.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_b.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_b.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_b.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_h.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_h.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_h.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_h.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_s.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_s.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_s.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/tab_s.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/tabs.css b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/tabs.css
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/tabs.css
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/tabs.css
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/todo.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/todo.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/todo.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/todo.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAirwellProtocol-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAirwellProtocol-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAirwellProtocol-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAirwellProtocol-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAirwellProtocol.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAirwellProtocol.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAirwellProtocol.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAirwellProtocol.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAmcorProtocol-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAmcorProtocol-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAmcorProtocol-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAmcorProtocol-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAmcorProtocol.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAmcorProtocol.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAmcorProtocol.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionAmcorProtocol.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionArgoProtocol-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionArgoProtocol-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionArgoProtocol-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionArgoProtocol-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionArgoProtocol.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionArgoProtocol.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionArgoProtocol.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionArgoProtocol.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCarrierProtocol-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCarrierProtocol-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCarrierProtocol-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCarrierProtocol-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCarrierProtocol.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCarrierProtocol.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCarrierProtocol.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCarrierProtocol.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol__coll__graph.map b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol__coll__graph.map
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol__coll__graph.map
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol__coll__graph.map
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol__coll__graph.md5 b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol__coll__graph.md5
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol__coll__graph.md5
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol__coll__graph.md5
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol__coll__graph.png b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol__coll__graph.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol__coll__graph.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionCoronaProtocol__coll__graph.png
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionDelonghiProtocol-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionDelonghiProtocol-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionDelonghiProtocol-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionDelonghiProtocol-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionDelonghiProtocol.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionDelonghiProtocol.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionDelonghiProtocol.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionDelonghiProtocol.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionGreeProtocol-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionGreeProtocol-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionGreeProtocol-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionGreeProtocol-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionGreeProtocol.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionGreeProtocol.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionGreeProtocol.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionGreeProtocol.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierProtocol-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierProtocol-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierProtocol-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierProtocol-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierProtocol.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierProtocol.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierProtocol.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierProtocol.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierYRW02Protocol-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierYRW02Protocol-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierYRW02Protocol-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierYRW02Protocol-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierYRW02Protocol.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierYRW02Protocol.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierYRW02Protocol.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionHaierYRW02Protocol.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionMideaProtocol-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionMideaProtocol-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionMideaProtocol-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionMideaProtocol-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionMideaProtocol.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionMideaProtocol.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionMideaProtocol.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionMideaProtocol.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionVoltasProtocol-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionVoltasProtocol-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionVoltasProtocol-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionVoltasProtocol-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionVoltasProtocol.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionVoltasProtocol.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionVoltasProtocol.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionVoltasProtocol.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionmagiquest-members.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionmagiquest-members.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionmagiquest-members.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionmagiquest-members.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionmagiquest.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionmagiquest.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/unionmagiquest.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/unionmagiquest.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/zh-CN_8h.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/zh-CN_8h.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/zh-CN_8h.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/zh-CN_8h.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen/html/zh-CN_8h_source.html b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/zh-CN_8h_source.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen/html/zh-CN_8h_source.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen/html/zh-CN_8h_source.html
diff --git a/lib/IRremoteESP8266-2.7.11/docs/doxygen_index.md b/lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen_index.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/docs/doxygen_index.md
rename to lib/lib_basic/IRremoteESP8266-2.7.11/docs/doxygen_index.md
diff --git a/lib/IRremoteESP8266-2.7.11/examples/BlynkIrRemote/BlynkIrRemote.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/BlynkIrRemote/BlynkIrRemote.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/BlynkIrRemote/BlynkIrRemote.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/BlynkIrRemote/BlynkIrRemote.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/BlynkIrRemote/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/BlynkIrRemote/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/BlynkIrRemote/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/BlynkIrRemote/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/CommonAcControl/CommonAcControl.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/CommonAcControl/CommonAcControl.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/CommonAcControl/CommonAcControl.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/CommonAcControl/CommonAcControl.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/CommonAcControl/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/CommonAcControl/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/CommonAcControl/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/CommonAcControl/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/ControlSamsungAC/ControlSamsungAC.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/ControlSamsungAC/ControlSamsungAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/ControlSamsungAC/ControlSamsungAC.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/ControlSamsungAC/ControlSamsungAC.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/ControlSamsungAC/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/ControlSamsungAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/ControlSamsungAC/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/ControlSamsungAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/DumbIRRepeater/DumbIRRepeater.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/DumbIRRepeater/DumbIRRepeater.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/DumbIRRepeater/DumbIRRepeater.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/DumbIRRepeater/DumbIRRepeater.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/DumbIRRepeater/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/DumbIRRepeater/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/DumbIRRepeater/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/DumbIRRepeater/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRGCSendDemo/IRGCSendDemo.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRGCSendDemo/IRGCSendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRGCSendDemo/IRGCSendDemo.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRGCSendDemo/IRGCSendDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRGCSendDemo/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRGCSendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRGCSendDemo/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRGCSendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRGCTCPServer/IRGCTCPServer.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRGCTCPServer/IRGCTCPServer.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRGCTCPServer/IRGCTCPServer.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRGCTCPServer/IRGCTCPServer.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRGCTCPServer/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRGCTCPServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRGCTCPServer/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRGCTCPServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRMQTTServer/IRMQTTServer.h b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRMQTTServer/IRMQTTServer.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRMQTTServer/IRMQTTServer.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRMQTTServer/IRMQTTServer.h
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRMQTTServer/IRMQTTServer.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRMQTTServer/IRMQTTServer.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRMQTTServer/IRMQTTServer.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRMQTTServer/IRMQTTServer.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRMQTTServer/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRMQTTServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRMQTTServer/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRMQTTServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRServer/IRServer.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRServer/IRServer.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRServer/IRServer.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRServer/IRServer.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRServer/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRServer/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRrecvDemo/IRrecvDemo.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDemo/IRrecvDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRrecvDemo/IRrecvDemo.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDemo/IRrecvDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRrecvDemo/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRrecvDemo/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRrecvDump/IRrecvDump.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDump/IRrecvDump.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRrecvDump/IRrecvDump.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDump/IRrecvDump.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRrecvDump/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDump/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRrecvDump/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDump/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRrecvDumpV2/IRrecvDumpV2.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDumpV2/IRrecvDumpV2.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRrecvDumpV2/IRrecvDumpV2.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDumpV2/IRrecvDumpV2.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRrecvDumpV2/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDumpV2/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRrecvDumpV2/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDumpV2/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRrecvDumpV3/BaseOTA.h b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDumpV3/BaseOTA.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRrecvDumpV3/BaseOTA.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDumpV3/BaseOTA.h
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRrecvDumpV3/IRrecvDumpV3.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDumpV3/IRrecvDumpV3.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRrecvDumpV3/IRrecvDumpV3.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDumpV3/IRrecvDumpV3.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRrecvDumpV3/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDumpV3/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRrecvDumpV3/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRrecvDumpV3/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRsendDemo/IRsendDemo.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRsendDemo/IRsendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRsendDemo/IRsendDemo.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRsendDemo/IRsendDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRsendDemo/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRsendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRsendDemo/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRsendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRsendProntoDemo/IRsendProntoDemo.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRsendProntoDemo/IRsendProntoDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRsendProntoDemo/IRsendProntoDemo.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRsendProntoDemo/IRsendProntoDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/IRsendProntoDemo/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRsendProntoDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/IRsendProntoDemo/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/IRsendProntoDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/JVCPanasonicSendDemo/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/JVCPanasonicSendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/JVCPanasonicSendDemo/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/JVCPanasonicSendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/LGACSend/LGACSend.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/LGACSend/LGACSend.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/LGACSend/LGACSend.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/LGACSend/LGACSend.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/LGACSend/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/LGACSend/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/LGACSend/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/LGACSend/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/SmartIRRepeater/SmartIRRepeater.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/SmartIRRepeater/SmartIRRepeater.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/SmartIRRepeater/SmartIRRepeater.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/SmartIRRepeater/SmartIRRepeater.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/SmartIRRepeater/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/SmartIRRepeater/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/SmartIRRepeater/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/SmartIRRepeater/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnArgoAC/TurnOnArgoAC.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnArgoAC/TurnOnArgoAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnArgoAC/TurnOnArgoAC.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnArgoAC/TurnOnArgoAC.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnArgoAC/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnArgoAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnArgoAC/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnArgoAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnDaikinAC/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnDaikinAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnDaikinAC/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnDaikinAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnFujitsuAC/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnFujitsuAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnFujitsuAC/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnFujitsuAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnGreeAC/TurnOnGreeAC.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnGreeAC/TurnOnGreeAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnGreeAC/TurnOnGreeAC.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnGreeAC/TurnOnGreeAC.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnGreeAC/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnGreeAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnGreeAC/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnGreeAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnKelvinatorAC/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnKelvinatorAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnKelvinatorAC/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnKelvinatorAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiAC/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiAC/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiHeavyAc/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiHeavyAc/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiHeavyAc/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnMitsubishiHeavyAc/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnPanasonicAC/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnPanasonicAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnPanasonicAC/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnPanasonicAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnToshibaAC/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnToshibaAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnToshibaAC/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnToshibaAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/TurnOnTrotecAC/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnTrotecAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/TurnOnTrotecAC/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/TurnOnTrotecAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/README.md b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/README.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/README.md
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/README.md
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/Web-AC-control.h b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/Web-AC-control.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/Web-AC-control.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/Web-AC-control.h
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/Web-AC-control.ino b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/Web-AC-control.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/Web-AC-control.ino
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/Web-AC-control.ino
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/favicon.ico b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/favicon.ico
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/favicon.ico
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/favicon.ico
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_1_off.svg b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_1_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_1_off.svg
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_1_off.svg
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_1_on.svg b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_1_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_1_on.svg
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_1_on.svg
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_2_off.svg b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_2_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_2_off.svg
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_2_off.svg
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_2_on.svg b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_2_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_2_on.svg
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_2_on.svg
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_3_off.svg b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_3_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_3_off.svg
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_3_off.svg
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_3_on.svg b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_3_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_3_on.svg
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_3_on.svg
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_4_off.svg b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_4_off.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_4_off.svg
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_4_off.svg
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_4_on.svg b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_4_on.svg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_4_on.svg
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/level_4_on.svg
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/ui.html b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/ui.html
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/ui.html
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/ui.html
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/ui.js b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/ui.js
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/ui.js
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/data/ui.js
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/printscreen.png b/lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/printscreen.png
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/examples/Web-AC-control/printscreen.png
rename to lib/lib_basic/IRremoteESP8266-2.7.11/examples/Web-AC-control/printscreen.png
diff --git a/lib/IRremoteESP8266-2.7.11/keywords.txt b/lib/lib_basic/IRremoteESP8266-2.7.11/keywords.txt
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/keywords.txt
rename to lib/lib_basic/IRremoteESP8266-2.7.11/keywords.txt
diff --git a/lib/IRremoteESP8266-2.7.11/library.json b/lib/lib_basic/IRremoteESP8266-2.7.11/library.json
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/library.json
rename to lib/lib_basic/IRremoteESP8266-2.7.11/library.json
diff --git a/lib/IRremoteESP8266-2.7.11/library.properties b/lib/lib_basic/IRremoteESP8266-2.7.11/library.properties
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/library.properties
rename to lib/lib_basic/IRremoteESP8266-2.7.11/library.properties
diff --git a/lib/IRremoteESP8266-2.7.11/platformio.ini b/lib/lib_basic/IRremoteESP8266-2.7.11/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/platformio.ini
rename to lib/lib_basic/IRremoteESP8266-2.7.11/platformio.ini
diff --git a/lib/IRremoteESP8266-2.7.11/pylintrc b/lib/lib_basic/IRremoteESP8266-2.7.11/pylintrc
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/pylintrc
rename to lib/lib_basic/IRremoteESP8266-2.7.11/pylintrc
diff --git a/lib/IRremoteESP8266-2.7.11/src/CPPLINT.cfg b/lib/lib_basic/IRremoteESP8266-2.7.11/src/CPPLINT.cfg
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/CPPLINT.cfg
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/CPPLINT.cfg
diff --git a/lib/IRremoteESP8266-2.7.11/src/IRac.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/IRac.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/IRac.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/IRac.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/IRac.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/IRac.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/IRac.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/IRac.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/IRrecv.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/IRrecv.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/IRrecv.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/IRrecv.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/IRrecv.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/IRrecv.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/IRrecv.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/IRrecv.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/IRremoteESP8266.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/IRremoteESP8266.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/IRremoteESP8266.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/IRremoteESP8266.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/IRsend.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/IRsend.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/IRsend.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/IRsend.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/IRsend.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/IRsend.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/IRsend.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/IRsend.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/IRtext.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/IRtext.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/IRtext.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/IRtext.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/IRtext.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/IRtext.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/IRtext.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/IRtext.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/IRtimer.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/IRtimer.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/IRtimer.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/IRtimer.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/IRtimer.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/IRtimer.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/IRtimer.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/IRtimer.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/IRutils.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/IRutils.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/IRutils.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/IRutils.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/IRutils.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/IRutils.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/IRutils.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/IRutils.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/i18n.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/i18n.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/i18n.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/i18n.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Airwell.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Airwell.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Airwell.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Airwell.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Airwell.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Airwell.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Airwell.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Airwell.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Aiwa.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Aiwa.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Aiwa.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Aiwa.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Amcor.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Amcor.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Amcor.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Amcor.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Amcor.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Amcor.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Amcor.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Amcor.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Argo.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Argo.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Argo.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Argo.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Argo.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Argo.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Argo.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Argo.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Carrier.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Carrier.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Carrier.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Carrier.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Carrier.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Carrier.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Carrier.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Carrier.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Coolix.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Coolix.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Coolix.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Coolix.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Coolix.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Coolix.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Coolix.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Coolix.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Corona.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Corona.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Corona.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Corona.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Corona.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Corona.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Corona.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Corona.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Daikin.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Daikin.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Daikin.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Daikin.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Daikin.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Daikin.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Daikin.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Daikin.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Delonghi.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Delonghi.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Delonghi.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Delonghi.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Delonghi.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Delonghi.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Delonghi.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Delonghi.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Denon.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Denon.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Denon.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Denon.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Dish.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Dish.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Dish.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Dish.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Doshisha.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Doshisha.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Doshisha.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Doshisha.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Electra.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Electra.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Electra.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Electra.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Electra.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Electra.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Electra.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Electra.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Epson.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Epson.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Epson.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Epson.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Fujitsu.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Fujitsu.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Fujitsu.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Fujitsu.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Fujitsu.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Fujitsu.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Fujitsu.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Fujitsu.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_GICable.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_GICable.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_GICable.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_GICable.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_GlobalCache.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_GlobalCache.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_GlobalCache.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_GlobalCache.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Goodweather.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Goodweather.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Goodweather.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Goodweather.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Goodweather.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Goodweather.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Goodweather.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Goodweather.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Gree.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Gree.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Gree.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Gree.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Gree.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Gree.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Gree.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Gree.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Haier.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Haier.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Haier.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Haier.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Haier.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Haier.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Haier.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Haier.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Hitachi.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Hitachi.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Hitachi.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Hitachi.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Hitachi.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Hitachi.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Hitachi.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Hitachi.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Inax.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Inax.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Inax.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Inax.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_JVC.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_JVC.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_JVC.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_JVC.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Kelvinator.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Kelvinator.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Kelvinator.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Kelvinator.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Kelvinator.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Kelvinator.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Kelvinator.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Kelvinator.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_LG.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_LG.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_LG.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_LG.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_LG.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_LG.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_LG.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_LG.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Lasertag.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Lasertag.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Lasertag.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Lasertag.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Lego.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Lego.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Lego.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Lego.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Lutron.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Lutron.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Lutron.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Lutron.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_MWM.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_MWM.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_MWM.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_MWM.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Magiquest.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Magiquest.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Magiquest.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Magiquest.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Magiquest.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Magiquest.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Magiquest.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Magiquest.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Metz.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Metz.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Metz.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Metz.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Midea.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Midea.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Midea.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Midea.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Midea.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Midea.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Midea.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Midea.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Mitsubishi.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Mitsubishi.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Mitsubishi.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Mitsubishi.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Mitsubishi.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Mitsubishi.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Mitsubishi.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Mitsubishi.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_MitsubishiHeavy.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_MitsubishiHeavy.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_MitsubishiHeavy.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_MitsubishiHeavy.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_MitsubishiHeavy.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_MitsubishiHeavy.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_MitsubishiHeavy.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_MitsubishiHeavy.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Multibrackets.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Multibrackets.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Multibrackets.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Multibrackets.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_NEC.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_NEC.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_NEC.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_NEC.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_NEC.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_NEC.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_NEC.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_NEC.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Neoclima.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Neoclima.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Neoclima.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Neoclima.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Neoclima.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Neoclima.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Neoclima.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Neoclima.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Nikai.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Nikai.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Nikai.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Nikai.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Panasonic.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Panasonic.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Panasonic.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Panasonic.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Panasonic.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Panasonic.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Panasonic.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Panasonic.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Pioneer.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Pioneer.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Pioneer.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Pioneer.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Pronto.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Pronto.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Pronto.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Pronto.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_RC5_RC6.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_RC5_RC6.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_RC5_RC6.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_RC5_RC6.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_RCMM.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_RCMM.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_RCMM.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_RCMM.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Samsung.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Samsung.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Samsung.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Samsung.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Samsung.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Samsung.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Samsung.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Samsung.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Sanyo.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Sanyo.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Sanyo.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Sanyo.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Sanyo.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Sanyo.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Sanyo.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Sanyo.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Sharp.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Sharp.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Sharp.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Sharp.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Sharp.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Sharp.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Sharp.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Sharp.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Sherwood.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Sherwood.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Sherwood.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Sherwood.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Sony.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Sony.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Sony.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Sony.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Symphony.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Symphony.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Symphony.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Symphony.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Tcl.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Tcl.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Tcl.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Tcl.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Tcl.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Tcl.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Tcl.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Tcl.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Technibel.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Technibel.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Technibel.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Technibel.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Technibel.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Technibel.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Technibel.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Technibel.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Teco.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Teco.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Teco.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Teco.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Teco.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Teco.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Teco.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Teco.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Toshiba.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Toshiba.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Toshiba.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Toshiba.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Toshiba.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Toshiba.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Toshiba.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Toshiba.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Transcold.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Transcold.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Transcold.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Transcold.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Transcold.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Transcold.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Transcold.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Transcold.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Trotec.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Trotec.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Trotec.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Trotec.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Trotec.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Trotec.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Trotec.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Trotec.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Vestel.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Vestel.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Vestel.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Vestel.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Vestel.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Vestel.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Vestel.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Vestel.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Voltas.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Voltas.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Voltas.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Voltas.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Voltas.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Voltas.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Voltas.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Voltas.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Whirlpool.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Whirlpool.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Whirlpool.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Whirlpool.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Whirlpool.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Whirlpool.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Whirlpool.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Whirlpool.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Whynter.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Whynter.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Whynter.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Whynter.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/ir_Zepeal.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Zepeal.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/ir_Zepeal.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/ir_Zepeal.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/src/locale/README.md b/lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/README.md
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/locale/README.md
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/README.md
diff --git a/lib/IRremoteESP8266-2.7.11/src/locale/de-CH.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/de-CH.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/locale/de-CH.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/de-CH.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/locale/de-DE.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/de-DE.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/locale/de-DE.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/de-DE.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/locale/defaults.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/defaults.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/locale/defaults.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/defaults.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/locale/en-AU.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/en-AU.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/locale/en-AU.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/en-AU.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/locale/en-IE.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/en-IE.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/locale/en-IE.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/en-IE.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/locale/en-UK.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/en-UK.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/locale/en-UK.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/en-UK.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/locale/en-US.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/en-US.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/locale/en-US.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/en-US.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/locale/es-ES.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/es-ES.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/locale/es-ES.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/es-ES.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/locale/fr-FR.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/fr-FR.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/locale/fr-FR.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/fr-FR.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/locale/it-IT.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/it-IT.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/locale/it-IT.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/it-IT.h
diff --git a/lib/IRremoteESP8266-2.7.11/src/locale/zh-CN.h b/lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/zh-CN.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/src/locale/zh-CN.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/src/locale/zh-CN.h
diff --git a/lib/IRremoteESP8266-2.7.11/test/IRac_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/IRac_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/IRac_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/IRac_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/IRrecv_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/IRrecv_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/IRrecv_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/IRrecv_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/IRrecv_test.h b/lib/lib_basic/IRremoteESP8266-2.7.11/test/IRrecv_test.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/IRrecv_test.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/IRrecv_test.h
diff --git a/lib/IRremoteESP8266-2.7.11/test/IRsend_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/IRsend_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/IRsend_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/IRsend_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/IRsend_test.h b/lib/lib_basic/IRremoteESP8266-2.7.11/test/IRsend_test.h
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/IRsend_test.h
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/IRsend_test.h
diff --git a/lib/IRremoteESP8266-2.7.11/test/IRutils_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/IRutils_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/IRutils_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/IRutils_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/Makefile b/lib/lib_basic/IRremoteESP8266-2.7.11/test/Makefile
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/Makefile
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/Makefile
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Airwell_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Airwell_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Airwell_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Airwell_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Aiwa_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Aiwa_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Aiwa_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Aiwa_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Amcor_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Amcor_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Amcor_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Amcor_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Argo_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Argo_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Argo_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Argo_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Carrier_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Carrier_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Carrier_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Carrier_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Coolix_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Coolix_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Coolix_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Coolix_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Corona_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Corona_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Corona_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Corona_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Daikin_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Daikin_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Daikin_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Daikin_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Delonghi_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Delonghi_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Delonghi_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Delonghi_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Denon_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Denon_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Denon_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Denon_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Dish_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Dish_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Dish_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Dish_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Doshisha_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Doshisha_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Doshisha_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Doshisha_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Electra_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Electra_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Electra_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Electra_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Epson_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Epson_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Epson_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Epson_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Fujitsu_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Fujitsu_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Fujitsu_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Fujitsu_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_GICable_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_GICable_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_GICable_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_GICable_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_GlobalCache_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_GlobalCache_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_GlobalCache_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_GlobalCache_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Goodweather_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Goodweather_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Goodweather_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Goodweather_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Gree_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Gree_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Gree_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Gree_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Haier_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Haier_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Haier_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Haier_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Hitachi_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Hitachi_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Hitachi_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Hitachi_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Inax_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Inax_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Inax_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Inax_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_JVC_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_JVC_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_JVC_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_JVC_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Kelvinator_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Kelvinator_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Kelvinator_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Kelvinator_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_LG_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_LG_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_LG_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_LG_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Lasertag_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Lasertag_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Lasertag_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Lasertag_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Lego_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Lego_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Lego_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Lego_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Lutron_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Lutron_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Lutron_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Lutron_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_MWM_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_MWM_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_MWM_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_MWM_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Magiquest_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Magiquest_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Magiquest_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Magiquest_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Metz_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Metz_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Metz_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Metz_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Midea_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Midea_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Midea_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Midea_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_MitsubishiHeavy_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_MitsubishiHeavy_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_MitsubishiHeavy_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_MitsubishiHeavy_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Mitsubishi_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Mitsubishi_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Mitsubishi_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Mitsubishi_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Multibrackets_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Multibrackets_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Multibrackets_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Multibrackets_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_NEC_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_NEC_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_NEC_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_NEC_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Neoclima_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Neoclima_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Neoclima_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Neoclima_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Nikai_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Nikai_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Nikai_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Nikai_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Panasonic_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Panasonic_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Panasonic_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Panasonic_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Pioneer_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Pioneer_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Pioneer_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Pioneer_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Pronto_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Pronto_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Pronto_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Pronto_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_RC5_RC6_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_RC5_RC6_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_RC5_RC6_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_RC5_RC6_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_RCMM_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_RCMM_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_RCMM_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_RCMM_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Samsung_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Samsung_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Samsung_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Samsung_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Sanyo_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Sanyo_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Sanyo_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Sanyo_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Sharp_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Sharp_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Sharp_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Sharp_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Sherwood_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Sherwood_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Sherwood_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Sherwood_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Sony_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Sony_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Sony_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Sony_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Symphony_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Symphony_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Symphony_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Symphony_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Tcl_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Tcl_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Tcl_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Tcl_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Technibel_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Technibel_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Technibel_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Technibel_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Teco_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Teco_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Teco_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Teco_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Toshiba_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Toshiba_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Toshiba_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Toshiba_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Transcold_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Transcold_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Transcold_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Transcold_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Trotec_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Trotec_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Trotec_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Trotec_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Vestel_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Vestel_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Vestel_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Vestel_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Voltas_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Voltas_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Voltas_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Voltas_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Whirlpool_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Whirlpool_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Whirlpool_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Whirlpool_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Whynter_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Whynter_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Whynter_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Whynter_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/test/ir_Zepeal_test.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Zepeal_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/test/ir_Zepeal_test.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/test/ir_Zepeal_test.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/tools/Makefile b/lib/lib_basic/IRremoteESP8266-2.7.11/tools/Makefile
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/tools/Makefile
rename to lib/lib_basic/IRremoteESP8266-2.7.11/tools/Makefile
diff --git a/lib/IRremoteESP8266-2.7.11/tools/RawToGlobalCache.sh b/lib/lib_basic/IRremoteESP8266-2.7.11/tools/RawToGlobalCache.sh
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/tools/RawToGlobalCache.sh
rename to lib/lib_basic/IRremoteESP8266-2.7.11/tools/RawToGlobalCache.sh
diff --git a/lib/IRremoteESP8266-2.7.11/tools/auto_analyse_raw_data.py b/lib/lib_basic/IRremoteESP8266-2.7.11/tools/auto_analyse_raw_data.py
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/tools/auto_analyse_raw_data.py
rename to lib/lib_basic/IRremoteESP8266-2.7.11/tools/auto_analyse_raw_data.py
diff --git a/lib/IRremoteESP8266-2.7.11/tools/auto_analyse_raw_data_test.py b/lib/lib_basic/IRremoteESP8266-2.7.11/tools/auto_analyse_raw_data_test.py
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/tools/auto_analyse_raw_data_test.py
rename to lib/lib_basic/IRremoteESP8266-2.7.11/tools/auto_analyse_raw_data_test.py
diff --git a/lib/IRremoteESP8266-2.7.11/tools/gc_decode.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/tools/gc_decode.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/tools/gc_decode.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/tools/gc_decode.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/tools/generate_irtext_h.sh b/lib/lib_basic/IRremoteESP8266-2.7.11/tools/generate_irtext_h.sh
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/tools/generate_irtext_h.sh
rename to lib/lib_basic/IRremoteESP8266-2.7.11/tools/generate_irtext_h.sh
diff --git a/lib/IRremoteESP8266-2.7.11/tools/mkkeywords b/lib/lib_basic/IRremoteESP8266-2.7.11/tools/mkkeywords
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/tools/mkkeywords
rename to lib/lib_basic/IRremoteESP8266-2.7.11/tools/mkkeywords
diff --git a/lib/IRremoteESP8266-2.7.11/tools/mode2_decode.cpp b/lib/lib_basic/IRremoteESP8266-2.7.11/tools/mode2_decode.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/tools/mode2_decode.cpp
rename to lib/lib_basic/IRremoteESP8266-2.7.11/tools/mode2_decode.cpp
diff --git a/lib/IRremoteESP8266-2.7.11/tools/raw_to_pronto_code.py b/lib/lib_basic/IRremoteESP8266-2.7.11/tools/raw_to_pronto_code.py
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/tools/raw_to_pronto_code.py
rename to lib/lib_basic/IRremoteESP8266-2.7.11/tools/raw_to_pronto_code.py
diff --git a/lib/IRremoteESP8266-2.7.11/tools/raw_to_pronto_code_test.py b/lib/lib_basic/IRremoteESP8266-2.7.11/tools/raw_to_pronto_code_test.py
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/tools/raw_to_pronto_code_test.py
rename to lib/lib_basic/IRremoteESP8266-2.7.11/tools/raw_to_pronto_code_test.py
diff --git a/lib/IRremoteESP8266-2.7.11/tools/scrape_supported_devices.py b/lib/lib_basic/IRremoteESP8266-2.7.11/tools/scrape_supported_devices.py
similarity index 100%
rename from lib/IRremoteESP8266-2.7.11/tools/scrape_supported_devices.py
rename to lib/lib_basic/IRremoteESP8266-2.7.11/tools/scrape_supported_devices.py
diff --git a/lib/NeoPixelBus-2.6.0/.gitattributes b/lib/lib_basic/NeoPixelBus-2.6.0/.gitattributes
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/.gitattributes
rename to lib/lib_basic/NeoPixelBus-2.6.0/.gitattributes
diff --git a/lib/NeoPixelBus-2.6.0/.github/FUNDING.yml b/lib/lib_basic/NeoPixelBus-2.6.0/.github/FUNDING.yml
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/.github/FUNDING.yml
rename to lib/lib_basic/NeoPixelBus-2.6.0/.github/FUNDING.yml
diff --git a/lib/NeoPixelBus-2.6.0/.github/ISSUE_TEMPLATE/all-others.md b/lib/lib_basic/NeoPixelBus-2.6.0/.github/ISSUE_TEMPLATE/all-others.md
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/.github/ISSUE_TEMPLATE/all-others.md
rename to lib/lib_basic/NeoPixelBus-2.6.0/.github/ISSUE_TEMPLATE/all-others.md
diff --git a/lib/NeoPixelBus-2.6.0/.github/ISSUE_TEMPLATE/bug_report.md b/lib/lib_basic/NeoPixelBus-2.6.0/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/.github/ISSUE_TEMPLATE/bug_report.md
rename to lib/lib_basic/NeoPixelBus-2.6.0/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/lib/NeoPixelBus-2.6.0/.github/ISSUE_TEMPLATE/feature_request.md b/lib/lib_basic/NeoPixelBus-2.6.0/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/.github/ISSUE_TEMPLATE/feature_request.md
rename to lib/lib_basic/NeoPixelBus-2.6.0/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/lib/NeoPixelBus-2.6.0/.gitignore b/lib/lib_basic/NeoPixelBus-2.6.0/.gitignore
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/.gitignore
rename to lib/lib_basic/NeoPixelBus-2.6.0/.gitignore
diff --git a/lib/NeoPixelBus-2.6.0/COPYING b/lib/lib_basic/NeoPixelBus-2.6.0/COPYING
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/COPYING
rename to lib/lib_basic/NeoPixelBus-2.6.0/COPYING
diff --git a/lib/NeoPixelBus-2.6.0/ReadMe.md b/lib/lib_basic/NeoPixelBus-2.6.0/ReadMe.md
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/ReadMe.md
rename to lib/lib_basic/NeoPixelBus-2.6.0/ReadMe.md
diff --git a/lib/NeoPixelBus-2.6.0/examples/DotStarTest/DotStarTest.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/DotStarTest/DotStarTest.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/DotStarTest/DotStarTest.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/DotStarTest/DotStarTest.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/NeoPixelBrightness/NeoPixelBrightness.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/NeoPixelBrightness/NeoPixelBrightness.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/NeoPixelBrightness/NeoPixelBrightness.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/NeoPixelBrightness/NeoPixelBrightness.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/NeoPixelGamma/NeoPixelGamma.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/NeoPixelGamma/NeoPixelGamma.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/NeoPixelGamma/NeoPixelGamma.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/NeoPixelGamma/NeoPixelGamma.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/NeoPixelTest/NeoPixelTest.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/NeoPixelTest/NeoPixelTest.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/NeoPixelTest/NeoPixelTest.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/NeoPixelTest/NeoPixelTest.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/animations/NeoPixelAnimation/NeoPixelAnimation.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/animations/NeoPixelAnimation/NeoPixelAnimation.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/animations/NeoPixelAnimation/NeoPixelAnimation.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/animations/NeoPixelAnimation/NeoPixelAnimation.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/animations/NeoPixelCylon/NeoPixelCylon.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/animations/NeoPixelCylon/NeoPixelCylon.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/animations/NeoPixelCylon/NeoPixelCylon.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/animations/NeoPixelCylon/NeoPixelCylon.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/animations/NeoPixelFunFadeInOut/NeoPixelFunFadeInOut.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/animations/NeoPixelFunFadeInOut/NeoPixelFunFadeInOut.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/animations/NeoPixelFunFadeInOut/NeoPixelFunFadeInOut.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/animations/NeoPixelFunFadeInOut/NeoPixelFunFadeInOut.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/animations/NeoPixelFunLoop/NeoPixelFunLoop.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/animations/NeoPixelFunLoop/NeoPixelFunLoop.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/animations/NeoPixelFunLoop/NeoPixelFunLoop.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/animations/NeoPixelFunLoop/NeoPixelFunLoop.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/animations/NeoPixelFunRandomChange/NeoPixelFunRandomChange.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/animations/NeoPixelFunRandomChange/NeoPixelFunRandomChange.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/animations/NeoPixelFunRandomChange/NeoPixelFunRandomChange.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/animations/NeoPixelFunRandomChange/NeoPixelFunRandomChange.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/animations/NeoPixelRotateLoop/NeoPixelRotateLoop.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/animations/NeoPixelRotateLoop/NeoPixelRotateLoop.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/animations/NeoPixelRotateLoop/NeoPixelRotateLoop.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/animations/NeoPixelRotateLoop/NeoPixelRotateLoop.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBitmap/NeoPixelBitmap.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBitmap/NeoPixelBitmap.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBitmap/NeoPixelBitmap.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBitmap/NeoPixelBitmap.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBitmap/Strings.bmp b/lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBitmap/Strings.bmp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBitmap/Strings.bmp
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBitmap/Strings.bmp
diff --git a/lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBitmap/StringsW.bmp b/lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBitmap/StringsW.bmp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBitmap/StringsW.bmp
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBitmap/StringsW.bmp
diff --git a/lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/Cylon.pdn b/lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/Cylon.pdn
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/Cylon.pdn
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/Cylon.pdn
diff --git a/lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/CylonGrb.h b/lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/CylonGrb.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/CylonGrb.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/CylonGrb.h
diff --git a/lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/CylonGrbw.h b/lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/CylonGrbw.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/CylonGrbw.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/CylonGrbw.h
diff --git a/lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/NeoPixelBufferCylon.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/NeoPixelBufferCylon.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/NeoPixelBufferCylon.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferCylon/NeoPixelBufferCylon.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferShader/NeoPixelBufferShader.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferShader/NeoPixelBufferShader.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferShader/NeoPixelBufferShader.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelBufferShader/NeoPixelBufferShader.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelDibTest/NeoPixelDibTest.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelDibTest/NeoPixelDibTest.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelDibTest/NeoPixelDibTest.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/bitmaps/NeoPixelDibTest/NeoPixelDibTest.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/sevensegment/NeoSegmentBus/NeoSegmentBus.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/sevensegment/NeoSegmentBus/NeoSegmentBus.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/sevensegment/NeoSegmentBus/NeoSegmentBus.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/sevensegment/NeoSegmentBus/NeoSegmentBus.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/sevensegment/NeoSegmentFade/NeoSegmentFade.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/sevensegment/NeoSegmentFade/NeoSegmentFade.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/sevensegment/NeoSegmentFade/NeoSegmentFade.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/sevensegment/NeoSegmentFade/NeoSegmentFade.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelMosaicDump/NeoPixelMosaicDump.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelMosaicDump/NeoPixelMosaicDump.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelMosaicDump/NeoPixelMosaicDump.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelMosaicDump/NeoPixelMosaicDump.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelMosaicTest/NeoPixelMosaicTest.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelMosaicTest/NeoPixelMosaicTest.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelMosaicTest/NeoPixelMosaicTest.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelMosaicTest/NeoPixelMosaicTest.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelRingTopologyTest/NeoPixelRingTopologyTest.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelRingTopologyTest/NeoPixelRingTopologyTest.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelRingTopologyTest/NeoPixelRingTopologyTest.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelRingTopologyTest/NeoPixelRingTopologyTest.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTilesDump/NeoPixelTilesDump.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTilesDump/NeoPixelTilesDump.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTilesDump/NeoPixelTilesDump.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTilesDump/NeoPixelTilesDump.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTilesTest/NeoPixelTilesTest.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTilesTest/NeoPixelTilesTest.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTilesTest/NeoPixelTilesTest.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTilesTest/NeoPixelTilesTest.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTopologyDump/NeoPixelTopologyDump.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTopologyDump/NeoPixelTopologyDump.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTopologyDump/NeoPixelTopologyDump.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTopologyDump/NeoPixelTopologyDump.ino
diff --git a/lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTopologyTest/NeoPixelTopologyTest.ino b/lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTopologyTest/NeoPixelTopologyTest.ino
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTopologyTest/NeoPixelTopologyTest.ino
rename to lib/lib_basic/NeoPixelBus-2.6.0/examples/topologies/NeoPixelTopologyTest/NeoPixelTopologyTest.ino
diff --git a/lib/NeoPixelBus-2.6.0/extras/curves/circular.png b/lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/circular.png
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/extras/curves/circular.png
rename to lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/circular.png
diff --git a/lib/NeoPixelBus-2.6.0/extras/curves/cubic.png b/lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/cubic.png
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/extras/curves/cubic.png
rename to lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/cubic.png
diff --git a/lib/NeoPixelBus-2.6.0/extras/curves/different.png b/lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/different.png
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/extras/curves/different.png
rename to lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/different.png
diff --git a/lib/NeoPixelBus-2.6.0/extras/curves/exponential.png b/lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/exponential.png
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/extras/curves/exponential.png
rename to lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/exponential.png
diff --git a/lib/NeoPixelBus-2.6.0/extras/curves/gamma.png b/lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/gamma.png
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/extras/curves/gamma.png
rename to lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/gamma.png
diff --git a/lib/NeoPixelBus-2.6.0/extras/curves/pronounced.png b/lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/pronounced.png
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/extras/curves/pronounced.png
rename to lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/pronounced.png
diff --git a/lib/NeoPixelBus-2.6.0/extras/curves/quadratic.png b/lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/quadratic.png
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/extras/curves/quadratic.png
rename to lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/quadratic.png
diff --git a/lib/NeoPixelBus-2.6.0/extras/curves/quintic.png b/lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/quintic.png
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/extras/curves/quintic.png
rename to lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/quintic.png
diff --git a/lib/NeoPixelBus-2.6.0/extras/curves/sinusoidal.png b/lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/sinusoidal.png
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/extras/curves/sinusoidal.png
rename to lib/lib_basic/NeoPixelBus-2.6.0/extras/curves/sinusoidal.png
diff --git a/lib/NeoPixelBus-2.6.0/keywords.txt b/lib/lib_basic/NeoPixelBus-2.6.0/keywords.txt
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/keywords.txt
rename to lib/lib_basic/NeoPixelBus-2.6.0/keywords.txt
diff --git a/lib/NeoPixelBus-2.6.0/library.json b/lib/lib_basic/NeoPixelBus-2.6.0/library.json
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/library.json
rename to lib/lib_basic/NeoPixelBus-2.6.0/library.json
diff --git a/lib/NeoPixelBus-2.6.0/library.properties b/lib/lib_basic/NeoPixelBus-2.6.0/library.properties
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/library.properties
rename to lib/lib_basic/NeoPixelBus-2.6.0/library.properties
diff --git a/lib/NeoPixelBus-2.6.0/src/NeoPixelAnimator.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/NeoPixelAnimator.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/NeoPixelAnimator.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/NeoPixelAnimator.h
diff --git a/lib/NeoPixelBus-2.6.0/src/NeoPixelBrightnessBus.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/NeoPixelBrightnessBus.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/NeoPixelBrightnessBus.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/NeoPixelBrightnessBus.h
diff --git a/lib/NeoPixelBus-2.6.0/src/NeoPixelBus.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/NeoPixelBus.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/NeoPixelBus.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/NeoPixelBus.h
diff --git a/lib/NeoPixelBus-2.6.0/src/NeoPixelSegmentBus.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/NeoPixelSegmentBus.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/NeoPixelSegmentBus.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/NeoPixelSegmentBus.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/DotStarColorFeatures.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/DotStarColorFeatures.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/DotStarColorFeatures.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/DotStarColorFeatures.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/DotStarGenericMethod.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/DotStarGenericMethod.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/DotStarGenericMethod.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/DotStarGenericMethod.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/Esp32_i2s.c b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Esp32_i2s.c
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/Esp32_i2s.c
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Esp32_i2s.c
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/Esp32_i2s.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Esp32_i2s.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/Esp32_i2s.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Esp32_i2s.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/HsbColor.cpp b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HsbColor.cpp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/HsbColor.cpp
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HsbColor.cpp
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/HsbColor.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HsbColor.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/HsbColor.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HsbColor.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/HslColor.cpp b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HslColor.cpp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/HslColor.cpp
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HslColor.cpp
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/HslColor.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HslColor.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/HslColor.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HslColor.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/HtmlColor.cpp b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HtmlColor.cpp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/HtmlColor.cpp
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HtmlColor.cpp
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/HtmlColor.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HtmlColor.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/HtmlColor.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HtmlColor.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/HtmlColorNameStrings.cpp b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HtmlColorNameStrings.cpp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/HtmlColorNameStrings.cpp
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HtmlColorNameStrings.cpp
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/HtmlColorNameStrings.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HtmlColorNameStrings.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/HtmlColorNameStrings.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HtmlColorNameStrings.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/HtmlColorNames.cpp b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HtmlColorNames.cpp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/HtmlColorNames.cpp
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HtmlColorNames.cpp
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/HtmlColorShortNames.cpp b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HtmlColorShortNames.cpp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/HtmlColorShortNames.cpp
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/HtmlColorShortNames.cpp
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/Layouts.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Layouts.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/Layouts.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Layouts.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/Lpd8806ColorFeatures.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Lpd8806ColorFeatures.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/Lpd8806ColorFeatures.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Lpd8806ColorFeatures.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/Lpd8806GenericMethod.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Lpd8806GenericMethod.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/Lpd8806GenericMethod.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Lpd8806GenericMethod.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoArmMethod.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoArmMethod.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoArmMethod.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoArmMethod.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoAvrMethod.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoAvrMethod.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoAvrMethod.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoAvrMethod.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoBitmapFile.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoBitmapFile.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoBitmapFile.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoBitmapFile.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoBuffer.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoBuffer.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoBuffer.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoBuffer.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoBufferContext.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoBufferContext.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoBufferContext.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoBufferContext.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoBufferMethods.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoBufferMethods.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoBufferMethods.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoBufferMethods.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoColorFeatures.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoColorFeatures.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoColorFeatures.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoColorFeatures.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoDib.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoDib.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoDib.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoDib.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoEase.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEase.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoEase.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEase.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoEsp32I2sMethod.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEsp32I2sMethod.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoEsp32I2sMethod.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEsp32I2sMethod.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoEsp32RmtMethod.cpp b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEsp32RmtMethod.cpp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoEsp32RmtMethod.cpp
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEsp32RmtMethod.cpp
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoEsp32RmtMethod.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEsp32RmtMethod.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoEsp32RmtMethod.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEsp32RmtMethod.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoEsp8266DmaMethod.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEsp8266DmaMethod.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoEsp8266DmaMethod.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEsp8266DmaMethod.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoEsp8266UartMethod.cpp b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEsp8266UartMethod.cpp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoEsp8266UartMethod.cpp
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEsp8266UartMethod.cpp
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoEsp8266UartMethod.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEsp8266UartMethod.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoEsp8266UartMethod.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEsp8266UartMethod.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoEspBitBangMethod.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEspBitBangMethod.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoEspBitBangMethod.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoEspBitBangMethod.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoGamma.cpp b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoGamma.cpp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoGamma.cpp
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoGamma.cpp
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoGamma.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoGamma.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoGamma.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoGamma.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoHueBlend.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoHueBlend.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoHueBlend.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoHueBlend.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoMosaic.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoMosaic.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoMosaic.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoMosaic.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoNrf52xMethod.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoNrf52xMethod.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoNrf52xMethod.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoNrf52xMethod.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoPixelAnimator.cpp b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoPixelAnimator.cpp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoPixelAnimator.cpp
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoPixelAnimator.cpp
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoPixelAvr.c b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoPixelAvr.c
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoPixelAvr.c
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoPixelAvr.c
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoRingTopology.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoRingTopology.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoRingTopology.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoRingTopology.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoSegmentFeatures.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoSegmentFeatures.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoSegmentFeatures.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoSegmentFeatures.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoSettings.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoSettings.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoSettings.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoSettings.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoSpriteSheet.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoSpriteSheet.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoSpriteSheet.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoSpriteSheet.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoTiles.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoTiles.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoTiles.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoTiles.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoTm1814ColorFeatures.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoTm1814ColorFeatures.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoTm1814ColorFeatures.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoTm1814ColorFeatures.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/NeoTopology.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoTopology.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/NeoTopology.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/NeoTopology.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/P9813ColorFeatures.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/P9813ColorFeatures.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/P9813ColorFeatures.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/P9813ColorFeatures.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/P9813GenericMethod.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/P9813GenericMethod.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/P9813GenericMethod.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/P9813GenericMethod.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/RgbColor.cpp b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/RgbColor.cpp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/RgbColor.cpp
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/RgbColor.cpp
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/RgbColor.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/RgbColor.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/RgbColor.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/RgbColor.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/RgbwColor.cpp b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/RgbwColor.cpp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/RgbwColor.cpp
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/RgbwColor.cpp
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/RgbwColor.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/RgbwColor.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/RgbwColor.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/RgbwColor.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/SegmentDigit.cpp b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/SegmentDigit.cpp
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/SegmentDigit.cpp
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/SegmentDigit.cpp
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/SegmentDigit.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/SegmentDigit.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/SegmentDigit.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/SegmentDigit.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/TwoWireBitBangImple.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/TwoWireBitBangImple.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/TwoWireBitBangImple.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/TwoWireBitBangImple.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/TwoWireBitBangImpleAvr.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/TwoWireBitBangImpleAvr.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/TwoWireBitBangImpleAvr.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/TwoWireBitBangImpleAvr.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/TwoWireSpiImple.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/TwoWireSpiImple.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/TwoWireSpiImple.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/TwoWireSpiImple.h
diff --git a/lib/NeoPixelBus-2.6.0/src/internal/Ws2801GenericMethod.h b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Ws2801GenericMethod.h
similarity index 100%
rename from lib/NeoPixelBus-2.6.0/src/internal/Ws2801GenericMethod.h
rename to lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Ws2801GenericMethod.h
diff --git a/lib/OneWire-Stickbreaker-20190506-1.1/OneWire.cpp b/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/OneWire.cpp
similarity index 100%
rename from lib/OneWire-Stickbreaker-20190506-1.1/OneWire.cpp
rename to lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/OneWire.cpp
diff --git a/lib/OneWire-Stickbreaker-20190506-1.1/OneWire.h b/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/OneWire.h
similarity index 100%
rename from lib/OneWire-Stickbreaker-20190506-1.1/OneWire.h
rename to lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/OneWire.h
diff --git a/lib/OneWire-Stickbreaker-20190506-1.1/README.md b/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/README.md
similarity index 100%
rename from lib/OneWire-Stickbreaker-20190506-1.1/README.md
rename to lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/README.md
diff --git a/lib/OneWire-Stickbreaker-20190506-1.1/examples/DS18x20_Temperature/DS18x20_Temperature.pde b/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/examples/DS18x20_Temperature/DS18x20_Temperature.pde
similarity index 100%
rename from lib/OneWire-Stickbreaker-20190506-1.1/examples/DS18x20_Temperature/DS18x20_Temperature.pde
rename to lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/examples/DS18x20_Temperature/DS18x20_Temperature.pde
diff --git a/lib/OneWire-Stickbreaker-20190506-1.1/examples/DS2408_Switch/DS2408_Switch.pde b/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/examples/DS2408_Switch/DS2408_Switch.pde
similarity index 100%
rename from lib/OneWire-Stickbreaker-20190506-1.1/examples/DS2408_Switch/DS2408_Switch.pde
rename to lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/examples/DS2408_Switch/DS2408_Switch.pde
diff --git a/lib/OneWire-Stickbreaker-20190506-1.1/examples/DS250x_PROM/DS250x_PROM.pde b/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/examples/DS250x_PROM/DS250x_PROM.pde
similarity index 100%
rename from lib/OneWire-Stickbreaker-20190506-1.1/examples/DS250x_PROM/DS250x_PROM.pde
rename to lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/examples/DS250x_PROM/DS250x_PROM.pde
diff --git a/lib/OneWire-Stickbreaker-20190506-1.1/keywords.txt b/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/keywords.txt
similarity index 100%
rename from lib/OneWire-Stickbreaker-20190506-1.1/keywords.txt
rename to lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/keywords.txt
diff --git a/lib/OneWire-Stickbreaker-20190506-1.1/library.json b/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/library.json
similarity index 100%
rename from lib/OneWire-Stickbreaker-20190506-1.1/library.json
rename to lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/library.json
diff --git a/lib/OneWire-Stickbreaker-20190506-1.1/library.properties b/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/library.properties
similarity index 100%
rename from lib/OneWire-Stickbreaker-20190506-1.1/library.properties
rename to lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/library.properties
diff --git a/lib/TasmotaModbus-1.2.0/README.md b/lib/lib_basic/TasmotaModbus-1.2.0/README.md
similarity index 100%
rename from lib/TasmotaModbus-1.2.0/README.md
rename to lib/lib_basic/TasmotaModbus-1.2.0/README.md
diff --git a/lib/TasmotaModbus-1.2.0/examples/modbustest/modbustest.ino b/lib/lib_basic/TasmotaModbus-1.2.0/examples/modbustest/modbustest.ino
similarity index 100%
rename from lib/TasmotaModbus-1.2.0/examples/modbustest/modbustest.ino
rename to lib/lib_basic/TasmotaModbus-1.2.0/examples/modbustest/modbustest.ino
diff --git a/lib/TasmotaModbus-1.2.0/keywords.txt b/lib/lib_basic/TasmotaModbus-1.2.0/keywords.txt
similarity index 100%
rename from lib/TasmotaModbus-1.2.0/keywords.txt
rename to lib/lib_basic/TasmotaModbus-1.2.0/keywords.txt
diff --git a/lib/TasmotaModbus-1.2.0/library.json b/lib/lib_basic/TasmotaModbus-1.2.0/library.json
similarity index 100%
rename from lib/TasmotaModbus-1.2.0/library.json
rename to lib/lib_basic/TasmotaModbus-1.2.0/library.json
diff --git a/lib/TasmotaModbus-1.2.0/library.properties b/lib/lib_basic/TasmotaModbus-1.2.0/library.properties
similarity index 100%
rename from lib/TasmotaModbus-1.2.0/library.properties
rename to lib/lib_basic/TasmotaModbus-1.2.0/library.properties
diff --git a/lib/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp b/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp
similarity index 100%
rename from lib/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp
rename to lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp
diff --git a/lib/TasmotaModbus-1.2.0/src/TasmotaModbus.h b/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.h
similarity index 100%
rename from lib/TasmotaModbus-1.2.0/src/TasmotaModbus.h
rename to lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/.gitignore b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/.gitignore
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/.gitignore
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/.gitignore
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/.travis.yml b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/.travis.yml
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/.travis.yml
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/.travis.yml
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT.cpp b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT.cpp
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT.cpp
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT.cpp
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT_Macros.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT_Macros.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT_Macros.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT_Macros.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono12pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono12pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono12pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono12pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono18pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono18pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono18pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono18pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono24pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono24pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono24pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono24pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono9pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono9pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono9pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono9pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold12pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold12pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold12pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold12pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold18pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold18pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold18pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold18pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold24pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold24pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold24pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold24pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold9pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold9pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold9pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold9pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique12pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique12pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique12pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique12pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique18pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique18pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique18pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique18pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique24pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique24pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique24pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique24pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique9pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique9pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique9pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique9pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique12pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique12pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique12pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique12pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique18pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique18pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique18pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique18pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique24pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique24pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique24pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique24pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique9pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique9pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique9pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique9pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans12pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans12pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans12pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans12pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans18pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans18pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans18pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans18pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans24pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans24pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans24pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans24pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans9pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans9pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans9pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans9pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold12pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold12pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold12pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold12pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold18pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold18pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold18pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold18pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold24pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold24pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold24pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold24pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold9pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold9pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold9pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold9pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique12pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique12pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique12pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique12pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique18pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique18pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique18pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique18pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique24pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique24pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique24pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique24pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique9pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique9pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique9pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique9pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique12pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique12pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique12pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique12pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique18pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique18pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique18pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique18pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique24pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique24pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique24pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique24pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique9pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique9pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique9pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique9pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif12pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif12pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif12pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif12pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif18pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif18pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif18pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif18pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif24pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif24pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif24pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif24pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif9pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif9pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif9pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif9pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold12pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold12pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold12pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold12pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold18pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold18pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold18pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold18pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold24pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold24pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold24pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold24pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold9pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold9pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold9pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold9pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic12pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic12pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic12pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic12pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic18pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic18pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic18pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic18pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic24pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic24pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic24pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic24pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic9pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic9pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic9pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic9pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic12pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic12pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic12pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic12pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic18pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic18pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic18pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic18pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic24pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic24pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic24pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic24pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic9pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic9pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic9pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic9pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Org_01.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Org_01.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Org_01.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Org_01.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Picopixel.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Picopixel.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Picopixel.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Picopixel.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Tiny3x3a2pt7b.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Tiny3x3a2pt7b.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Tiny3x3a2pt7b.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Tiny3x3a2pt7b.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/TomThumb.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/TomThumb.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/TomThumb.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/TomThumb.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/README.md b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/README.md
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/README.md
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/README.md
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/examples/mock_ili9341/mock_ili9341.ino b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/examples/mock_ili9341/mock_ili9341.ino
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/examples/mock_ili9341/mock_ili9341.ino
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/examples/mock_ili9341/mock_ili9341.ino
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/Makefile b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/Makefile
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/Makefile
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/Makefile
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/fontconvert.c b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/fontconvert.c
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/fontconvert.c
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/fontconvert.c
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/fontconvert_win.md b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/fontconvert_win.md
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/fontconvert_win.md
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/fontconvert_win.md
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/makefonts.sh b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/makefonts.sh
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/makefonts.sh
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/makefonts.sh
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/gfxfont.h b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/gfxfont.h
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/gfxfont.h
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/gfxfont.h
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/glcdfont.c b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/glcdfont.c
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/glcdfont.c
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/glcdfont.c
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/library.properties b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/library.properties
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/library.properties
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/library.properties
diff --git a/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/license.txt b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/license.txt
similarity index 100%
rename from lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/license.txt
rename to lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/license.txt
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.github/ISSUE_TEMPLATE.md b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.github/ISSUE_TEMPLATE.md
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.github/ISSUE_TEMPLATE.md
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.github/PULL_REQUEST_TEMPLATE.md b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.github/PULL_REQUEST_TEMPLATE.md
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.gitignore b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.gitignore
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.gitignore
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.gitignore
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.travis.yml b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.travis.yml
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.travis.yml
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/.travis.yml
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/Adafruit_ILI9341.cpp b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/Adafruit_ILI9341.cpp
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/Adafruit_ILI9341.cpp
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/Adafruit_ILI9341.cpp
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/Adafruit_ILI9341.h b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/Adafruit_ILI9341.h
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/Adafruit_ILI9341.h
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/Adafruit_ILI9341.h
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/README.md b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/README.md
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/README.md
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/README.md
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/breakouttouchpaint/.esp8266.test.skip b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/breakouttouchpaint/.esp8266.test.skip
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/breakouttouchpaint/.esp8266.test.skip
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/breakouttouchpaint/.esp8266.test.skip
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/breakouttouchpaint/breakouttouchpaint.ino b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/breakouttouchpaint/breakouttouchpaint.ino
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/breakouttouchpaint/breakouttouchpaint.ino
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/breakouttouchpaint/breakouttouchpaint.ino
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/fulltest_featherwing/.mega2560.test.skip b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/fulltest_featherwing/.mega2560.test.skip
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/fulltest_featherwing/.mega2560.test.skip
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/fulltest_featherwing/.mega2560.test.skip
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/fulltest_featherwing/fulltest_featherwing.ino b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/fulltest_featherwing/fulltest_featherwing.ino
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/fulltest_featherwing/fulltest_featherwing.ino
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/fulltest_featherwing/fulltest_featherwing.ino
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/graphicstest/graphicstest.ino b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/graphicstest/graphicstest.ino
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/graphicstest/graphicstest.ino
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/graphicstest/graphicstest.ino
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/graphicstest_featherwing/.mega2560.test.skip b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/graphicstest_featherwing/.mega2560.test.skip
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/graphicstest_featherwing/.mega2560.test.skip
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/graphicstest_featherwing/.mega2560.test.skip
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/graphicstest_featherwing/graphicstest_featherwing.ino b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/graphicstest_featherwing/graphicstest_featherwing.ino
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/graphicstest_featherwing/graphicstest_featherwing.ino
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/graphicstest_featherwing/graphicstest_featherwing.ino
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/onoffbutton/onoffbutton.ino b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/onoffbutton/onoffbutton.ino
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/onoffbutton/onoffbutton.ino
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/onoffbutton/onoffbutton.ino
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/onoffbutton_breakout/.esp8266.test.skip b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/onoffbutton_breakout/.esp8266.test.skip
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/onoffbutton_breakout/.esp8266.test.skip
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/onoffbutton_breakout/.esp8266.test.skip
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/onoffbutton_breakout/onoffbutton_breakout.ino b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/onoffbutton_breakout/onoffbutton_breakout.ino
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/onoffbutton_breakout/onoffbutton_breakout.ino
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/onoffbutton_breakout/onoffbutton_breakout.ino
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/pictureEmbed/dragon.h b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/pictureEmbed/dragon.h
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/pictureEmbed/dragon.h
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/pictureEmbed/dragon.h
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/pictureEmbed/pictureEmbed.ino b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/pictureEmbed/pictureEmbed.ino
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/pictureEmbed/pictureEmbed.ino
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/pictureEmbed/pictureEmbed.ino
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/spitftbitmap/spitftbitmap.ino b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/spitftbitmap/spitftbitmap.ino
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/spitftbitmap/spitftbitmap.ino
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/spitftbitmap/spitftbitmap.ino
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/touchpaint/touchpaint.ino b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/touchpaint/touchpaint.ino
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/touchpaint/touchpaint.ino
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/touchpaint/touchpaint.ino
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/touchpaint_featherwing/.mega2560.test.skip b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/touchpaint_featherwing/.mega2560.test.skip
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/touchpaint_featherwing/.mega2560.test.skip
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/touchpaint_featherwing/.mega2560.test.skip
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/touchpaint_featherwing/touchpaint_featherwing.ino b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/touchpaint_featherwing/touchpaint_featherwing.ino
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/touchpaint_featherwing/touchpaint_featherwing.ino
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/examples/touchpaint_featherwing/touchpaint_featherwing.ino
diff --git a/lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/library.properties b/lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/library.properties
similarity index 100%
rename from lib/Adafruit_ILI9341-1.2.0-Tasmota-1.0/library.properties
rename to lib/lib_display/Adafruit_ILI9341-1.2.0-Tasmota-1.0/library.properties
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/Adafruit_LEDBackpack.cpp b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/Adafruit_LEDBackpack.cpp
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/Adafruit_LEDBackpack.cpp
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/Adafruit_LEDBackpack.cpp
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/Adafruit_LEDBackpack.h b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/Adafruit_LEDBackpack.h
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/Adafruit_LEDBackpack.h
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/Adafruit_LEDBackpack.h
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/README.md b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/README.md
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/README.md
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/README.md
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/README.txt b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/README.txt
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/README.txt
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/README.txt
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/HT16K33/HT16K33.ino b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/HT16K33/HT16K33.ino
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/HT16K33/HT16K33.ino
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/HT16K33/HT16K33.ino
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/bargraph24/bargraph24.ino b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/bargraph24/bargraph24.ino
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/bargraph24/bargraph24.ino
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/bargraph24/bargraph24.ino
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/bicolor8x8/bicolor8x8.pde b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/bicolor8x8/bicolor8x8.pde
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/bicolor8x8/bicolor8x8.pde
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/bicolor8x8/bicolor8x8.pde
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/clock_sevenseg_ds1307/clock_sevenseg_ds1307.ino b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/clock_sevenseg_ds1307/clock_sevenseg_ds1307.ino
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/clock_sevenseg_ds1307/clock_sevenseg_ds1307.ino
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/clock_sevenseg_ds1307/clock_sevenseg_ds1307.ino
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/clock_sevenseg_gps/clock_sevenseg_gps.ino b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/clock_sevenseg_gps/clock_sevenseg_gps.ino
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/clock_sevenseg_gps/clock_sevenseg_gps.ino
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/clock_sevenseg_gps/clock_sevenseg_gps.ino
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/matrix16x8/matrix16x8.ino b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/matrix16x8/matrix16x8.ino
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/matrix16x8/matrix16x8.ino
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/matrix16x8/matrix16x8.ino
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/matrix8x8/matrix8x8.ino b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/matrix8x8/matrix8x8.ino
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/matrix8x8/matrix8x8.ino
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/matrix8x8/matrix8x8.ino
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/minimatrix16x8/minimatrix16x8.ino b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/minimatrix16x8/minimatrix16x8.ino
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/minimatrix16x8/minimatrix16x8.ino
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/minimatrix16x8/minimatrix16x8.ino
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/quadalphanum/quadalphanum.ino b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/quadalphanum/quadalphanum.ino
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/quadalphanum/quadalphanum.ino
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/quadalphanum/quadalphanum.ino
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/quadalphanum_mini/quadalphanum_mini.ino b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/quadalphanum_mini/quadalphanum_mini.ino
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/quadalphanum_mini/quadalphanum_mini.ino
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/quadalphanum_mini/quadalphanum_mini.ino
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/roboface/roboface.pde b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/roboface/roboface.pde
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/roboface/roboface.pde
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/roboface/roboface.pde
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/sevenseg/sevenseg.ino b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/sevenseg/sevenseg.ino
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/sevenseg/sevenseg.ino
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/sevenseg/sevenseg.ino
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavface.pde b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavface.pde
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavface.pde
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavface.pde
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavs/beware_i.wav b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavs/beware_i.wav
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavs/beware_i.wav
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavs/beware_i.wav
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavs/ihunger.wav b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavs/ihunger.wav
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavs/ihunger.wav
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavs/ihunger.wav
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavs/run_cowd.wav b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavs/run_cowd.wav
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavs/run_cowd.wav
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/examples/wavface/wavs/run_cowd.wav
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/library.properties b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/library.properties
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/library.properties
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/library.properties
diff --git a/lib/Adafruit_LED_Backpack-1.1.6/license.txt b/lib/lib_display/Adafruit_LED_Backpack-1.1.6/license.txt
similarity index 100%
rename from lib/Adafruit_LED_Backpack-1.1.6/license.txt
rename to lib/lib_display/Adafruit_LED_Backpack-1.1.6/license.txt
diff --git a/lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.cpp b/lib/lib_display/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.cpp
similarity index 100%
rename from lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.cpp
rename to lib/lib_display/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.cpp
diff --git a/lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.h b/lib/lib_display/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.h
similarity index 100%
rename from lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.h
rename to lib/lib_display/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.h
diff --git a/lib/Adafruit_SH1106-gemu-1.0/LICENSE.txt b/lib/lib_display/Adafruit_SH1106-gemu-1.0/LICENSE.txt
similarity index 100%
rename from lib/Adafruit_SH1106-gemu-1.0/LICENSE.txt
rename to lib/lib_display/Adafruit_SH1106-gemu-1.0/LICENSE.txt
diff --git a/lib/Adafruit_SH1106-gemu-1.0/README.md b/lib/lib_display/Adafruit_SH1106-gemu-1.0/README.md
similarity index 100%
rename from lib/Adafruit_SH1106-gemu-1.0/README.md
rename to lib/lib_display/Adafruit_SH1106-gemu-1.0/README.md
diff --git a/lib/Adafruit_SH1106-gemu-1.0/examples/sh1106_128x64_i2c/sh1106_128x64_i2c.ino b/lib/lib_display/Adafruit_SH1106-gemu-1.0/examples/sh1106_128x64_i2c/sh1106_128x64_i2c.ino
similarity index 100%
rename from lib/Adafruit_SH1106-gemu-1.0/examples/sh1106_128x64_i2c/sh1106_128x64_i2c.ino
rename to lib/lib_display/Adafruit_SH1106-gemu-1.0/examples/sh1106_128x64_i2c/sh1106_128x64_i2c.ino
diff --git a/lib/Adafruit_SH1106-gemu-1.0/examples/sh1106_128x64_spi/sh1106_128x64_spi.ino b/lib/lib_display/Adafruit_SH1106-gemu-1.0/examples/sh1106_128x64_spi/sh1106_128x64_spi.ino
similarity index 100%
rename from lib/Adafruit_SH1106-gemu-1.0/examples/sh1106_128x64_spi/sh1106_128x64_spi.ino
rename to lib/lib_display/Adafruit_SH1106-gemu-1.0/examples/sh1106_128x64_spi/sh1106_128x64_spi.ino
diff --git a/lib/Adafruit_SH1106-gemu-1.0/library.properties b/lib/lib_display/Adafruit_SH1106-gemu-1.0/library.properties
similarity index 100%
rename from lib/Adafruit_SH1106-gemu-1.0/library.properties
rename to lib/lib_display/Adafruit_SH1106-gemu-1.0/library.properties
diff --git a/lib/Adafruit_MCP9808_Tasmota/.github/ISSUE_TEMPLATE.md b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from lib/Adafruit_MCP9808_Tasmota/.github/ISSUE_TEMPLATE.md
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/.github/ISSUE_TEMPLATE.md
diff --git a/lib/Adafruit_MCP9808_Tasmota/.github/PULL_REQUEST_TEMPLATE.md b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from lib/Adafruit_MCP9808_Tasmota/.github/PULL_REQUEST_TEMPLATE.md
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.gitignore b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/.gitignore
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.gitignore
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/.gitignore
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.travis.yml b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/.travis.yml
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.travis.yml
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/.travis.yml
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.cpp b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.cpp
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.cpp
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.cpp
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.h b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.h
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.h
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.h
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/README.md b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/README.md
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/README.md
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/README.md
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/OLED_featherwing/OLED_featherwing.ino b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/OLED_featherwing/OLED_featherwing.ino
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/OLED_featherwing/OLED_featherwing.ino
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/OLED_featherwing/OLED_featherwing.ino
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/library.properties b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/library.properties
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/library.properties
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/library.properties
diff --git a/lib/Adafruit_MCP9808_Tasmota/license.txt b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/license.txt
similarity index 100%
rename from lib/Adafruit_MCP9808_Tasmota/license.txt
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/license.txt
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/splash.h b/lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/splash.h
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/splash.h
rename to lib/lib_display/Adafruit_SSD1306-1.3.0-gemu-1.1/splash.h
diff --git a/lib/Adafruit_SSD1351-gemu-1.0/README.md b/lib/lib_display/Adafruit_SSD1351-gemu-1.0/README.md
similarity index 100%
rename from lib/Adafruit_SSD1351-gemu-1.0/README.md
rename to lib/lib_display/Adafruit_SSD1351-gemu-1.0/README.md
diff --git a/lib/Adafruit_SSD1351-gemu-1.0/SSD1351.cpp b/lib/lib_display/Adafruit_SSD1351-gemu-1.0/SSD1351.cpp
similarity index 100%
rename from lib/Adafruit_SSD1351-gemu-1.0/SSD1351.cpp
rename to lib/lib_display/Adafruit_SSD1351-gemu-1.0/SSD1351.cpp
diff --git a/lib/Adafruit_SSD1351-gemu-1.0/SSD1351.h b/lib/lib_display/Adafruit_SSD1351-gemu-1.0/SSD1351.h
similarity index 100%
rename from lib/Adafruit_SSD1351-gemu-1.0/SSD1351.h
rename to lib/lib_display/Adafruit_SSD1351-gemu-1.0/SSD1351.h
diff --git a/lib/Adafruit_SSD1351-gemu-1.0/Tiger.c b/lib/lib_display/Adafruit_SSD1351-gemu-1.0/Tiger.c
similarity index 100%
rename from lib/Adafruit_SSD1351-gemu-1.0/Tiger.c
rename to lib/lib_display/Adafruit_SSD1351-gemu-1.0/Tiger.c
diff --git a/lib/Adafruit_SSD1351-gemu-1.0/Tiger.rgb b/lib/lib_display/Adafruit_SSD1351-gemu-1.0/Tiger.rgb
similarity index 100%
rename from lib/Adafruit_SSD1351-gemu-1.0/Tiger.rgb
rename to lib/lib_display/Adafruit_SSD1351-gemu-1.0/Tiger.rgb
diff --git a/lib/Adafruit_SSD1351-gemu-1.0/keywords.txt b/lib/lib_display/Adafruit_SSD1351-gemu-1.0/keywords.txt
similarity index 100%
rename from lib/Adafruit_SSD1351-gemu-1.0/keywords.txt
rename to lib/lib_display/Adafruit_SSD1351-gemu-1.0/keywords.txt
diff --git a/lib/Adafruit_SSD1351-gemu-1.0/library.properties b/lib/lib_display/Adafruit_SSD1351-gemu-1.0/library.properties
similarity index 100%
rename from lib/Adafruit_SSD1351-gemu-1.0/library.properties
rename to lib/lib_display/Adafruit_SSD1351-gemu-1.0/library.properties
diff --git a/lib/Adafruit_SSD1351-gemu-1.0/spi_register.h b/lib/lib_display/Adafruit_SSD1351-gemu-1.0/spi_register.h
similarity index 100%
rename from lib/Adafruit_SSD1351-gemu-1.0/spi_register.h
rename to lib/lib_display/Adafruit_SSD1351-gemu-1.0/spi_register.h
diff --git a/lib/Arduino_ST7789-gemu-1.0/Arduino_ST7789.cpp b/lib/lib_display/Arduino_ST7789-gemu-1.0/Arduino_ST7789.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from lib/Arduino_ST7789-gemu-1.0/Arduino_ST7789.cpp
rename to lib/lib_display/Arduino_ST7789-gemu-1.0/Arduino_ST7789.cpp
diff --git a/lib/Arduino_ST7789-gemu-1.0/Arduino_ST7789.h b/lib/lib_display/Arduino_ST7789-gemu-1.0/Arduino_ST7789.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/Arduino_ST7789-gemu-1.0/Arduino_ST7789.h
rename to lib/lib_display/Arduino_ST7789-gemu-1.0/Arduino_ST7789.h
diff --git a/lib/Arduino_ST7789-gemu-1.0/README.txt b/lib/lib_display/Arduino_ST7789-gemu-1.0/README.txt
old mode 100755
new mode 100644
similarity index 100%
rename from lib/Arduino_ST7789-gemu-1.0/README.txt
rename to lib/lib_display/Arduino_ST7789-gemu-1.0/README.txt
diff --git a/lib/Arduino_ST7789-gemu-1.0/examples/graphicstest/graphicstest.ino b/lib/lib_display/Arduino_ST7789-gemu-1.0/examples/graphicstest/graphicstest.ino
old mode 100755
new mode 100644
similarity index 99%
rename from lib/Arduino_ST7789-gemu-1.0/examples/graphicstest/graphicstest.ino
rename to lib/lib_display/Arduino_ST7789-gemu-1.0/examples/graphicstest/graphicstest.ino
index 3f24d027a..baed077ab
--- a/lib/Arduino_ST7789-gemu-1.0/examples/graphicstest/graphicstest.ino
+++ b/lib/lib_display/Arduino_ST7789-gemu-1.0/examples/graphicstest/graphicstest.ino
@@ -275,4 +275,4 @@ void mediabuttons() {
   tft.fillRoundRect(69, 98, 20, 45, 5, RED);
   // play color
   tft.fillTriangle(42, 20, 42, 60, 90, 40, GREEN);
-}
+}
diff --git a/lib/Arduino_ST7789-gemu-1.0/keywords.txt b/lib/lib_display/Arduino_ST7789-gemu-1.0/keywords.txt
similarity index 100%
rename from lib/Arduino_ST7789-gemu-1.0/keywords.txt
rename to lib/lib_display/Arduino_ST7789-gemu-1.0/keywords.txt
diff --git a/lib/Arduino_ST7789-gemu-1.0/library.properties b/lib/lib_display/Arduino_ST7789-gemu-1.0/library.properties
old mode 100755
new mode 100644
similarity index 100%
rename from lib/Arduino_ST7789-gemu-1.0/library.properties
rename to lib/lib_display/Arduino_ST7789-gemu-1.0/library.properties
diff --git a/lib/JaretBurkett_ILI9488-gemu-1.0/ILI9488.cpp b/lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/ILI9488.cpp
similarity index 100%
rename from lib/JaretBurkett_ILI9488-gemu-1.0/ILI9488.cpp
rename to lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/ILI9488.cpp
diff --git a/lib/JaretBurkett_ILI9488-gemu-1.0/ILI9488.h b/lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/ILI9488.h
similarity index 100%
rename from lib/JaretBurkett_ILI9488-gemu-1.0/ILI9488.h
rename to lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/ILI9488.h
diff --git a/lib/JaretBurkett_ILI9488-gemu-1.0/README.md b/lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/README.md
similarity index 100%
rename from lib/JaretBurkett_ILI9488-gemu-1.0/README.md
rename to lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/README.md
diff --git a/lib/JaretBurkett_ILI9488-gemu-1.0/examples/graphicstest/graphicstest.ino b/lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/examples/graphicstest/graphicstest.ino
similarity index 100%
rename from lib/JaretBurkett_ILI9488-gemu-1.0/examples/graphicstest/graphicstest.ino
rename to lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/examples/graphicstest/graphicstest.ino
diff --git a/lib/JaretBurkett_ILI9488-gemu-1.0/keywords.txt b/lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/keywords.txt
similarity index 100%
rename from lib/JaretBurkett_ILI9488-gemu-1.0/keywords.txt
rename to lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/keywords.txt
diff --git a/lib/JaretBurkett_ILI9488-gemu-1.0/library.properties b/lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/library.properties
similarity index 100%
rename from lib/JaretBurkett_ILI9488-gemu-1.0/library.properties
rename to lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/library.properties
diff --git a/lib/JaretBurkett_ILI9488-gemu-1.0/spi_register.h b/lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/spi_register.h
similarity index 100%
rename from lib/JaretBurkett_ILI9488-gemu-1.0/spi_register.h
rename to lib/lib_display/JaretBurkett_ILI9488-gemu-1.0/spi_register.h
diff --git a/lib/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.cpp b/lib/lib_display/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.cpp
similarity index 100%
rename from lib/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.cpp
rename to lib/lib_display/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.cpp
diff --git a/lib/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.h b/lib/lib_display/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.h
similarity index 100%
rename from lib/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.h
rename to lib/lib_display/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.h
diff --git a/lib/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.o b/lib/lib_display/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.o
similarity index 100%
rename from lib/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.o
rename to lib/lib_display/LiquidCrystal_I2C-1.1.3/LiquidCrystal_I2C.o
diff --git a/lib/LiquidCrystal_I2C-1.1.3/README.md b/lib/lib_display/LiquidCrystal_I2C-1.1.3/README.md
similarity index 100%
rename from lib/LiquidCrystal_I2C-1.1.3/README.md
rename to lib/lib_display/LiquidCrystal_I2C-1.1.3/README.md
diff --git a/lib/LiquidCrystal_I2C-1.1.3/examples/CustomChars/CustomChars.pde b/lib/lib_display/LiquidCrystal_I2C-1.1.3/examples/CustomChars/CustomChars.pde
similarity index 100%
rename from lib/LiquidCrystal_I2C-1.1.3/examples/CustomChars/CustomChars.pde
rename to lib/lib_display/LiquidCrystal_I2C-1.1.3/examples/CustomChars/CustomChars.pde
diff --git a/lib/LiquidCrystal_I2C-1.1.3/examples/HelloWorld/HelloWorld.pde b/lib/lib_display/LiquidCrystal_I2C-1.1.3/examples/HelloWorld/HelloWorld.pde
similarity index 100%
rename from lib/LiquidCrystal_I2C-1.1.3/examples/HelloWorld/HelloWorld.pde
rename to lib/lib_display/LiquidCrystal_I2C-1.1.3/examples/HelloWorld/HelloWorld.pde
diff --git a/lib/LiquidCrystal_I2C-1.1.3/examples/SerialDisplay/SerialDisplay.pde b/lib/lib_display/LiquidCrystal_I2C-1.1.3/examples/SerialDisplay/SerialDisplay.pde
similarity index 100%
rename from lib/LiquidCrystal_I2C-1.1.3/examples/SerialDisplay/SerialDisplay.pde
rename to lib/lib_display/LiquidCrystal_I2C-1.1.3/examples/SerialDisplay/SerialDisplay.pde
diff --git a/lib/LiquidCrystal_I2C-1.1.3/keywords.txt b/lib/lib_display/LiquidCrystal_I2C-1.1.3/keywords.txt
similarity index 100%
rename from lib/LiquidCrystal_I2C-1.1.3/keywords.txt
rename to lib/lib_display/LiquidCrystal_I2C-1.1.3/keywords.txt
diff --git a/lib/LiquidCrystal_I2C-1.1.3/library.json b/lib/lib_display/LiquidCrystal_I2C-1.1.3/library.json
similarity index 100%
rename from lib/LiquidCrystal_I2C-1.1.3/library.json
rename to lib/lib_display/LiquidCrystal_I2C-1.1.3/library.json
diff --git a/lib/LiquidCrystal_I2C-1.1.3/library.properties b/lib/lib_display/LiquidCrystal_I2C-1.1.3/library.properties
similarity index 100%
rename from lib/LiquidCrystal_I2C-1.1.3/library.properties
rename to lib/lib_display/LiquidCrystal_I2C-1.1.3/library.properties
diff --git a/lib/Xlatb_RA8876-gemu-1.0/RA8876.cpp b/lib/lib_display/Xlatb_RA8876-gemu-1.0/RA8876.cpp
similarity index 100%
rename from lib/Xlatb_RA8876-gemu-1.0/RA8876.cpp
rename to lib/lib_display/Xlatb_RA8876-gemu-1.0/RA8876.cpp
diff --git a/lib/Xlatb_RA8876-gemu-1.0/RA8876.h b/lib/lib_display/Xlatb_RA8876-gemu-1.0/RA8876.h
similarity index 100%
rename from lib/Xlatb_RA8876-gemu-1.0/RA8876.h
rename to lib/lib_display/Xlatb_RA8876-gemu-1.0/RA8876.h
diff --git a/lib/Xlatb_RA8876-gemu-1.0/README.md b/lib/lib_display/Xlatb_RA8876-gemu-1.0/README.md
similarity index 100%
rename from lib/Xlatb_RA8876-gemu-1.0/README.md
rename to lib/lib_display/Xlatb_RA8876-gemu-1.0/README.md
diff --git a/lib/Xlatb_RA8876-gemu-1.0/keywords.txt b/lib/lib_display/Xlatb_RA8876-gemu-1.0/keywords.txt
similarity index 100%
rename from lib/Xlatb_RA8876-gemu-1.0/keywords.txt
rename to lib/lib_display/Xlatb_RA8876-gemu-1.0/keywords.txt
diff --git a/lib/Xlatb_RA8876-gemu-1.0/library.properties b/lib/lib_display/Xlatb_RA8876-gemu-1.0/library.properties
similarity index 100%
rename from lib/Xlatb_RA8876-gemu-1.0/library.properties
rename to lib/lib_display/Xlatb_RA8876-gemu-1.0/library.properties
diff --git a/lib/Xlatb_RA8876-gemu-1.0/spi_register.h b/lib/lib_display/Xlatb_RA8876-gemu-1.0/spi_register.h
similarity index 100%
rename from lib/Xlatb_RA8876-gemu-1.0/spi_register.h
rename to lib/lib_display/Xlatb_RA8876-gemu-1.0/spi_register.h
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/.gitignore b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/.gitignore
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/.gitignore
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/.gitignore
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/.travis.yml b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/.travis.yml
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/.travis.yml
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/.travis.yml
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/Arduino/epd2in9-demo/epd2in9-demo.ino b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/Arduino/epd2in9-demo/epd2in9-demo.ino
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/Arduino/epd2in9-demo/epd2in9-demo.ino
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/Arduino/epd2in9-demo/epd2in9-demo.ino
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/Arduino/libraries/readme.txt b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/Arduino/libraries/readme.txt
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/Arduino/libraries/readme.txt
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/Arduino/libraries/readme.txt
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/LICENSE b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/LICENSE
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/LICENSE
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/LICENSE
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/Makefile b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/Makefile
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/Makefile
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/Makefile
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/README.md b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/README.md
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/README.md
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/README.md
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/component.mk b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/component.mk
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/component.mk
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/component.mk
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper-29-ws.c b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper-29-ws.c
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper-29-ws.c
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper-29-ws.c
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper-29-ws.h b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper-29-ws.h
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper-29-ws.h
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper-29-ws.h
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper_font.c b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper_font.c
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper_font.c
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper_font.c
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper_fonts.h b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper_fonts.h
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper_fonts.h
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/epaper_fonts.h
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/font16.c b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/font16.c
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/font16.c
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/font16.c
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/font20.c b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/font20.c
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/font20.c
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/font20.c
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/font8.c b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/font8.c
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/font8.c
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/font8.c
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/imagedata.cpp b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/imagedata.cpp
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/imagedata.cpp
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/imagedata.cpp
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/imagedata.h b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/imagedata.h
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/imagedata.h
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/components/epaper-29-ws/imagedata.h
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/Doxyfile b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/Doxyfile
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/Doxyfile
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/Doxyfile
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/Makefile b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/Makefile
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/Makefile
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/Makefile
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/README.md b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/README.md
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/README.md
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/README.md
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/conf.py b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/conf.py
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/conf.py
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/conf.py
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/gen-dxd.py b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/gen-dxd.py
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/gen-dxd.py
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/gen-dxd.py
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/index.rst b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/index.rst
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/index.rst
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/index.rst
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/link-roles.py b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/link-roles.py
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/link-roles.py
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/link-roles.py
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/repo_util.py b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/repo_util.py
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/repo_util.py
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/repo_util.py
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/requirements.txt b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/requirements.txt
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/docs/requirements.txt
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/docs/requirements.txt
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/library.properties b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/library.properties
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/library.properties
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/library.properties
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/main/README.md b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/main/README.md
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/main/README.md
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/main/README.md
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/main/component.mk b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/main/component.mk
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/main/component.mk
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/main/component.mk
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/main/esp-epaper-29-ws.c b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/main/esp-epaper-29-ws.c
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/main/esp-epaper-29-ws.c
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/main/esp-epaper-29-ws.c
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/main/imagedata.c b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/main/imagedata.c
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/main/imagedata.c
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/main/imagedata.c
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/main/imagedata.h b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/main/imagedata.h
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/main/imagedata.h
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/main/imagedata.h
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/pictures/2.9inch_e-Paper_Datasheet.pdf b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/pictures/2.9inch_e-Paper_Datasheet.pdf
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/pictures/2.9inch_e-Paper_Datasheet.pdf
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/pictures/2.9inch_e-Paper_Datasheet.pdf
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/pictures/e-paper-and-esp-sample-image.jpg b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/pictures/e-paper-and-esp-sample-image.jpg
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/pictures/e-paper-and-esp-sample-image.jpg
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/pictures/e-paper-and-esp-sample-image.jpg
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/pictures/e-paper-and-esp-sample-text.jpg b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/pictures/e-paper-and-esp-sample-text.jpg
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/pictures/e-paper-and-esp-sample-text.jpg
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/pictures/e-paper-and-esp-sample-text.jpg
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/pictures/espresif-logo.bmp b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/pictures/espresif-logo.bmp
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/pictures/espresif-logo.bmp
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/pictures/espresif-logo.bmp
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/pictures/image-conversion-setup.png b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/pictures/image-conversion-setup.png
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/pictures/image-conversion-setup.png
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/pictures/image-conversion-setup.png
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.cpp b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.cpp
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.cpp
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.cpp
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.h b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.h
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.h
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epd2in9.h
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.cpp b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.cpp
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.cpp
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.cpp
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.h b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.h
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.h
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epd4in2.h
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdif.cpp b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epdif.cpp
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdif.cpp
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epdif.cpp
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdif.h b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epdif.h
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdif.h
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epdif.h
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.cpp b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.cpp
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.cpp
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.cpp
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.h b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.h
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.h
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/epdpaint.h
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/font12.c b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/font12.c
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/font12.c
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/font12.c
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/font16.c b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/font16.c
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/font16.c
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/font16.c
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/font20.c b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/font20.c
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/font20.c
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/font20.c
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/font24.c b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/font24.c
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/font24.c
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/font24.c
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/font8.c b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/font8.c
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/font8.c
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/font8.c
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/fonts.h b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/fonts.h
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/fonts.h
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/fonts.h
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.cpp b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.cpp
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.cpp
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.cpp
diff --git a/lib/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.h b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.h
similarity index 100%
rename from lib/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.h
rename to lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/src/renderer.h
diff --git a/lib/A4988_Stepper/README.adoc b/lib/lib_div/A4988_Stepper/README.adoc
similarity index 100%
rename from lib/A4988_Stepper/README.adoc
rename to lib/lib_div/A4988_Stepper/README.adoc
diff --git a/lib/A4988_Stepper/keywords.txt b/lib/lib_div/A4988_Stepper/keywords.txt
old mode 100755
new mode 100644
similarity index 100%
rename from lib/A4988_Stepper/keywords.txt
rename to lib/lib_div/A4988_Stepper/keywords.txt
diff --git a/lib/A4988_Stepper/library.properties b/lib/lib_div/A4988_Stepper/library.properties
similarity index 100%
rename from lib/A4988_Stepper/library.properties
rename to lib/lib_div/A4988_Stepper/library.properties
diff --git a/lib/A4988_Stepper/src/A4988_Stepper.cpp b/lib/lib_div/A4988_Stepper/src/A4988_Stepper.cpp
similarity index 100%
rename from lib/A4988_Stepper/src/A4988_Stepper.cpp
rename to lib/lib_div/A4988_Stepper/src/A4988_Stepper.cpp
diff --git a/lib/A4988_Stepper/src/A4988_Stepper.h b/lib/lib_div/A4988_Stepper/src/A4988_Stepper.h
similarity index 100%
rename from lib/A4988_Stepper/src/A4988_Stepper.h
rename to lib/lib_div/A4988_Stepper/src/A4988_Stepper.h
diff --git a/lib/ArduinoNTPd/NTPPacket.cpp b/lib/lib_div/ArduinoNTPd/NTPPacket.cpp
similarity index 100%
rename from lib/ArduinoNTPd/NTPPacket.cpp
rename to lib/lib_div/ArduinoNTPd/NTPPacket.cpp
diff --git a/lib/ArduinoNTPd/NTPPacket.h b/lib/lib_div/ArduinoNTPd/NTPPacket.h
similarity index 100%
rename from lib/ArduinoNTPd/NTPPacket.h
rename to lib/lib_div/ArduinoNTPd/NTPPacket.h
diff --git a/lib/ArduinoNTPd/NTPServer.cpp b/lib/lib_div/ArduinoNTPd/NTPServer.cpp
similarity index 100%
rename from lib/ArduinoNTPd/NTPServer.cpp
rename to lib/lib_div/ArduinoNTPd/NTPServer.cpp
diff --git a/lib/ArduinoNTPd/NTPServer.h b/lib/lib_div/ArduinoNTPd/NTPServer.h
similarity index 100%
rename from lib/ArduinoNTPd/NTPServer.h
rename to lib/lib_div/ArduinoNTPd/NTPServer.h
diff --git a/lib/ArduinoNTPd/library.properties b/lib/lib_div/ArduinoNTPd/library.properties
similarity index 100%
rename from lib/ArduinoNTPd/library.properties
rename to lib/lib_div/ArduinoNTPd/library.properties
diff --git a/lib/LibTeleinfo/README.md b/lib/lib_div/LibTeleinfo/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from lib/LibTeleinfo/README.md
rename to lib/lib_div/LibTeleinfo/README.md
diff --git a/lib/LibTeleinfo/library.json b/lib/lib_div/LibTeleinfo/library.json
old mode 100755
new mode 100644
similarity index 95%
rename from lib/LibTeleinfo/library.json
rename to lib/lib_div/LibTeleinfo/library.json
index 721266bef..b2e0684b8
--- a/lib/LibTeleinfo/library.json
+++ b/lib/lib_div/LibTeleinfo/library.json
@@ -1,19 +1,19 @@
-{
-  "name": "LibTeleinfo",
-  "version": "1.1.3",
-  "keywords": "teleinfo, french, meter, power, erdf, linky, tic",
-  "description": "Decoder for Teleinfo (aka TIC) from French smart power meters",
-  "repository":
-  {
-    "type": "git",
-    "url": "https://github.com/hallard/LibTeleinfo.git"
-  },
-  "authors":
-  {
-    "name": "Charles-Henri Hallard",
-    "url": "http://hallard.me"
-  },
-  "frameworks": "arduino",
-  "platforms": "*"  
-}
-
+{
+  "name": "LibTeleinfo",
+  "version": "1.1.3",
+  "keywords": "teleinfo, french, meter, power, erdf, linky, tic",
+  "description": "Decoder for Teleinfo (aka TIC) from French smart power meters",
+  "repository":
+  {
+    "type": "git",
+    "url": "https://github.com/hallard/LibTeleinfo.git"
+  },
+  "authors":
+  {
+    "name": "Charles-Henri Hallard",
+    "url": "http://hallard.me"
+  },
+  "frameworks": "arduino",
+  "platforms": "*"  
+}
+
diff --git a/lib/LibTeleinfo/library.properties b/lib/lib_div/LibTeleinfo/library.properties
old mode 100755
new mode 100644
similarity index 95%
rename from lib/LibTeleinfo/library.properties
rename to lib/lib_div/LibTeleinfo/library.properties
index 89fce0969..ad488ca08
--- a/lib/LibTeleinfo/library.properties
+++ b/lib/lib_div/LibTeleinfo/library.properties
@@ -1,9 +1,9 @@
-name=LibTeleinfo
-version=1.1.3
-author=Charles-Henri Hallard <hallard.me>
-maintainer=Charles-Henri Hallard <community.hallard.me>
-sentence=Decoder for Teleinfo (aka TIC) from French smart power meters
-paragraph=This is a generic Teleinfo (aka TIC) French Meter Measure Library, it can be used on Arduino, Particle, ESP8266, Raspberry PI or anywhere you can do Cpp coding.
-category=Communication
-url=https://github.com/hallard/LibTeleinfo
+name=LibTeleinfo
+version=1.1.3
+author=Charles-Henri Hallard <hallard.me>
+maintainer=Charles-Henri Hallard <community.hallard.me>
+sentence=Decoder for Teleinfo (aka TIC) from French smart power meters
+paragraph=This is a generic Teleinfo (aka TIC) French Meter Measure Library, it can be used on Arduino, Particle, ESP8266, Raspberry PI or anywhere you can do Cpp coding.
+category=Communication
+url=https://github.com/hallard/LibTeleinfo
 architectures=*
\ No newline at end of file
diff --git a/lib/LibTeleinfo/src/LibTeleinfo.cpp b/lib/lib_div/LibTeleinfo/src/LibTeleinfo.cpp
similarity index 100%
rename from lib/LibTeleinfo/src/LibTeleinfo.cpp
rename to lib/lib_div/LibTeleinfo/src/LibTeleinfo.cpp
diff --git a/lib/LibTeleinfo/src/LibTeleinfo.h b/lib/lib_div/LibTeleinfo/src/LibTeleinfo.h
old mode 100755
new mode 100644
similarity index 97%
rename from lib/LibTeleinfo/src/LibTeleinfo.h
rename to lib/lib_div/LibTeleinfo/src/LibTeleinfo.h
index 01c603c83..60dc0228b
--- a/lib/LibTeleinfo/src/LibTeleinfo.h
+++ b/lib/lib_div/LibTeleinfo/src/LibTeleinfo.h
@@ -1,185 +1,185 @@
-// **********************************************************************************
-// Driver definition for French Teleinfo
-// **********************************************************************************
-// Creative Commons Attrib Share-Alike License
-// You are free to use/extend this library but please abide with the CC-BY-SA license:
-// http://creativecommons.org/licenses/by-sa/4.0/
-//
-// For any explanation about teleinfo ou use , see my blog
-// http://hallard.me/category/tinfo
-//
-// Code based on following datasheet
-// http://www.erdf.fr/sites/default/files/ERDF-NOI-CPT_02E.pdf
-//
-// Written by Charles-Henri Hallard (http://hallard.me)
-//
-// History : V1.00 2015-06-14 - First release
-//           V2.00 2020-06-11 - Integration into Tasmota
-//           V2.01 2020-08-11 - Merged LibTeleinfo official and Tasmota version
-//                              Added support for new standard mode of linky smart meter
-//
-// All text above must be included in any redistribution.
-//
-// Edit : Tab size set to 2 but I converted tab to sapces
-//
-// **********************************************************************************
-
-#ifndef LibTeleinfo_h
-#define LibTeleinfo_h
-
-#ifdef __arm__
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#define boolean bool 
-#endif
-
-#ifdef ARDUINO
-#include <Arduino.h>
-#endif
-
-// Define this if you want library to be verbose
-//#define TI_DEBUG
-
-// I prefix debug macro to be sure to use specific for THIS library
-// debugging, this should not interfere with main sketch or other 
-// libraries
-#ifdef TI_DEBUG
-  // Tasmota build
-  #ifdef CODE_IMAGE_STR
-      #define TI_Debug(x)    AddLog_P2(LOG_LEVEL_DEBUG, x);
-      #define TI_Debugln(x)  AddLog_P2(LOG_LEVEL_DEBUG, x);
-      #define TI_Debugf(...) AddLog_P2(LOG_LEVEL_DEBUG, __VA_ARGS__);
-      #define TI_Debugflush  {}
-  #else
-    #ifdef ESP8266
-      #define TI_Debug(x)    Serial1.print(x)
-      #define TI_Debugln(x)  Serial1.println(x)
-      #define TI_Debugf(...) Serial1.printf(__VA_ARGS__)
-      #define TI_Debugflush  Serial1.flush
-    #else
-      #define TI_Debug(x)    Serial.print(x)
-      #define TI_Debugln(x)  Serial.println(x)
-      #define TI_Debugf(...) Serial.printf(__VA_ARGS__)
-      #define TI_Debugflush  Serial.flush
-    #endif
-  #endif
-#else
-  #define TI_Debug(x)    {}
-  #define TI_Debugln(x)  {}
-  #define TI_Debugf(...) {}
-  #define TI_Debugflush  {}
-#endif
-
-// For 4 bytes Aligment boundaries
-#if defined (ESP8266) || defined (ESP32)
-#define ESP_allocAlign(size)  ((size + 3) & ~((size_t) 3))
-#endif
-
-#pragma pack(push)  // push current alignment to stack
-#pragma pack(1)     // set alignment to 1 byte boundary
-
-// Linked list structure containing all values received
-typedef struct _ValueList ValueList;
-struct _ValueList 
-{
-  ValueList *next; // next element
-//#ifdef USE_TELEINFO_STANDARD  
-  time_t  ts;      // TimeStamp of data if any
-//#endif
-  uint8_t checksum;// checksum
-  uint8_t flags;   // specific flags
-  char  * name;    // LABEL of value name
-  char  * value;   // value 
-};
-
-#pragma pack(pop)
-
-// Library state machine
-enum _Mode_e {
-  TINFO_MODE_HISTORIQUE,  // Legacy mode (1200)
-  TINFO_MODE_STANDARD     // Standard mode (9600)
-};
-
-// Library state machine
-enum _State_e {
-  TINFO_INIT,     // We're in init
-  TINFO_WAIT_STX, // We're waiting for STX
-  TINFO_WAIT_ETX, // We had STX, We're waiting for ETX
-  TINFO_READY     // We had STX AND ETX, So we're OK
-};
-
-// what we done with received value (also for callback flags)
-#define TINFO_FLAGS_NONE     0x00
-#define TINFO_FLAGS_NOTHING  0x01
-#define TINFO_FLAGS_ADDED    0x02
-#define TINFO_FLAGS_EXIST    0x04
-#define TINFO_FLAGS_UPDATED  0x08
-#define TINFO_FLAGS_ALERT    0x80 /* This will generate an alert */
-
-// Local buffer for one line of teleinfo 
-// maximum size, I think it should be enought
-#ifdef USE_TELEINFO_STANDARD  
-// Linky and standard mode may have longer lines
-#define TINFO_BUFSIZE  128
-#else
-#define TINFO_BUFSIZE  64
-#endif
-
-// Teleinfo start and end of frame characters
-#define TINFO_STX 0x02
-#define TINFO_ETX 0x03 
-#define TINFO_HT  0x09
-#define TINFO_SGR '\n' // start of group  
-#define TINFO_EGR '\r' // End of group    
-
-typedef void (*_fn_ADPS) (uint8_t);
-typedef void (*_fn_data) (ValueList *, uint8_t);
-typedef void (*_fn_new_frame) (ValueList *);
-typedef void (*_fn_updated_frame) (ValueList *);
-
-class TInfo
-{
-  public:
-    TInfo();
-    void          init(_Mode_e mode = TINFO_MODE_HISTORIQUE);
-    _State_e      process (char c);
-    void          attachADPS(void (*_fn_ADPS)(uint8_t phase));  
-    void          attachData(void (*_fn_data)(ValueList * valueslist, uint8_t state));  
-    void          attachNewFrame(void (*_fn_new_frame)(ValueList * valueslist));  
-    void          attachUpdatedFrame(void (*_fn_updated_frame)(ValueList * valueslist));  
-    ValueList *   addCustomValue(char * name, char * value, uint8_t * flags);
-    ValueList *   getList(void);
-    uint8_t       valuesDump(void);
-    char *        valueGet(char * name, char * value);
-    char *        valueGet_P(const char * name, char * value);
-    boolean       listDelete();
-    unsigned char calcChecksum(char *etiquette, char *valeur, char *horodate=NULL) ;
-
-  private:
-    void          clearBuffer();
-    ValueList *   valueAdd (char * name, char * value, uint8_t checksum, uint8_t * flags, char * horodate=NULL);
-    boolean       valueRemove (char * name);
-    boolean       valueRemoveFlagged(uint8_t flags);
-    int           labelCount();
-    uint32_t      horodate2Timestamp( char * pdate) ;
-    void          customLabel( char * plabel, char * pvalue, uint8_t * pflags) ;
-    ValueList *   checkLine(char * pline) ;
-
-    _State_e  _state; // Teleinfo machine state
-    ValueList _valueslist;   // Linked list of teleinfo values
-    char      _recv_buff[TINFO_BUFSIZE]; // line receive buffer
-    char      _separator;
-    uint8_t   _recv_idx;  // index in receive buffer
-    boolean   _frame_updated; // Data on the frame has been updated
-    void      (*_fn_ADPS)(uint8_t phase);
-    void      (*_fn_data)(ValueList * valueslist, uint8_t state);
-    void      (*_fn_new_frame)(ValueList * valueslist);
-    void      (*_fn_updated_frame)(ValueList * valueslist);
-
-    //volatile uint8_t *dcport;
-    //uint8_t dcpinmask;
-};
-
-#endif
+// **********************************************************************************
+// Driver definition for French Teleinfo
+// **********************************************************************************
+// Creative Commons Attrib Share-Alike License
+// You are free to use/extend this library but please abide with the CC-BY-SA license:
+// http://creativecommons.org/licenses/by-sa/4.0/
+//
+// For any explanation about teleinfo ou use , see my blog
+// http://hallard.me/category/tinfo
+//
+// Code based on following datasheet
+// http://www.erdf.fr/sites/default/files/ERDF-NOI-CPT_02E.pdf
+//
+// Written by Charles-Henri Hallard (http://hallard.me)
+//
+// History : V1.00 2015-06-14 - First release
+//           V2.00 2020-06-11 - Integration into Tasmota
+//           V2.01 2020-08-11 - Merged LibTeleinfo official and Tasmota version
+//                              Added support for new standard mode of linky smart meter
+//
+// All text above must be included in any redistribution.
+//
+// Edit : Tab size set to 2 but I converted tab to sapces
+//
+// **********************************************************************************
+
+#ifndef LibTeleinfo_h
+#define LibTeleinfo_h
+
+#ifdef __arm__
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#define boolean bool 
+#endif
+
+#ifdef ARDUINO
+#include <Arduino.h>
+#endif
+
+// Define this if you want library to be verbose
+//#define TI_DEBUG
+
+// I prefix debug macro to be sure to use specific for THIS library
+// debugging, this should not interfere with main sketch or other 
+// libraries
+#ifdef TI_DEBUG
+  // Tasmota build
+  #ifdef CODE_IMAGE_STR
+      #define TI_Debug(x)    AddLog_P2(LOG_LEVEL_DEBUG, x);
+      #define TI_Debugln(x)  AddLog_P2(LOG_LEVEL_DEBUG, x);
+      #define TI_Debugf(...) AddLog_P2(LOG_LEVEL_DEBUG, __VA_ARGS__);
+      #define TI_Debugflush  {}
+  #else
+    #ifdef ESP8266
+      #define TI_Debug(x)    Serial1.print(x)
+      #define TI_Debugln(x)  Serial1.println(x)
+      #define TI_Debugf(...) Serial1.printf(__VA_ARGS__)
+      #define TI_Debugflush  Serial1.flush
+    #else
+      #define TI_Debug(x)    Serial.print(x)
+      #define TI_Debugln(x)  Serial.println(x)
+      #define TI_Debugf(...) Serial.printf(__VA_ARGS__)
+      #define TI_Debugflush  Serial.flush
+    #endif
+  #endif
+#else
+  #define TI_Debug(x)    {}
+  #define TI_Debugln(x)  {}
+  #define TI_Debugf(...) {}
+  #define TI_Debugflush  {}
+#endif
+
+// For 4 bytes Aligment boundaries
+#if defined (ESP8266) || defined (ESP32)
+#define ESP_allocAlign(size)  ((size + 3) & ~((size_t) 3))
+#endif
+
+#pragma pack(push)  // push current alignment to stack
+#pragma pack(1)     // set alignment to 1 byte boundary
+
+// Linked list structure containing all values received
+typedef struct _ValueList ValueList;
+struct _ValueList 
+{
+  ValueList *next; // next element
+//#ifdef USE_TELEINFO_STANDARD  
+  time_t  ts;      // TimeStamp of data if any
+//#endif
+  uint8_t checksum;// checksum
+  uint8_t flags;   // specific flags
+  char  * name;    // LABEL of value name
+  char  * value;   // value 
+};
+
+#pragma pack(pop)
+
+// Library state machine
+enum _Mode_e {
+  TINFO_MODE_HISTORIQUE,  // Legacy mode (1200)
+  TINFO_MODE_STANDARD     // Standard mode (9600)
+};
+
+// Library state machine
+enum _State_e {
+  TINFO_INIT,     // We're in init
+  TINFO_WAIT_STX, // We're waiting for STX
+  TINFO_WAIT_ETX, // We had STX, We're waiting for ETX
+  TINFO_READY     // We had STX AND ETX, So we're OK
+};
+
+// what we done with received value (also for callback flags)
+#define TINFO_FLAGS_NONE     0x00
+#define TINFO_FLAGS_NOTHING  0x01
+#define TINFO_FLAGS_ADDED    0x02
+#define TINFO_FLAGS_EXIST    0x04
+#define TINFO_FLAGS_UPDATED  0x08
+#define TINFO_FLAGS_ALERT    0x80 /* This will generate an alert */
+
+// Local buffer for one line of teleinfo 
+// maximum size, I think it should be enought
+#ifdef USE_TELEINFO_STANDARD  
+// Linky and standard mode may have longer lines
+#define TINFO_BUFSIZE  128
+#else
+#define TINFO_BUFSIZE  64
+#endif
+
+// Teleinfo start and end of frame characters
+#define TINFO_STX 0x02
+#define TINFO_ETX 0x03 
+#define TINFO_HT  0x09
+#define TINFO_SGR '\n' // start of group  
+#define TINFO_EGR '\r' // End of group    
+
+typedef void (*_fn_ADPS) (uint8_t);
+typedef void (*_fn_data) (ValueList *, uint8_t);
+typedef void (*_fn_new_frame) (ValueList *);
+typedef void (*_fn_updated_frame) (ValueList *);
+
+class TInfo
+{
+  public:
+    TInfo();
+    void          init(_Mode_e mode = TINFO_MODE_HISTORIQUE);
+    _State_e      process (char c);
+    void          attachADPS(void (*_fn_ADPS)(uint8_t phase));  
+    void          attachData(void (*_fn_data)(ValueList * valueslist, uint8_t state));  
+    void          attachNewFrame(void (*_fn_new_frame)(ValueList * valueslist));  
+    void          attachUpdatedFrame(void (*_fn_updated_frame)(ValueList * valueslist));  
+    ValueList *   addCustomValue(char * name, char * value, uint8_t * flags);
+    ValueList *   getList(void);
+    uint8_t       valuesDump(void);
+    char *        valueGet(char * name, char * value);
+    char *        valueGet_P(const char * name, char * value);
+    boolean       listDelete();
+    unsigned char calcChecksum(char *etiquette, char *valeur, char *horodate=NULL) ;
+
+  private:
+    void          clearBuffer();
+    ValueList *   valueAdd (char * name, char * value, uint8_t checksum, uint8_t * flags, char * horodate=NULL);
+    boolean       valueRemove (char * name);
+    boolean       valueRemoveFlagged(uint8_t flags);
+    int           labelCount();
+    uint32_t      horodate2Timestamp( char * pdate) ;
+    void          customLabel( char * plabel, char * pvalue, uint8_t * pflags) ;
+    ValueList *   checkLine(char * pline) ;
+
+    _State_e  _state; // Teleinfo machine state
+    ValueList _valueslist;   // Linked list of teleinfo values
+    char      _recv_buff[TINFO_BUFSIZE]; // line receive buffer
+    char      _separator;
+    uint8_t   _recv_idx;  // index in receive buffer
+    boolean   _frame_updated; // Data on the frame has been updated
+    void      (*_fn_ADPS)(uint8_t phase);
+    void      (*_fn_data)(ValueList * valueslist, uint8_t state);
+    void      (*_fn_new_frame)(ValueList * valueslist);
+    void      (*_fn_updated_frame)(ValueList * valueslist);
+
+    //volatile uint8_t *dcport;
+    //uint8_t dcpinmask;
+};
+
+#endif
diff --git a/lib/NewPing-1.9.1/README.md b/lib/lib_div/NewPing-1.9.1/README.md
similarity index 100%
rename from lib/NewPing-1.9.1/README.md
rename to lib/lib_div/NewPing-1.9.1/README.md
diff --git a/lib/NewPing-1.9.1/examples/NewPing15SensorsTimer/NewPing15SensorsTimer.pde b/lib/lib_div/NewPing-1.9.1/examples/NewPing15SensorsTimer/NewPing15SensorsTimer.pde
similarity index 100%
rename from lib/NewPing-1.9.1/examples/NewPing15SensorsTimer/NewPing15SensorsTimer.pde
rename to lib/lib_div/NewPing-1.9.1/examples/NewPing15SensorsTimer/NewPing15SensorsTimer.pde
diff --git a/lib/NewPing-1.9.1/examples/NewPing3Sensors/NewPing3Sensors.pde b/lib/lib_div/NewPing-1.9.1/examples/NewPing3Sensors/NewPing3Sensors.pde
similarity index 100%
rename from lib/NewPing-1.9.1/examples/NewPing3Sensors/NewPing3Sensors.pde
rename to lib/lib_div/NewPing-1.9.1/examples/NewPing3Sensors/NewPing3Sensors.pde
diff --git a/lib/NewPing-1.9.1/examples/NewPingEventTimer/NewPingEventTimer.pde b/lib/lib_div/NewPing-1.9.1/examples/NewPingEventTimer/NewPingEventTimer.pde
similarity index 100%
rename from lib/NewPing-1.9.1/examples/NewPingEventTimer/NewPingEventTimer.pde
rename to lib/lib_div/NewPing-1.9.1/examples/NewPingEventTimer/NewPingEventTimer.pde
diff --git a/lib/NewPing-1.9.1/examples/NewPingExample/NewPingExample.pde b/lib/lib_div/NewPing-1.9.1/examples/NewPingExample/NewPingExample.pde
similarity index 100%
rename from lib/NewPing-1.9.1/examples/NewPingExample/NewPingExample.pde
rename to lib/lib_div/NewPing-1.9.1/examples/NewPingExample/NewPingExample.pde
diff --git a/lib/NewPing-1.9.1/examples/NewPingTimerMedian/NewPingTimerMedian.pde b/lib/lib_div/NewPing-1.9.1/examples/NewPingTimerMedian/NewPingTimerMedian.pde
similarity index 100%
rename from lib/NewPing-1.9.1/examples/NewPingTimerMedian/NewPingTimerMedian.pde
rename to lib/lib_div/NewPing-1.9.1/examples/NewPingTimerMedian/NewPingTimerMedian.pde
diff --git a/lib/NewPing-1.9.1/examples/TimerExample/TimerExample.pde b/lib/lib_div/NewPing-1.9.1/examples/TimerExample/TimerExample.pde
similarity index 100%
rename from lib/NewPing-1.9.1/examples/TimerExample/TimerExample.pde
rename to lib/lib_div/NewPing-1.9.1/examples/TimerExample/TimerExample.pde
diff --git a/lib/NewPing-1.9.1/keywords.txt b/lib/lib_div/NewPing-1.9.1/keywords.txt
similarity index 100%
rename from lib/NewPing-1.9.1/keywords.txt
rename to lib/lib_div/NewPing-1.9.1/keywords.txt
diff --git a/lib/NewPing-1.9.1/library.properties b/lib/lib_div/NewPing-1.9.1/library.properties
similarity index 100%
rename from lib/NewPing-1.9.1/library.properties
rename to lib/lib_div/NewPing-1.9.1/library.properties
diff --git a/lib/NewPing-1.9.1/src/NewPing.cpp b/lib/lib_div/NewPing-1.9.1/src/NewPing.cpp
similarity index 100%
rename from lib/NewPing-1.9.1/src/NewPing.cpp
rename to lib/lib_div/NewPing-1.9.1/src/NewPing.cpp
diff --git a/lib/NewPing-1.9.1/src/NewPing.h b/lib/lib_div/NewPing-1.9.1/src/NewPing.h
similarity index 100%
rename from lib/NewPing-1.9.1/src/NewPing.h
rename to lib/lib_div/NewPing-1.9.1/src/NewPing.h
diff --git a/lib/OpenTherm-0.9.0/LICENSE b/lib/lib_div/OpenTherm-0.9.0/LICENSE
similarity index 100%
rename from lib/OpenTherm-0.9.0/LICENSE
rename to lib/lib_div/OpenTherm-0.9.0/LICENSE
diff --git a/lib/OpenTherm-0.9.0/README.md b/lib/lib_div/OpenTherm-0.9.0/README.md
similarity index 100%
rename from lib/OpenTherm-0.9.0/README.md
rename to lib/lib_div/OpenTherm-0.9.0/README.md
diff --git a/lib/OpenTherm-0.9.0/keywords.txt b/lib/lib_div/OpenTherm-0.9.0/keywords.txt
similarity index 100%
rename from lib/OpenTherm-0.9.0/keywords.txt
rename to lib/lib_div/OpenTherm-0.9.0/keywords.txt
diff --git a/lib/OpenTherm-0.9.0/library.properties b/lib/lib_div/OpenTherm-0.9.0/library.properties
similarity index 100%
rename from lib/OpenTherm-0.9.0/library.properties
rename to lib/lib_div/OpenTherm-0.9.0/library.properties
diff --git a/lib/OpenTherm-0.9.0/src/OpenTherm.cpp b/lib/lib_div/OpenTherm-0.9.0/src/OpenTherm.cpp
similarity index 100%
rename from lib/OpenTherm-0.9.0/src/OpenTherm.cpp
rename to lib/lib_div/OpenTherm-0.9.0/src/OpenTherm.cpp
diff --git a/lib/OpenTherm-0.9.0/src/OpenTherm.h b/lib/lib_div/OpenTherm-0.9.0/src/OpenTherm.h
similarity index 100%
rename from lib/OpenTherm-0.9.0/src/OpenTherm.h
rename to lib/lib_div/OpenTherm-0.9.0/src/OpenTherm.h
diff --git a/lib/esp-knx-ip-0.5.2/LICENSE b/lib/lib_div/esp-knx-ip-0.5.2/LICENSE
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/LICENSE
rename to lib/lib_div/esp-knx-ip-0.5.2/LICENSE
diff --git a/lib/esp-knx-ip-0.5.2/README.md b/lib/lib_div/esp-knx-ip-0.5.2/README.md
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/README.md
rename to lib/lib_div/esp-knx-ip-0.5.2/README.md
diff --git a/lib/esp-knx-ip-0.5.2/examples/environment-sensor/environment-sensor.ino b/lib/lib_div/esp-knx-ip-0.5.2/examples/environment-sensor/environment-sensor.ino
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/examples/environment-sensor/environment-sensor.ino
rename to lib/lib_div/esp-knx-ip-0.5.2/examples/environment-sensor/environment-sensor.ino
diff --git a/lib/esp-knx-ip-0.5.2/examples/sonoff/sonoff.ino b/lib/lib_div/esp-knx-ip-0.5.2/examples/sonoff/sonoff.ino
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/examples/sonoff/sonoff.ino
rename to lib/lib_div/esp-knx-ip-0.5.2/examples/sonoff/sonoff.ino
diff --git a/lib/esp-knx-ip-0.5.2/examples/static-config/static-config.ino b/lib/lib_div/esp-knx-ip-0.5.2/examples/static-config/static-config.ino
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/examples/static-config/static-config.ino
rename to lib/lib_div/esp-knx-ip-0.5.2/examples/static-config/static-config.ino
diff --git a/lib/esp-knx-ip-0.5.2/keywords.txt b/lib/lib_div/esp-knx-ip-0.5.2/keywords.txt
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/keywords.txt
rename to lib/lib_div/esp-knx-ip-0.5.2/keywords.txt
diff --git a/lib/lib_div/esp-knx-ip-0.5.2/library.json b/lib/lib_div/esp-knx-ip-0.5.2/library.json
new file mode 100644
index 000000000..0e2b42361
--- /dev/null
+++ b/lib/lib_div/esp-knx-ip-0.5.2/library.json
@@ -0,0 +1,18 @@
+{
+    "name": "ESP KNX IP Library",
+    "keywords": "knx, ethernet, mqtt, m2m, iot",
+    "description": "ESP8266 library for KNX/IP communication.",
+    "authors": [
+        {
+            "name": "Nico Weichbrodt",
+            "maintainer": true
+        }
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/envy/esp-knx-ip.git"
+    },
+    "version": "0.5.2",
+    "frameworks": "arduino",
+    "platforms": ["espressif8266", "espressif32"]
+}
diff --git a/lib/esp-knx-ip-0.5.2/library.properties b/lib/lib_div/esp-knx-ip-0.5.2/library.properties.off
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/library.properties
rename to lib/lib_div/esp-knx-ip-0.5.2/library.properties.off
diff --git a/lib/lib_div/esp-knx-ip-0.5.2/src/DPT.h b/lib/lib_div/esp-knx-ip-0.5.2/src/DPT.h
new file mode 100644
index 000000000..3529d51af
--- /dev/null
+++ b/lib/lib_div/esp-knx-ip-0.5.2/src/DPT.h
@@ -0,0 +1,73 @@
+/**
+ * esp-knx-ip library for KNX/IP communication on an ESP8266
+ * Author: Nico Weichbrodt <envy>
+ * License: MIT
+ */
+
+typedef enum __dpt_1_001
+{
+	DPT_1_001_OFF = 0x00,
+	DPT_1_001_ON  = 0x01,
+} dpt_1_001_t;
+
+typedef enum __dpt_2_001
+{
+	DPT_2_001_NO_OFF  = 0b00,
+	DPT_2_001_NO_ON   = 0b01,
+	DPT_2_001_YES_OFF = 0b10,
+	DPT_2_001_YES_ON  = 0b11,
+} dpt_2_001_t;
+
+typedef enum __dpt_3_007
+{
+	DPT_3_007_DECREASE_STOP = 0x00,
+	DPT_3_007_DECREASE_100  = 0x01,
+	DPT_3_007_DECREASE_50   = 0x02,
+	DPT_3_007_DECREASE_25   = 0x03,
+	DPT_3_007_DECREASE_12   = 0x04,
+	DPT_3_007_DECREASE_6    = 0x05,
+	DPT_3_007_DECREASE_3    = 0x06,
+	DPT_3_007_DECREASE_1    = 0x07,
+	DPT_3_007_INCREASE_STOP = 0x08,
+	DPT_3_007_INCREASE_100  = 0x09,
+	DPT_3_007_INCREASE_50   = 0x0A,
+	DPT_3_007_INCREASE_25   = 0x0B,
+	DPT_3_007_INCREASE_12   = 0x0C,
+	DPT_3_007_INCREASE_6    = 0x0D,
+	DPT_3_007_INCREASE_3    = 0x0E,
+	DPT_3_007_INCREASE_1    = 0x0F,
+} dpt_3_007_t;
+
+typedef enum __weekday
+{
+	DPT_10_001_WEEKDAY_NODAY = 0,
+	DPT_10_001_WEEKDAY_MONDAY = 1,
+	DPT_10_001_WEEKDAY_TUESDAY = 2,
+	DPT_10_001_WEEKDAY_WEDNESDAY = 3,
+	DPT_10_001_WEEKDAY_THURSDAY = 4,
+	DPT_10_001_WEEKDAY_FRIDAY = 5,
+	DPT_10_001_WEEKDAY_SATURDAY = 6,
+	DPT_10_001_WEEKDAY_SUNDAY = 7,
+} weekday_t;
+
+typedef struct __time_of_day
+{
+	weekday_t weekday;
+	uint8_t hours;
+	uint8_t minutes;
+	uint8_t seconds;
+} time_of_day_t;
+
+typedef struct __date
+{
+	uint8_t day;
+	uint8_t month;
+	uint8_t year;
+} date_t;
+
+typedef struct __color
+{
+	uint8_t red;
+	uint8_t green;
+	uint8_t blue;
+} color_t;
diff --git a/lib/esp-knx-ip-0.5.2/esp-knx-ip-config.cpp b/lib/lib_div/esp-knx-ip-0.5.2/src/esp-knx-ip-config.cpp
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/esp-knx-ip-config.cpp
rename to lib/lib_div/esp-knx-ip-0.5.2/src/esp-knx-ip-config.cpp
diff --git a/lib/esp-knx-ip-0.5.2/esp-knx-ip-conversion.cpp b/lib/lib_div/esp-knx-ip-0.5.2/src/esp-knx-ip-conversion.cpp
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/esp-knx-ip-conversion.cpp
rename to lib/lib_div/esp-knx-ip-0.5.2/src/esp-knx-ip-conversion.cpp
diff --git a/lib/esp-knx-ip-0.5.2/esp-knx-ip-send.cpp b/lib/lib_div/esp-knx-ip-0.5.2/src/esp-knx-ip-send.cpp
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/esp-knx-ip-send.cpp
rename to lib/lib_div/esp-knx-ip-0.5.2/src/esp-knx-ip-send.cpp
diff --git a/lib/esp-knx-ip-0.5.2/esp-knx-ip-webserver.cpp b/lib/lib_div/esp-knx-ip-0.5.2/src/esp-knx-ip-webserver.cpp
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/esp-knx-ip-webserver.cpp
rename to lib/lib_div/esp-knx-ip-0.5.2/src/esp-knx-ip-webserver.cpp
diff --git a/lib/esp-knx-ip-0.5.2/esp-knx-ip.cpp b/lib/lib_div/esp-knx-ip-0.5.2/src/esp-knx-ip.cpp
similarity index 100%
rename from lib/esp-knx-ip-0.5.2/esp-knx-ip.cpp
rename to lib/lib_div/esp-knx-ip-0.5.2/src/esp-knx-ip.cpp
diff --git a/lib/lib_div/esp-knx-ip-0.5.2/src/esp-knx-ip.h b/lib/lib_div/esp-knx-ip-0.5.2/src/esp-knx-ip.h
new file mode 100644
index 000000000..6834a6125
--- /dev/null
+++ b/lib/lib_div/esp-knx-ip-0.5.2/src/esp-knx-ip.h
@@ -0,0 +1,600 @@
+/**
+ * esp-knx-ip library for KNX/IP communication on an ESP8266
+ * Author: Nico Weichbrodt <envy>
+ * License: MIT
+ */
+
+#ifndef ESP_KNX_IP_H
+#define ESP_KNX_IP_H
+
+/**
+ * CONFIG
+ * All MAX_ values must not exceed 255 (1 byte, except MAC_CONFIG_SPACE which can go up to 2 bytes, so 0xffff in theory) and must not be negative!
+ * Config space is restriced by EEPROM_SIZE (default 1024).
+ * Required EEPROM size is 8 + MAX_GA_CALLBACKS * 3 + 2 + MAX_CONFIG_SPACE which is 552 by default
+ */
+#define EEPROM_SIZE               1024 // [Default 1024]
+#define MAX_CALLBACK_ASSIGNMENTS  10 // [Default 10] Maximum number of group address callbacks that can be stored
+#define MAX_CALLBACKS             10 // [Default 10] Maximum number of callbacks that can be stored
+#define MAX_CONFIGS               20 // [Default 20] Maximum number of config items that can be stored
+#define MAX_CONFIG_SPACE          0x0200 // [Default 0x0200] Maximum number of bytes that can be stored for custom config
+
+#define MAX_FEEDBACKS             20 // [Default 20] Maximum number of feedbacks that can be shown
+
+// Callbacks
+#define ALLOW_MULTIPLE_CALLBACKS_PER_ADDRESS  1 // [Default 0] Set to 1 to always test all assigned callbacks. This allows for multiple callbacks being assigned to the same address. If disabled, only the first assigned will be called.
+
+// Webserver related
+#define USE_BOOTSTRAP             0 // [Default 1] Set to 1 to enable use of bootstrap CSS for nicer webconfig. CSS is loaded from bootstrapcdn.com. Set to 0 to disable
+#define ROOT_PREFIX               "/knx"  // [Default ""] This gets prepended to all webserver paths, default is empty string "". Set this to "/knx" if you want the config to be available on http://<ip>/knx
+#define DISABLE_EEPROM_BUTTONS    1 // [Default 0] Set to 1 to disable the EEPROM buttons in the web ui.
+#define DISABLE_REBOOT_BUTTON     1 // [Default 0] Set to 1 to disable the reboot button in the web ui.
+#define DISABLE_RESTORE_BUTTON    1 // [Default 0] Set to 1 to disable the "restore defaults" button in the web ui.
+
+// These values normally don't need adjustment
+#ifndef MULTICAST_IP
+#define MULTICAST_IP              IPAddress(224, 0, 23, 12) // [Default IPAddress(224, 0, 23, 12)]
+#else
+#warning USING CUSTOM MULTICAST_IP
+#endif
+
+#ifndef MULTICAST_PORT
+#define MULTICAST_PORT            3671 // [Default 3671]
+#else
+#warning USING CUSTOM MULTICAST_PORT
+#endif
+
+#define SEND_CHECKSUM             0
+
+// Uncomment to enable printing out debug messages.
+//#define ESP_KNX_DEBUG
+/**
+ * END CONFIG
+ */
+
+#include "Arduino.h"
+#include <EEPROM.h>
+#include <ESP8266WiFi.h>
+#include <WiFiUdp.h>
+#include <ESP8266WebServer.h>
+
+#include "DPT.h"
+
+#define EEPROM_MAGIC (0xDEADBEEF00000000 + (MAX_CONFIG_SPACE) + (MAX_CALLBACK_ASSIGNMENTS << 16) + (MAX_CALLBACKS << 8))
+
+// Define where debug output will be printed.
+#ifndef DEBUG_PRINTER
+#define DEBUG_PRINTER Serial
+#endif
+
+// Setup debug printing macros.
+#ifdef ESP_KNX_DEBUG
+  #define DEBUG_PRINT(...) { DEBUG_PRINTER.print(__VA_ARGS__); }
+  #define DEBUG_PRINTLN(...) { DEBUG_PRINTER.println(__VA_ARGS__); }
+#else
+  #define DEBUG_PRINT(...) {}
+  #define DEBUG_PRINTLN(...) {}
+#endif
+
+#define __ROOT_PATH       ROOT_PREFIX"/"
+#define __REGISTER_PATH   ROOT_PREFIX"/register"
+#define __DELETE_PATH     ROOT_PREFIX"/delete"
+#define __PHYS_PATH       ROOT_PREFIX"/phys"
+#define __EEPROM_PATH     ROOT_PREFIX"/eeprom"
+#define __CONFIG_PATH     ROOT_PREFIX"/config"
+#define __FEEDBACK_PATH   ROOT_PREFIX"/feedback"
+#define __RESTORE_PATH    ROOT_PREFIX"/restore"
+#define __REBOOT_PATH     ROOT_PREFIX"/reboot"
+
+/**
+ * Different service types, we are mainly interested in KNX_ST_ROUTING_INDICATION
+ */
+typedef enum __knx_service_type
+{
+  KNX_ST_SEARCH_REQUEST           = 0x0201,
+  KNX_ST_SEARCH_RESPONSE          = 0x0202,
+  KNX_ST_DESCRIPTION_REQUEST      = 0x0203,
+  KNX_ST_DESCRIPTION_RESPONSE     = 0x0204,
+  KNX_ST_CONNECT_REQUEST          = 0x0205,
+  KNX_ST_CONNECT_RESPONSE         = 0x0206,
+  KNX_ST_CONNECTIONSTATE_REQUEST  = 0x0207,
+  KNX_ST_CONNECTIONSTATE_RESPONSE = 0x0208,
+  KNX_ST_DISCONNECT_REQUEST       = 0x0209,
+  KNX_ST_DISCONNECT_RESPONSE      = 0x020A,
+
+  KNX_ST_DEVICE_CONFIGURATION_REQUEST = 0x0310,
+  KNX_ST_DEVICE_CONFIGURATION_ACK     = 0x0311,
+
+  KNX_ST_TUNNELING_REQUEST = 0x0420,
+  KNX_ST_TUNNELING_ACK     = 0x0421,
+
+  KNX_ST_ROUTING_INDICATION   = 0x0530,
+  KNX_ST_ROUTING_LOST_MESSAGE = 0x0531,
+  KNX_ST_ROUTING_BUSY         = 0x0532,
+
+//  KNX_ST_RLOG_START = 0x0600,
+//  KNX_ST_RLOG_END   = 0x06FF,
+
+  KNX_ST_REMOTE_DIAGNOSTIC_REQUEST          = 0x0740,
+  KNX_ST_REMOTE_DIAGNOSTIC_RESPONSE         = 0x0741,
+  KNX_ST_REMOTE_BASIC_CONFIGURATION_REQUEST = 0x0742,
+  KNX_ST_REMOTE_RESET_REQUEST               = 0x0743,
+
+//  KNX_ST_OBJSRV_START = 0x0800,
+//  KNX_ST_OBJSRV_END   = 0x08FF,
+} knx_service_type_t;
+
+/**
+ * Differnt command types, first three are of main interest
+ */
+typedef enum __knx_command_type
+{
+  KNX_CT_READ                     = 0x00,
+  KNX_CT_ANSWER                   = 0x01,
+  KNX_CT_WRITE                    = 0x02,
+  KNX_CT_INDIVIDUAL_ADDR_WRITE    = 0x03,
+  KNX_CT_INDIVIDUAL_ADDR_REQUEST  = 0x04,
+  KNX_CT_INDIVIDUAL_ADDR_RESPONSE = 0x05,
+  KNX_CT_ADC_READ                 = 0x06,
+  KNX_CT_ADC_ANSWER               = 0x07,
+  KNX_CT_MEM_READ                 = 0x08,
+  KNX_CT_MEM_ANSWER               = 0x09,
+  KNX_CT_MEM_WRITE                = 0x0A,
+//KNX_CT_UNKNOWN                  = 0x0B,
+  KNX_CT_MASK_VERSION_READ        = 0x0C,
+  KNX_CT_MASK_VERSION_RESPONSE    = 0x0D,
+  KNX_CT_RESTART                  = 0x0E,
+  KNX_CT_ESCAPE                   = 0x0F,
+} knx_command_type_t;
+
+/**
+ * cEMI message types, mainly KNX_MT_L_DATA_IND is interesting
+ */
+typedef enum __knx_cemi_msg_type
+{
+  KNX_MT_L_DATA_REQ = 0x11,
+  KNX_MT_L_DATA_IND = 0x29,
+  KNX_MT_L_DATA_CON = 0x2E,
+} knx_cemi_msg_type_t;
+
+/**
+ * TCPI communication type
+ */
+typedef enum __knx_communication_type {
+  KNX_COT_UDP = 0x00, // Unnumbered Data Packet
+  KNX_COT_NDP = 0x01, // Numbered Data Packet
+  KNX_COT_UCD = 0x02, // Unnumbered Control Data
+  KNX_COT_NCD = 0x03, // Numbered Control Data
+} knx_communication_type_t;
+
+/**
+ * acpi for KNX_COT_NCD
+ */
+typedef enum __knx_cot_ncd_ack_type {
+  KNX_COT_NCD_ACK = 0x10, // Inform positively reception of the Previouly received telegram
+  KNX_COT_NCD_NACK = 0x11, // Inform negatively reception of the Previouly received telegram
+} knx_cot_ncd_ack_type_t;
+
+/**
+ * KNX/IP header
+ */
+typedef struct __knx_ip_pkt
+{
+  uint8_t header_len; // Should always be 0x06
+  uint8_t protocol_version; // Should be version 1.0, transmitted as 0x10
+  uint16_t service_type; // See knx_service_type_t
+  union
+  {
+    struct {
+      uint8_t first_byte;
+      uint8_t second_byte;
+    } bytes;
+    uint16_t len;
+  } total_len; // header_len + rest of pkt. This is a bit weird as the spec says this:  If the total number of bytes transmitted is greater than 252 bytes, the first “Total Length” byte is set to FF (255). Only in this case the second byte includes additional length information
+  uint8_t pkt_data[]; // This is of type cemi_msg_t
+} knx_ip_pkt_t;
+
+typedef struct __cemi_addi
+{
+  uint8_t type_id;
+  uint8_t len;
+  uint8_t data[];
+} cemi_addi_t;
+
+typedef union __address
+{
+  uint16_t value;
+  struct
+  {
+    uint8_t high;
+    uint8_t low;
+  } bytes;
+  struct __attribute__((packed))
+  {
+    uint8_t line:3;
+    uint8_t area:5;
+    uint8_t member;
+  } ga;
+  struct __attribute__((packed))
+  {
+    uint8_t line:4;
+    uint8_t area:4;
+    uint8_t member;
+  } pa;
+  uint8_t array[2];
+} address_t;
+
+typedef struct __cemi_service
+{
+  union
+  {
+    struct
+    {
+      // Struct is reversed due to bit order
+      uint8_t confirm:1; // 0 = no error, 1 = error
+      uint8_t ack:1; // 0 = no ack, 1 = ack
+      uint8_t priority:2; // 0 = system, 1 = high, 2 = urgent/alarm, 3 = normal
+      uint8_t system_broadcast:1; // 0 = system broadcast, 1 = broadcast
+      uint8_t repeat:1; // 0 = repeated telegram, 1 = not repeated telegram
+      uint8_t reserved:1; // always zero
+      uint8_t frame_type:1; // 0 = extended, 1 = standard
+    } bits;
+    uint8_t byte;
+  } control_1;
+  union
+  {
+    struct
+    {
+      // Struct is reversed due to bit order
+      uint8_t extended_frame_format:4;
+      uint8_t hop_count:3;
+      uint8_t dest_addr_type:1; // 0 = individual, 1 = group
+    } bits;
+    uint8_t byte;
+  } control_2;
+  address_t source;
+  address_t destination;
+  uint8_t data_len; // length of data, excluding the tpci byte
+  struct
+  {
+    uint8_t apci:2; // If tpci.comm_type == KNX_COT_UCD or KNX_COT_NCD, then this is apparently control data?
+    uint8_t tpci_seq_number:4;
+    uint8_t tpci_comm_type:2; // See knx_communication_type_t
+  } pci;
+  uint8_t data[];
+} cemi_service_t;
+
+typedef struct __cemi_msg
+{
+  uint8_t message_code;
+  uint8_t additional_info_len;
+  union
+  {
+//    cemi_addi_t additional_info[];   // Errors in GCC 10.1
+    cemi_addi_t additional_info[10];   // Changed to arbitrary number to fix compilation
+    cemi_service_t service_information;
+  } data;
+} cemi_msg_t;
+
+typedef enum __config_type
+{
+  CONFIG_TYPE_UNKNOWN,
+  CONFIG_TYPE_INT,
+  CONFIG_TYPE_BOOL,
+  CONFIG_TYPE_STRING,
+  CONFIG_TYPE_OPTIONS,
+  CONFIG_TYPE_GA,
+} config_type_t;
+
+typedef enum __feedback_type
+{
+  FEEDBACK_TYPE_UNKNOWN,
+  FEEDBACK_TYPE_INT,
+  FEEDBACK_TYPE_FLOAT,
+  FEEDBACK_TYPE_BOOL,
+  FEEDBACK_TYPE_ACTION,
+} feedback_type_t;
+
+typedef enum __config_flags
+{
+  CONFIG_FLAGS_NO_FLAGS = 0,
+  CONFIG_FLAGS_VALUE_SET = 1,
+} config_flags_t;
+
+typedef enum __slot_flags
+{
+  SLOT_FLAGS_EMPTY = 0, // Empty slots have no flags
+  SLOT_FLAGS_USED = 1,
+} slot_flags_t;
+
+typedef struct __message
+{
+  knx_command_type_t ct;
+  address_t received_on;
+  uint8_t data_len;
+  uint8_t *data;
+} message_t;
+
+typedef bool (*enable_condition_t)(void);
+typedef void (*callback_fptr_t)(message_t const &msg, void *arg);
+typedef void (*feedback_action_fptr_t)(void *arg);
+
+typedef uint8_t callback_id_t;
+#define CALLBACK_ID_MAX UINT8_MAX
+typedef uint8_t callback_assignment_id_t;
+#define CALLBACK_ASSIGNMENT_ID_MAX UINT8_MAX
+typedef uint8_t config_id_t;
+typedef uint8_t feedback_id_t;
+
+typedef struct __option_entry
+{
+  char const *name;
+  uint8_t value;
+} option_entry_t;
+
+typedef struct __config
+{
+  config_type_t type;
+  String name;
+  uint8_t offset;
+  uint8_t len;
+  enable_condition_t cond;
+  union {
+    option_entry_t *options;
+  } data;
+} config_t;
+
+extern char const *string_defaults[];
+#define STRING_DEFAULT_DO_THIS (string_defaults[0])
+#define STRING_DEFAULT_TRUE (string_defaults[1])
+#define STRING_DEFAULT_FALSE (string_defaults[2])
+#define STRING_DEFAULT_EMPTY (string_defaults[3])
+
+typedef struct __feedback_float_options
+{
+  uint8_t precision;
+  char const *prefix;
+  char const *suffix;
+} feedback_float_options_t;
+
+typedef struct __feedback_bool_options
+{
+  char const *true_text;
+  char const *false_text;
+} feedback_bool_options_t;
+
+typedef struct __feedback_action_options
+{
+  void *arg;
+  char const *btn_text;
+} feedback_action_options_t;
+
+typedef struct __feedback
+{
+  feedback_type_t type;
+  String name;
+  enable_condition_t cond;
+  void *data;
+  union {
+    feedback_bool_options_t bool_options;
+    feedback_float_options_t float_options;
+    feedback_action_options_t action_options;
+  } options;
+} feedback_t;
+
+typedef struct __callback
+{
+  uint8_t slot_flags;
+  callback_fptr_t fkt;
+  enable_condition_t cond;
+  void *arg;
+  String name;
+} callback_t;
+
+typedef struct __callback_assignment
+{
+  uint8_t slot_flags;
+  address_t address;
+  callback_id_t callback_id;
+} callback_assignment_t;
+
+// FastPrecisePowf from tasmota/support_float.ino
+//extern float FastPrecisePowf(const float x, const float y);
+
+class ESPKNXIP {
+  public:
+    ESPKNXIP();
+    void load();
+    void start();
+    void start(ESP8266WebServer *srv);
+    void loop();
+
+    void save_to_eeprom();
+    void restore_from_eeprom();
+
+    callback_id_t            callback_register(String name, callback_fptr_t cb, void *arg = nullptr, enable_condition_t cond = nullptr);
+    callback_assignment_id_t callback_assign(callback_id_t id, address_t val);
+    void                     callback_deregister(callback_id_t id);
+    void                     callback_unassign(callback_assignment_id_t id);
+
+    void                     physical_address_set(address_t const &addr);
+    address_t                physical_address_get();
+
+    // Configuration functions
+    config_id_t              config_register_string(String name, uint8_t len, String _default, enable_condition_t cond = nullptr);
+    config_id_t              config_register_int(String name, int32_t _default, enable_condition_t cond = nullptr);
+    config_id_t              config_register_bool(String name, bool _default, enable_condition_t cond = nullptr);
+    config_id_t              config_register_options(String name, option_entry_t *options, uint8_t _default, enable_condition_t cond = nullptr);
+    config_id_t              config_register_ga(String name, enable_condition_t cond = nullptr);
+
+    String                   config_get_string(config_id_t id);
+    int32_t                  config_get_int(config_id_t id);
+    bool                     config_get_bool(config_id_t id);
+    uint8_t                  config_get_options(config_id_t id);
+    address_t                config_get_ga(config_id_t id);
+
+    void                     config_set_string(config_id_t id, String val);
+    void                     config_set_int(config_id_t id, int32_t val);
+    void                     config_set_bool(config_id_t, bool val);
+    void                     config_set_options(config_id_t id, uint8_t val);
+    void                     config_set_ga(config_id_t id, address_t const &val);
+
+    // Feedback functions
+    feedback_id_t            feedback_register_int(String name, int32_t *value, enable_condition_t cond = nullptr);
+    feedback_id_t            feedback_register_float(String name, float *value, uint8_t precision = 2, char const *prefix = nullptr, char const *suffix = nullptr, enable_condition_t cond = nullptr);
+    feedback_id_t            feedback_register_bool(String name, bool *value, char const *true_text = nullptr, char const *false_text = nullptr, enable_condition_t cond = nullptr);
+    feedback_id_t            feedback_register_action(String name, feedback_action_fptr_t value, char const *btn_text = nullptr, void *arg = nullptr, enable_condition_t = nullptr);
+
+    // Send functions
+    void send(address_t const &receiver, knx_command_type_t ct, uint8_t data_len, uint8_t *data);
+
+    void send_1bit(address_t const &receiver, knx_command_type_t ct, uint8_t bit);
+    void send_2bit(address_t const &receiver, knx_command_type_t ct, uint8_t twobit);
+    void send_4bit(address_t const &receiver, knx_command_type_t ct, uint8_t fourbit);
+    void send_1byte_int(address_t const &receiver, knx_command_type_t ct, int8_t val);
+    void send_1byte_uint(address_t const &receiver, knx_command_type_t ct, uint8_t val);
+    void send_2byte_int(address_t const &receiver, knx_command_type_t ct, int16_t val);
+    void send_2byte_uint(address_t const &receiver, knx_command_type_t ct, uint16_t val);
+    void send_2byte_float(address_t const &receiver, knx_command_type_t ct, float val);
+    void send_3byte_time(address_t const &receiver, knx_command_type_t ct, uint8_t weekday, uint8_t hours, uint8_t minutes, uint8_t seconds);
+    void send_3byte_time(address_t const &receiver, knx_command_type_t ct, time_of_day_t const &time) { send_3byte_time(receiver, ct, time.weekday, time.hours, time.minutes, time.seconds); }
+    void send_3byte_date(address_t const &receiver, knx_command_type_t ct, uint8_t day, uint8_t month, uint8_t year);
+    void send_3byte_date(address_t const &receiver, knx_command_type_t ct, date_t const &date) { send_3byte_date(receiver, ct, date.day, date.month, date.year); }
+    void send_3byte_color(address_t const &receiver, knx_command_type_t ct, uint8_t red, uint8_t green, uint8_t blue);
+    void send_3byte_color(address_t const &receiver, knx_command_type_t ct, color_t const &color) { send_3byte_color(receiver, ct, color.red, color.green, color.blue); }
+    void send_4byte_int(address_t const &receiver, knx_command_type_t ct, int32_t val);
+    void send_4byte_uint(address_t const &receiver, knx_command_type_t ct, uint32_t val);
+    void send_4byte_float(address_t const &receiver, knx_command_type_t ct, float val);
+    void send_14byte_string(address_t const &receiver, knx_command_type_t ct, const char *val);
+
+    void write_1bit(address_t const &receiver, uint8_t bit) { send_1bit(receiver, KNX_CT_WRITE, bit); }
+    void write_2bit(address_t const &receiver, uint8_t twobit) { send_2bit(receiver, KNX_CT_WRITE, twobit); }
+    void write_4bit(address_t const &receiver, uint8_t fourbit) { send_4bit(receiver, KNX_CT_WRITE, fourbit); }
+    void write_1byte_int(address_t const &receiver, int8_t val) { send_1byte_int(receiver, KNX_CT_WRITE, val); }
+    void write_1byte_uint(address_t const &receiver, uint8_t val) { send_1byte_uint(receiver, KNX_CT_WRITE, val); }
+    void write_2byte_int(address_t const &receiver, int16_t val) { send_2byte_int(receiver, KNX_CT_WRITE, val); }
+    void write_2byte_uint(address_t const &receiver, uint16_t val) { send_2byte_uint(receiver, KNX_CT_WRITE, val); }
+    void write_2byte_float(address_t const &receiver, float val) { send_2byte_float(receiver, KNX_CT_WRITE, val); }
+    void write_3byte_time(address_t const &receiver, uint8_t weekday, uint8_t hours, uint8_t minutes, uint8_t seconds) { send_3byte_time(receiver, KNX_CT_WRITE, weekday, hours, minutes, seconds); }
+    void write_3byte_time(address_t const &receiver, time_of_day_t const &time) { send_3byte_time(receiver, KNX_CT_WRITE, time.weekday, time.hours, time.minutes, time.seconds); }
+    void write_3byte_date(address_t const &receiver, uint8_t day, uint8_t month, uint8_t year) { send_3byte_date(receiver, KNX_CT_WRITE, day, month, year); }
+    void write_3byte_date(address_t const &receiver, date_t const &date) { send_3byte_date(receiver, KNX_CT_WRITE, date.day, date.month, date.year); }
+    void write_3byte_color(address_t const &receiver, uint8_t red, uint8_t green, uint8_t blue) { send_3byte_color(receiver, KNX_CT_WRITE, red, green, blue); }
+    void write_3byte_color(address_t const &receiver, color_t const &color) { send_3byte_color(receiver, KNX_CT_WRITE, color); }
+    void write_4byte_int(address_t const &receiver, int32_t val) { send_4byte_int(receiver, KNX_CT_WRITE, val); }
+    void write_4byte_uint(address_t const &receiver, uint32_t val) { send_4byte_uint(receiver, KNX_CT_WRITE, val); }
+    void write_4byte_float(address_t const &receiver, float val) { send_4byte_float(receiver, KNX_CT_WRITE, val);}
+    void write_14byte_string(address_t const &receiver, const char *val) { send_14byte_string(receiver, KNX_CT_WRITE, val); }
+
+    void answer_1bit(address_t const &receiver, uint8_t bit) { send_1bit(receiver, KNX_CT_ANSWER, bit); }
+    void answer_2bit(address_t const &receiver, uint8_t twobit) { send_2bit(receiver, KNX_CT_ANSWER, twobit); }
+    void answer_4bit(address_t const &receiver, uint8_t fourbit) { send_4bit(receiver, KNX_CT_ANSWER, fourbit); }
+    void answer_1byte_int(address_t const &receiver, int8_t val) { send_1byte_int(receiver, KNX_CT_ANSWER, val); }
+    void answer_1byte_uint(address_t const &receiver, uint8_t val) { send_1byte_uint(receiver, KNX_CT_ANSWER, val); }
+    void answer_2byte_int(address_t const &receiver, int16_t val) { send_2byte_int(receiver, KNX_CT_ANSWER, val); }
+    void answer_2byte_uint(address_t const &receiver, uint16_t val) { send_2byte_uint(receiver, KNX_CT_ANSWER, val); }
+    void answer_2byte_float(address_t const &receiver, float val) { send_2byte_float(receiver, KNX_CT_ANSWER, val); }
+    void answer_3byte_time(address_t const &receiver, uint8_t weekday, uint8_t hours, uint8_t minutes, uint8_t seconds) { send_3byte_time(receiver, KNX_CT_ANSWER, weekday, hours, minutes, seconds); }
+    void answer_3byte_time(address_t const &receiver, time_of_day_t const &time) { send_3byte_time(receiver, KNX_CT_ANSWER, time.weekday, time.hours, time.minutes, time.seconds); }
+    void answer_3byte_date(address_t const &receiver, uint8_t day, uint8_t month, uint8_t year) { send_3byte_date(receiver, KNX_CT_ANSWER, day, month, year); }
+    void answer_3byte_date(address_t const &receiver, date_t const &date) { send_3byte_date(receiver, KNX_CT_ANSWER, date.day, date.month, date.year); }
+    void answer_3byte_color(address_t const &receiver, uint8_t red, uint8_t green, uint8_t blue) { send_3byte_color(receiver, KNX_CT_ANSWER, red, green, blue); }
+    void answer_3byte_color(address_t const &receiver, color_t const &color) { send_3byte_color(receiver, KNX_CT_ANSWER, color); }
+    void answer_4byte_int(address_t const &receiver, int32_t val) { send_4byte_int(receiver, KNX_CT_ANSWER, val); }
+    void answer_4byte_uint(address_t const &receiver, uint32_t val) { send_4byte_uint(receiver, KNX_CT_ANSWER, val); }
+    void answer_4byte_float(address_t const &receiver, float val) { send_4byte_float(receiver, KNX_CT_ANSWER, val);}
+    void answer_14byte_string(address_t const &receiver, const char *val) { send_14byte_string(receiver, KNX_CT_ANSWER, val); }
+
+    bool          data_to_bool(uint8_t *data);
+    int8_t        data_to_1byte_int(uint8_t *data);
+    uint8_t       data_to_1byte_uint(uint8_t *data);
+    int16_t       data_to_2byte_int(uint8_t *data);
+    uint16_t      data_to_2byte_uint(uint8_t *data);
+    float         data_to_2byte_float(uint8_t *data);
+    color_t       data_to_3byte_color(uint8_t *data);
+    time_of_day_t data_to_3byte_time(uint8_t *data);
+    date_t        data_to_3byte_data(uint8_t *data);
+    int32_t       data_to_4byte_int(uint8_t *data);
+    uint32_t      data_to_4byte_uint(uint8_t *data);
+    float         data_to_4byte_float(uint8_t *data);
+
+    static address_t GA_to_address(uint8_t area, uint8_t line, uint8_t member)
+    {
+      // Yes, the order is correct, see the struct definition above
+      address_t tmp = {.ga={line, area, member}};
+      return tmp;
+    }
+
+    static address_t PA_to_address(uint8_t area, uint8_t line, uint8_t member)
+    {
+      // Yes, the order is correct, see the struct definition above
+      address_t tmp = {.pa={line, area, member}};
+      return tmp;
+    }
+
+  private:
+    void __start();
+
+    void __loop_knx();
+
+    // Webserver functions
+    void __loop_webserver();
+    void __handle_root();
+    void __handle_register();
+    void __handle_delete();
+    void __handle_set();
+#if !DISABLE_EEPROM_BUTTONS
+    void __handle_eeprom();
+#endif
+    void __handle_config();
+    void __handle_feedback();
+#if !DISABLE_RESTORE_BUTTONS
+    void __handle_restore();
+#endif
+#if !DISABLE_REBOOT_BUTTONS
+    void __handle_reboot();
+#endif
+
+    void __config_set_flags(config_id_t id, config_flags_t flags);
+
+    void __config_set_string(config_id_t id, String &val);
+    void __config_set_int(config_id_t id, int32_t val);
+    void __config_set_bool(config_id_t id, bool val);
+    void __config_set_options(config_id_t id, uint8_t val);
+    void __config_set_ga(config_id_t id, address_t const &val);
+
+    bool __callback_is_id_valid(callback_id_t id);
+
+    callback_assignment_id_t __callback_register_assignment(address_t address, callback_id_t id);
+    void __callback_delete_assignment(callback_assignment_id_t id);
+
+    //static inline float pow(float a, float b) { return FastPrecisePowf(a, b); }
+
+    ESP8266WebServer *server;
+    address_t physaddr;
+
+    WiFiUDP udp;
+
+    callback_assignment_id_t registered_callback_assignments;
+    callback_assignment_id_t free_callback_assignment_slots;
+    callback_assignment_t callback_assignments[MAX_CALLBACK_ASSIGNMENTS];
+
+    callback_id_t registered_callbacks;
+    callback_id_t free_callback_slots;
+    callback_t callbacks[MAX_CALLBACKS];
+
+    config_id_t registered_configs;
+    uint8_t custom_config_data[MAX_CONFIG_SPACE];
+    uint8_t custom_config_default_data[MAX_CONFIG_SPACE];
+    config_t custom_configs[MAX_CONFIGS];
+
+    feedback_id_t registered_feedbacks;
+    feedback_t feedbacks[MAX_FEEDBACKS];
+
+    uint16_t __ntohs(uint16_t);
+};
+
+// Global "singleton" object
+extern ESPKNXIP knx;
+
+#endif
diff --git a/lib/Adafruit_BusIO/.travis.yml b/lib/lib_i2c/Adafruit_BusIO/.travis.yml
similarity index 100%
rename from lib/Adafruit_BusIO/.travis.yml
rename to lib/lib_i2c/Adafruit_BusIO/.travis.yml
diff --git a/lib/Adafruit_BusIO/Adafruit_BusIO_Register.cpp b/lib/lib_i2c/Adafruit_BusIO/Adafruit_BusIO_Register.cpp
similarity index 100%
rename from lib/Adafruit_BusIO/Adafruit_BusIO_Register.cpp
rename to lib/lib_i2c/Adafruit_BusIO/Adafruit_BusIO_Register.cpp
diff --git a/lib/Adafruit_BusIO/Adafruit_BusIO_Register.h b/lib/lib_i2c/Adafruit_BusIO/Adafruit_BusIO_Register.h
similarity index 100%
rename from lib/Adafruit_BusIO/Adafruit_BusIO_Register.h
rename to lib/lib_i2c/Adafruit_BusIO/Adafruit_BusIO_Register.h
diff --git a/lib/Adafruit_BusIO/Adafruit_I2CDevice.cpp b/lib/lib_i2c/Adafruit_BusIO/Adafruit_I2CDevice.cpp
similarity index 100%
rename from lib/Adafruit_BusIO/Adafruit_I2CDevice.cpp
rename to lib/lib_i2c/Adafruit_BusIO/Adafruit_I2CDevice.cpp
diff --git a/lib/Adafruit_BusIO/Adafruit_I2CDevice.h b/lib/lib_i2c/Adafruit_BusIO/Adafruit_I2CDevice.h
similarity index 100%
rename from lib/Adafruit_BusIO/Adafruit_I2CDevice.h
rename to lib/lib_i2c/Adafruit_BusIO/Adafruit_I2CDevice.h
diff --git a/lib/Adafruit_BusIO/Adafruit_I2CRegister.h b/lib/lib_i2c/Adafruit_BusIO/Adafruit_I2CRegister.h
similarity index 100%
rename from lib/Adafruit_BusIO/Adafruit_I2CRegister.h
rename to lib/lib_i2c/Adafruit_BusIO/Adafruit_I2CRegister.h
diff --git a/lib/Adafruit_BusIO/Adafruit_SPIDevice.cpp b/lib/lib_i2c/Adafruit_BusIO/Adafruit_SPIDevice.cpp
similarity index 100%
rename from lib/Adafruit_BusIO/Adafruit_SPIDevice.cpp
rename to lib/lib_i2c/Adafruit_BusIO/Adafruit_SPIDevice.cpp
diff --git a/lib/Adafruit_BusIO/Adafruit_SPIDevice.h b/lib/lib_i2c/Adafruit_BusIO/Adafruit_SPIDevice.h
similarity index 100%
rename from lib/Adafruit_BusIO/Adafruit_SPIDevice.h
rename to lib/lib_i2c/Adafruit_BusIO/Adafruit_SPIDevice.h
diff --git a/lib/Adafruit_BusIO/LICENSE b/lib/lib_i2c/Adafruit_BusIO/LICENSE
similarity index 100%
rename from lib/Adafruit_BusIO/LICENSE
rename to lib/lib_i2c/Adafruit_BusIO/LICENSE
diff --git a/lib/Adafruit_BusIO/README.md b/lib/lib_i2c/Adafruit_BusIO/README.md
similarity index 100%
rename from lib/Adafruit_BusIO/README.md
rename to lib/lib_i2c/Adafruit_BusIO/README.md
diff --git a/lib/Adafruit_BusIO/examples/i2c_address_detect/i2c_address_detect.ino b/lib/lib_i2c/Adafruit_BusIO/examples/i2c_address_detect/i2c_address_detect.ino
similarity index 100%
rename from lib/Adafruit_BusIO/examples/i2c_address_detect/i2c_address_detect.ino
rename to lib/lib_i2c/Adafruit_BusIO/examples/i2c_address_detect/i2c_address_detect.ino
diff --git a/lib/Adafruit_BusIO/examples/i2c_readwrite/i2c_readwrite.ino b/lib/lib_i2c/Adafruit_BusIO/examples/i2c_readwrite/i2c_readwrite.ino
similarity index 100%
rename from lib/Adafruit_BusIO/examples/i2c_readwrite/i2c_readwrite.ino
rename to lib/lib_i2c/Adafruit_BusIO/examples/i2c_readwrite/i2c_readwrite.ino
diff --git a/lib/Adafruit_BusIO/examples/i2c_registers/i2c_registers.ino b/lib/lib_i2c/Adafruit_BusIO/examples/i2c_registers/i2c_registers.ino
similarity index 100%
rename from lib/Adafruit_BusIO/examples/i2c_registers/i2c_registers.ino
rename to lib/lib_i2c/Adafruit_BusIO/examples/i2c_registers/i2c_registers.ino
diff --git a/lib/Adafruit_BusIO/examples/i2corspi_register/i2corspi_register.ino b/lib/lib_i2c/Adafruit_BusIO/examples/i2corspi_register/i2corspi_register.ino
similarity index 100%
rename from lib/Adafruit_BusIO/examples/i2corspi_register/i2corspi_register.ino
rename to lib/lib_i2c/Adafruit_BusIO/examples/i2corspi_register/i2corspi_register.ino
diff --git a/lib/Adafruit_BusIO/examples/spi_modetest/spi_modetest.ino b/lib/lib_i2c/Adafruit_BusIO/examples/spi_modetest/spi_modetest.ino
similarity index 100%
rename from lib/Adafruit_BusIO/examples/spi_modetest/spi_modetest.ino
rename to lib/lib_i2c/Adafruit_BusIO/examples/spi_modetest/spi_modetest.ino
diff --git a/lib/Adafruit_BusIO/examples/spi_readwrite/spi_readwrite.ino b/lib/lib_i2c/Adafruit_BusIO/examples/spi_readwrite/spi_readwrite.ino
similarity index 100%
rename from lib/Adafruit_BusIO/examples/spi_readwrite/spi_readwrite.ino
rename to lib/lib_i2c/Adafruit_BusIO/examples/spi_readwrite/spi_readwrite.ino
diff --git a/lib/Adafruit_BusIO/examples/spi_registers/spi_registers.ino b/lib/lib_i2c/Adafruit_BusIO/examples/spi_registers/spi_registers.ino
similarity index 100%
rename from lib/Adafruit_BusIO/examples/spi_registers/spi_registers.ino
rename to lib/lib_i2c/Adafruit_BusIO/examples/spi_registers/spi_registers.ino
diff --git a/lib/Adafruit_BusIO/library.properties b/lib/lib_i2c/Adafruit_BusIO/library.properties
similarity index 100%
rename from lib/Adafruit_BusIO/library.properties
rename to lib/lib_i2c/Adafruit_BusIO/library.properties
diff --git a/lib/Adafruit_CCS811-1.0.0.14/.travis.yml b/lib/lib_i2c/Adafruit_CCS811-1.0.0.14/.travis.yml
similarity index 100%
rename from lib/Adafruit_CCS811-1.0.0.14/.travis.yml
rename to lib/lib_i2c/Adafruit_CCS811-1.0.0.14/.travis.yml
diff --git a/lib/Adafruit_CCS811-1.0.0.14/Adafruit_CCS811.cpp b/lib/lib_i2c/Adafruit_CCS811-1.0.0.14/Adafruit_CCS811.cpp
similarity index 100%
rename from lib/Adafruit_CCS811-1.0.0.14/Adafruit_CCS811.cpp
rename to lib/lib_i2c/Adafruit_CCS811-1.0.0.14/Adafruit_CCS811.cpp
diff --git a/lib/Adafruit_CCS811-1.0.0.14/Adafruit_CCS811.h b/lib/lib_i2c/Adafruit_CCS811-1.0.0.14/Adafruit_CCS811.h
similarity index 100%
rename from lib/Adafruit_CCS811-1.0.0.14/Adafruit_CCS811.h
rename to lib/lib_i2c/Adafruit_CCS811-1.0.0.14/Adafruit_CCS811.h
diff --git a/lib/Adafruit_CCS811-1.0.0.14/LICENSE b/lib/lib_i2c/Adafruit_CCS811-1.0.0.14/LICENSE
similarity index 100%
rename from lib/Adafruit_CCS811-1.0.0.14/LICENSE
rename to lib/lib_i2c/Adafruit_CCS811-1.0.0.14/LICENSE
diff --git a/lib/Adafruit_CCS811-1.0.0.14/README.md b/lib/lib_i2c/Adafruit_CCS811-1.0.0.14/README.md
similarity index 100%
rename from lib/Adafruit_CCS811-1.0.0.14/README.md
rename to lib/lib_i2c/Adafruit_CCS811-1.0.0.14/README.md
diff --git a/lib/Adafruit_CCS811-1.0.0.14/examples/CCS811_OLED_Demo/CCS811_OLED_Demo.ino b/lib/lib_i2c/Adafruit_CCS811-1.0.0.14/examples/CCS811_OLED_Demo/CCS811_OLED_Demo.ino
similarity index 100%
rename from lib/Adafruit_CCS811-1.0.0.14/examples/CCS811_OLED_Demo/CCS811_OLED_Demo.ino
rename to lib/lib_i2c/Adafruit_CCS811-1.0.0.14/examples/CCS811_OLED_Demo/CCS811_OLED_Demo.ino
diff --git a/lib/Adafruit_CCS811-1.0.0.14/examples/CCS811_test/CCS811_test.ino b/lib/lib_i2c/Adafruit_CCS811-1.0.0.14/examples/CCS811_test/CCS811_test.ino
similarity index 100%
rename from lib/Adafruit_CCS811-1.0.0.14/examples/CCS811_test/CCS811_test.ino
rename to lib/lib_i2c/Adafruit_CCS811-1.0.0.14/examples/CCS811_test/CCS811_test.ino
diff --git a/lib/Adafruit_CCS811-1.0.0.14/library.properties b/lib/lib_i2c/Adafruit_CCS811-1.0.0.14/library.properties
similarity index 100%
rename from lib/Adafruit_CCS811-1.0.0.14/library.properties
rename to lib/lib_i2c/Adafruit_CCS811-1.0.0.14/library.properties
diff --git a/lib/Adafruit_MAX31865-1.1.0-custom/Adafruit_MAX31865.cpp b/lib/lib_i2c/Adafruit_MAX31865-1.1.0-custom/Adafruit_MAX31865.cpp
similarity index 100%
rename from lib/Adafruit_MAX31865-1.1.0-custom/Adafruit_MAX31865.cpp
rename to lib/lib_i2c/Adafruit_MAX31865-1.1.0-custom/Adafruit_MAX31865.cpp
diff --git a/lib/Adafruit_MAX31865-1.1.0-custom/Adafruit_MAX31865.h b/lib/lib_i2c/Adafruit_MAX31865-1.1.0-custom/Adafruit_MAX31865.h
similarity index 100%
rename from lib/Adafruit_MAX31865-1.1.0-custom/Adafruit_MAX31865.h
rename to lib/lib_i2c/Adafruit_MAX31865-1.1.0-custom/Adafruit_MAX31865.h
diff --git a/lib/Adafruit_MAX31865-1.1.0-custom/README.md b/lib/lib_i2c/Adafruit_MAX31865-1.1.0-custom/README.md
similarity index 100%
rename from lib/Adafruit_MAX31865-1.1.0-custom/README.md
rename to lib/lib_i2c/Adafruit_MAX31865-1.1.0-custom/README.md
diff --git a/lib/Adafruit_MAX31865-1.1.0-custom/README.txt b/lib/lib_i2c/Adafruit_MAX31865-1.1.0-custom/README.txt
similarity index 100%
rename from lib/Adafruit_MAX31865-1.1.0-custom/README.txt
rename to lib/lib_i2c/Adafruit_MAX31865-1.1.0-custom/README.txt
diff --git a/lib/Adafruit_MAX31865-1.1.0-custom/examples/max31865/max31865.ino b/lib/lib_i2c/Adafruit_MAX31865-1.1.0-custom/examples/max31865/max31865.ino
similarity index 100%
rename from lib/Adafruit_MAX31865-1.1.0-custom/examples/max31865/max31865.ino
rename to lib/lib_i2c/Adafruit_MAX31865-1.1.0-custom/examples/max31865/max31865.ino
diff --git a/lib/Adafruit_MAX31865-1.1.0-custom/library.properties b/lib/lib_i2c/Adafruit_MAX31865-1.1.0-custom/library.properties
similarity index 100%
rename from lib/Adafruit_MAX31865-1.1.0-custom/library.properties
rename to lib/lib_i2c/Adafruit_MAX31865-1.1.0-custom/library.properties
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.github/ISSUE_TEMPLATE.md b/lib/lib_i2c/Adafruit_MCP9808_Tasmota/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.github/ISSUE_TEMPLATE.md
rename to lib/lib_i2c/Adafruit_MCP9808_Tasmota/.github/ISSUE_TEMPLATE.md
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.github/PULL_REQUEST_TEMPLATE.md b/lib/lib_i2c/Adafruit_MCP9808_Tasmota/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.github/PULL_REQUEST_TEMPLATE.md
rename to lib/lib_i2c/Adafruit_MCP9808_Tasmota/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/lib/Adafruit_MCP9808_Tasmota/.github/workflows/githubci.yml b/lib/lib_i2c/Adafruit_MCP9808_Tasmota/.github/workflows/githubci.yml
similarity index 100%
rename from lib/Adafruit_MCP9808_Tasmota/.github/workflows/githubci.yml
rename to lib/lib_i2c/Adafruit_MCP9808_Tasmota/.github/workflows/githubci.yml
diff --git a/lib/Adafruit_MCP9808_Tasmota/.gitignore b/lib/lib_i2c/Adafruit_MCP9808_Tasmota/.gitignore
similarity index 100%
rename from lib/Adafruit_MCP9808_Tasmota/.gitignore
rename to lib/lib_i2c/Adafruit_MCP9808_Tasmota/.gitignore
diff --git a/lib/Adafruit_MCP9808_Tasmota/Adafruit_MCP9808.cpp b/lib/lib_i2c/Adafruit_MCP9808_Tasmota/Adafruit_MCP9808.cpp
similarity index 100%
rename from lib/Adafruit_MCP9808_Tasmota/Adafruit_MCP9808.cpp
rename to lib/lib_i2c/Adafruit_MCP9808_Tasmota/Adafruit_MCP9808.cpp
diff --git a/lib/Adafruit_MCP9808_Tasmota/Adafruit_MCP9808.h b/lib/lib_i2c/Adafruit_MCP9808_Tasmota/Adafruit_MCP9808.h
similarity index 100%
rename from lib/Adafruit_MCP9808_Tasmota/Adafruit_MCP9808.h
rename to lib/lib_i2c/Adafruit_MCP9808_Tasmota/Adafruit_MCP9808.h
diff --git a/lib/Adafruit_MCP9808_Tasmota/README.md b/lib/lib_i2c/Adafruit_MCP9808_Tasmota/README.md
similarity index 100%
rename from lib/Adafruit_MCP9808_Tasmota/README.md
rename to lib/lib_i2c/Adafruit_MCP9808_Tasmota/README.md
diff --git a/lib/Adafruit_MCP9808_Tasmota/assets/board.jpg b/lib/lib_i2c/Adafruit_MCP9808_Tasmota/assets/board.jpg
similarity index 100%
rename from lib/Adafruit_MCP9808_Tasmota/assets/board.jpg
rename to lib/lib_i2c/Adafruit_MCP9808_Tasmota/assets/board.jpg
diff --git a/lib/Adafruit_MCP9808_Tasmota/code-of-conduct.md b/lib/lib_i2c/Adafruit_MCP9808_Tasmota/code-of-conduct.md
similarity index 100%
rename from lib/Adafruit_MCP9808_Tasmota/code-of-conduct.md
rename to lib/lib_i2c/Adafruit_MCP9808_Tasmota/code-of-conduct.md
diff --git a/lib/Adafruit_MCP9808_Tasmota/examples/mcp9808test/mcp9808test.ino b/lib/lib_i2c/Adafruit_MCP9808_Tasmota/examples/mcp9808test/mcp9808test.ino
similarity index 100%
rename from lib/Adafruit_MCP9808_Tasmota/examples/mcp9808test/mcp9808test.ino
rename to lib/lib_i2c/Adafruit_MCP9808_Tasmota/examples/mcp9808test/mcp9808test.ino
diff --git a/lib/Adafruit_MCP9808_Tasmota/library.properties b/lib/lib_i2c/Adafruit_MCP9808_Tasmota/library.properties
similarity index 100%
rename from lib/Adafruit_MCP9808_Tasmota/library.properties
rename to lib/lib_i2c/Adafruit_MCP9808_Tasmota/library.properties
diff --git a/lib/Adafruit_SGP30-1.2.0/license.txt b/lib/lib_i2c/Adafruit_MCP9808_Tasmota/license.txt
similarity index 100%
rename from lib/Adafruit_SGP30-1.2.0/license.txt
rename to lib/lib_i2c/Adafruit_MCP9808_Tasmota/license.txt
diff --git a/lib/Adafruit_SGP30-1.2.0/Adafruit_SGP30.cpp b/lib/lib_i2c/Adafruit_SGP30-1.2.0/Adafruit_SGP30.cpp
similarity index 100%
rename from lib/Adafruit_SGP30-1.2.0/Adafruit_SGP30.cpp
rename to lib/lib_i2c/Adafruit_SGP30-1.2.0/Adafruit_SGP30.cpp
diff --git a/lib/Adafruit_SGP30-1.2.0/Adafruit_SGP30.h b/lib/lib_i2c/Adafruit_SGP30-1.2.0/Adafruit_SGP30.h
similarity index 100%
rename from lib/Adafruit_SGP30-1.2.0/Adafruit_SGP30.h
rename to lib/lib_i2c/Adafruit_SGP30-1.2.0/Adafruit_SGP30.h
diff --git a/lib/Adafruit_SGP30-1.2.0/README.md b/lib/lib_i2c/Adafruit_SGP30-1.2.0/README.md
similarity index 100%
rename from lib/Adafruit_SGP30-1.2.0/README.md
rename to lib/lib_i2c/Adafruit_SGP30-1.2.0/README.md
diff --git a/lib/Adafruit_SGP30-1.2.0/examples/sgp30test/sgp30test.ino b/lib/lib_i2c/Adafruit_SGP30-1.2.0/examples/sgp30test/sgp30test.ino
similarity index 100%
rename from lib/Adafruit_SGP30-1.2.0/examples/sgp30test/sgp30test.ino
rename to lib/lib_i2c/Adafruit_SGP30-1.2.0/examples/sgp30test/sgp30test.ino
diff --git a/lib/Adafruit_SGP30-1.2.0/library.properties b/lib/lib_i2c/Adafruit_SGP30-1.2.0/library.properties
similarity index 100%
rename from lib/Adafruit_SGP30-1.2.0/library.properties
rename to lib/lib_i2c/Adafruit_SGP30-1.2.0/library.properties
diff --git a/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/license.txt b/lib/lib_i2c/Adafruit_SGP30-1.2.0/license.txt
similarity index 100%
rename from lib/Adafruit_SSD1306-1.3.0-gemu-1.1/license.txt
rename to lib/lib_i2c/Adafruit_SGP30-1.2.0/license.txt
diff --git a/lib/Adafruit_SGP30-1.2.0/travis.yml b/lib/lib_i2c/Adafruit_SGP30-1.2.0/travis.yml
similarity index 100%
rename from lib/Adafruit_SGP30-1.2.0/travis.yml
rename to lib/lib_i2c/Adafruit_SGP30-1.2.0/travis.yml
diff --git a/lib/Adafruit_TSL2591_Library/Adafruit_TSL2591.cpp b/lib/lib_i2c/Adafruit_TSL2591_Library/Adafruit_TSL2591.cpp
similarity index 100%
rename from lib/Adafruit_TSL2591_Library/Adafruit_TSL2591.cpp
rename to lib/lib_i2c/Adafruit_TSL2591_Library/Adafruit_TSL2591.cpp
diff --git a/lib/Adafruit_TSL2591_Library/Adafruit_TSL2591.h b/lib/lib_i2c/Adafruit_TSL2591_Library/Adafruit_TSL2591.h
similarity index 100%
rename from lib/Adafruit_TSL2591_Library/Adafruit_TSL2591.h
rename to lib/lib_i2c/Adafruit_TSL2591_Library/Adafruit_TSL2591.h
diff --git a/lib/Adafruit_TSL2591_Library/library.properties b/lib/lib_i2c/Adafruit_TSL2591_Library/library.properties
similarity index 100%
rename from lib/Adafruit_TSL2591_Library/library.properties
rename to lib/lib_i2c/Adafruit_TSL2591_Library/library.properties
diff --git a/lib/Adafruit_VEML7700/.github/ISSUE_TEMPLATE.md b/lib/lib_i2c/Adafruit_VEML7700/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from lib/Adafruit_VEML7700/.github/ISSUE_TEMPLATE.md
rename to lib/lib_i2c/Adafruit_VEML7700/.github/ISSUE_TEMPLATE.md
diff --git a/lib/Adafruit_VEML7700/.github/PULL_REQUEST_TEMPLATE.md b/lib/lib_i2c/Adafruit_VEML7700/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from lib/Adafruit_VEML7700/.github/PULL_REQUEST_TEMPLATE.md
rename to lib/lib_i2c/Adafruit_VEML7700/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/lib/Adafruit_VEML7700/.gitignore b/lib/lib_i2c/Adafruit_VEML7700/.gitignore
similarity index 100%
rename from lib/Adafruit_VEML7700/.gitignore
rename to lib/lib_i2c/Adafruit_VEML7700/.gitignore
diff --git a/lib/Adafruit_VEML7700/.travis.yml b/lib/lib_i2c/Adafruit_VEML7700/.travis.yml
similarity index 100%
rename from lib/Adafruit_VEML7700/.travis.yml
rename to lib/lib_i2c/Adafruit_VEML7700/.travis.yml
diff --git a/lib/Adafruit_VEML7700/Adafruit_VEML7700.cpp b/lib/lib_i2c/Adafruit_VEML7700/Adafruit_VEML7700.cpp
similarity index 100%
rename from lib/Adafruit_VEML7700/Adafruit_VEML7700.cpp
rename to lib/lib_i2c/Adafruit_VEML7700/Adafruit_VEML7700.cpp
diff --git a/lib/Adafruit_VEML7700/Adafruit_VEML7700.h b/lib/lib_i2c/Adafruit_VEML7700/Adafruit_VEML7700.h
similarity index 100%
rename from lib/Adafruit_VEML7700/Adafruit_VEML7700.h
rename to lib/lib_i2c/Adafruit_VEML7700/Adafruit_VEML7700.h
diff --git a/lib/Adafruit_VEML7700/README.md b/lib/lib_i2c/Adafruit_VEML7700/README.md
similarity index 100%
rename from lib/Adafruit_VEML7700/README.md
rename to lib/lib_i2c/Adafruit_VEML7700/README.md
diff --git a/lib/Adafruit_VEML7700/examples/veml7700_test/veml7700_test.ino b/lib/lib_i2c/Adafruit_VEML7700/examples/veml7700_test/veml7700_test.ino
similarity index 100%
rename from lib/Adafruit_VEML7700/examples/veml7700_test/veml7700_test.ino
rename to lib/lib_i2c/Adafruit_VEML7700/examples/veml7700_test/veml7700_test.ino
diff --git a/lib/Adafruit_VEML7700/library.properties b/lib/lib_i2c/Adafruit_VEML7700/library.properties
similarity index 100%
rename from lib/Adafruit_VEML7700/library.properties
rename to lib/lib_i2c/Adafruit_VEML7700/library.properties
diff --git a/lib/Adafruit_VEML7700/license.txt b/lib/lib_i2c/Adafruit_VEML7700/license.txt
similarity index 100%
rename from lib/Adafruit_VEML7700/license.txt
rename to lib/lib_i2c/Adafruit_VEML7700/license.txt
diff --git a/lib/BME680_driver-bme680_v3.5.9/LICENSE b/lib/lib_i2c/BME680_driver-bme680_v3.5.9/LICENSE
similarity index 100%
rename from lib/BME680_driver-bme680_v3.5.9/LICENSE
rename to lib/lib_i2c/BME680_driver-bme680_v3.5.9/LICENSE
diff --git a/lib/BME680_driver-bme680_v3.5.9/README.md b/lib/lib_i2c/BME680_driver-bme680_v3.5.9/README.md
similarity index 100%
rename from lib/BME680_driver-bme680_v3.5.9/README.md
rename to lib/lib_i2c/BME680_driver-bme680_v3.5.9/README.md
diff --git a/lib/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.c b/lib/lib_i2c/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.c
similarity index 100%
rename from lib/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.c
rename to lib/lib_i2c/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.c
diff --git a/lib/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.h b/lib/lib_i2c/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.h
similarity index 100%
rename from lib/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.h
rename to lib/lib_i2c/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.h
diff --git a/lib/BME680_driver-bme680_v3.5.9/bme680.c b/lib/lib_i2c/BME680_driver-bme680_v3.5.9/bme680.c
similarity index 100%
rename from lib/BME680_driver-bme680_v3.5.9/bme680.c
rename to lib/lib_i2c/BME680_driver-bme680_v3.5.9/bme680.c
diff --git a/lib/BME680_driver-bme680_v3.5.9/bme680.h b/lib/lib_i2c/BME680_driver-bme680_v3.5.9/bme680.h
similarity index 100%
rename from lib/BME680_driver-bme680_v3.5.9/bme680.h
rename to lib/lib_i2c/BME680_driver-bme680_v3.5.9/bme680.h
diff --git a/lib/BME680_driver-bme680_v3.5.9/bme680_defs.h b/lib/lib_i2c/BME680_driver-bme680_v3.5.9/bme680_defs.h
similarity index 100%
rename from lib/BME680_driver-bme680_v3.5.9/bme680_defs.h
rename to lib/lib_i2c/BME680_driver-bme680_v3.5.9/bme680_defs.h
diff --git a/lib/BME680_driver-bme680_v3.5.9/library.properties b/lib/lib_i2c/BME680_driver-bme680_v3.5.9/library.properties
similarity index 100%
rename from lib/BME680_driver-bme680_v3.5.9/library.properties
rename to lib/lib_i2c/BME680_driver-bme680_v3.5.9/library.properties
diff --git a/lib/lib_i2c/FT5206_Library/.gitignore b/lib/lib_i2c/FT5206_Library/.gitignore
new file mode 100644
index 000000000..6d0ee45db
--- /dev/null
+++ b/lib/lib_i2c/FT5206_Library/.gitignore
@@ -0,0 +1,2 @@
+.vscode
+.DS_Store
\ No newline at end of file
diff --git a/lib/FT5206_Library/LICENSE b/lib/lib_i2c/FT5206_Library/LICENSE
old mode 100755
new mode 100644
similarity index 98%
rename from lib/FT5206_Library/LICENSE
rename to lib/lib_i2c/FT5206_Library/LICENSE
index 0b0f6fd2c..3b7bfa9f2
--- a/lib/FT5206_Library/LICENSE
+++ b/lib/lib_i2c/FT5206_Library/LICENSE
@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2019 lewis he
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2019 lewis he
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/lib/lib_i2c/FT5206_Library/README.md b/lib/lib_i2c/FT5206_Library/README.md
new file mode 100644
index 000000000..212a4efcd
--- /dev/null
+++ b/lib/lib_i2c/FT5206_Library/README.md
@@ -0,0 +1,2 @@
+FT5206 Library
+=====================================
\ No newline at end of file
diff --git a/lib/FT5206_Library/keywords.txt b/lib/lib_i2c/FT5206_Library/keywords.txt
old mode 100755
new mode 100644
similarity index 96%
rename from lib/FT5206_Library/keywords.txt
rename to lib/lib_i2c/FT5206_Library/keywords.txt
index 3fd9024be..2cf7d1013
--- a/lib/FT5206_Library/keywords.txt
+++ b/lib/lib_i2c/FT5206_Library/keywords.txt
@@ -1,29 +1,29 @@
-#######################################
-# Syntax Coloring Map For FT5206 Library By lewis He
-# github:https://github.com/lewisxhe
-#######################################
-
-#######################################
-# Datatypes (KEYWORD1)
-#######################################
-TP_Point	KEYWORD1
-FT5206_Class	KEYWORD1
-#######################################
-# Methods and Functions (KEYWORD2)
-#######################################
-
-begin  KEYWORD2
-adjustTheshold  KEYWORD2
-getPoint  KEYWORD2
-enterSleepMode  KEYWORD2
-enterMonitorMode  KEYWORD2
-
-
-#######################################
-# Instances (KEYWORD2)
-#######################################
-
-
-#######################################
-# Constants (LITERAL1)
-#######################################
+#######################################
+# Syntax Coloring Map For FT5206 Library By lewis He
+# github:https://github.com/lewisxhe
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+TP_Point	KEYWORD1
+FT5206_Class	KEYWORD1
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+begin  KEYWORD2
+adjustTheshold  KEYWORD2
+getPoint  KEYWORD2
+enterSleepMode  KEYWORD2
+enterMonitorMode  KEYWORD2
+
+
+#######################################
+# Instances (KEYWORD2)
+#######################################
+
+
+#######################################
+# Constants (LITERAL1)
+#######################################
diff --git a/lib/FT5206_Library/library.properties b/lib/lib_i2c/FT5206_Library/library.properties
old mode 100755
new mode 100644
similarity index 90%
rename from lib/FT5206_Library/library.properties
rename to lib/lib_i2c/FT5206_Library/library.properties
index 5a99dca9b..e28709e5c
--- a/lib/FT5206_Library/library.properties
+++ b/lib/lib_i2c/FT5206_Library/library.properties
@@ -1,10 +1,10 @@
-name=FT5206_Library
-version=1.0.0
-author=Lewis He
-maintainer=Lewis He <lewishe@outlook.com>
-sentence=Arduino library for FT5206 chip.
-paragraph=Arduino library for FT5206 chip. Tested with ESP32
-category=Communication
-url=https://github.com/lewisxhe/FT5206_Library
-architectures=*
+name=FT5206_Library
+version=1.0.0
+author=Lewis He
+maintainer=Lewis He <lewishe@outlook.com>
+sentence=Arduino library for FT5206 chip.
+paragraph=Arduino library for FT5206 chip. Tested with ESP32
+category=Communication
+url=https://github.com/lewisxhe/FT5206_Library
+architectures=*
 architectures=esp32
\ No newline at end of file
diff --git a/lib/FT5206_Library/src/FT5206.cpp b/lib/lib_i2c/FT5206_Library/src/FT5206.cpp
old mode 100755
new mode 100644
similarity index 96%
rename from lib/FT5206_Library/src/FT5206.cpp
rename to lib/lib_i2c/FT5206_Library/src/FT5206.cpp
index f0b106174..a8bea8621
--- a/lib/FT5206_Library/src/FT5206.cpp
+++ b/lib/lib_i2c/FT5206_Library/src/FT5206.cpp
@@ -1,108 +1,108 @@
-/////////////////////////////////////////////////////////////////
-/*
-MIT License
-
-Copyright (c) 2019 lewis he
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-FT5206.cpp - Arduino library for FT5206 chip.
-Created by Lewis on April 17, 2019.
-github:https://github.com/lewisxhe/FT5206_Library
-*/
-/////////////////////////////////////////////////////////////////
-#include "FT5206.h"
-
-int FT5206_Class::begin(TwoWire &port, uint8_t addr)
-{
-    _i2cPort = &port;
-    _address = addr;
-    uint8_t val;
-    _readByte(FT5206_VENDID_REG, 1, &val);
-    //Serial.printf("vend id %d\n",val );
-    if (val != FT5206_VENDID) {
-  //      return false;
-    }
-    _readByte(FT5206_CHIPID_REG, 1, &val);
-    //Serial.printf("chip id %d\n",val );
-    if ((val != FT6206_CHIPID) && (val != FT6236_CHIPID) && (val != FT6236U_CHIPID) && (val != FT5206U_CHIPID)  && (val != FT5316_CHIPID) ) {
-        return false;
-    }
-    _init = true;
-    return true;
-}
-
-// valid touching detect threshold.
-void FT5206_Class::adjustTheshold(uint8_t thresh)
-{
-    if (!_init)return;
-    _writeByte(FT5206_THRESHHOLD_REG, 1, &thresh);
-}
-
-TP_Point FT5206_Class::getPoint(uint8_t num)
-{
-    if (!_init) return TP_Point(0, 0);
-    _readRegister();
-    if ((_touches == 0) || (num > 1)) {
-        return TP_Point(0, 0);
-    } else {
-        return TP_Point(_x[num], _y[num]);
-    }
-}
-
-uint8_t FT5206_Class::touched()
-{
-    if (!_init)return 0;
-    uint8_t val = 0;
-    _readByte(FT5206_TOUCHES_REG,1,&val);
-    return val > 2 ? 0: val;
-}
-
-void FT5206_Class::enterSleepMode()
-{
-    if (!_init)return;
-    uint8_t val = FT5206_SLEEP_IN;
-    _writeByte(FT5206_POWER_REG, 1, &val);
-}
-
-void FT5206_Class::enterMonitorMode()
-{
-    if (!_init)return;
-    uint8_t val = FT5206_MONITOR;
-    _writeByte(FT5206_POWER_REG, 1, &val);
-}
-
-void FT5206_Class::_readRegister()
-{
-    _readByte(DEVIDE_MODE, 16, _data);
-    _touches = _data[TD_STATUS];
-    if ((_touches > 2) || (_touches == 0)) {
-        _touches = 0;
-        return;
-    }
-    for (uint8_t i = 0; i < 2; i++) {
-        _x[i] = _data[TOUCH1_XH + i * 6] & 0x0F;
-        _x[i] <<= 8;
-        _x[i] |= _data[TOUCH1_XL + i * 6];
-        _y[i] = _data[TOUCH1_YH + i * 6] & 0x0F;
-        _y[i] <<= 8;
-        _y[i] |= _data[TOUCH1_YL + i * 6];
-        _id[i] = _data[TOUCH1_YH + i * 6] >> 4;
-    }
-}
+/////////////////////////////////////////////////////////////////
+/*
+MIT License
+
+Copyright (c) 2019 lewis he
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+FT5206.cpp - Arduino library for FT5206 chip.
+Created by Lewis on April 17, 2019.
+github:https://github.com/lewisxhe/FT5206_Library
+*/
+/////////////////////////////////////////////////////////////////
+#include "FT5206.h"
+
+int FT5206_Class::begin(TwoWire &port, uint8_t addr)
+{
+    _i2cPort = &port;
+    _address = addr;
+    uint8_t val;
+    _readByte(FT5206_VENDID_REG, 1, &val);
+    //Serial.printf("vend id %d\n",val );
+    if (val != FT5206_VENDID) {
+  //      return false;
+    }
+    _readByte(FT5206_CHIPID_REG, 1, &val);
+    //Serial.printf("chip id %d\n",val );
+    if ((val != FT6206_CHIPID) && (val != FT6236_CHIPID) && (val != FT6236U_CHIPID) && (val != FT5206U_CHIPID)  && (val != FT5316_CHIPID) ) {
+        return false;
+    }
+    _init = true;
+    return true;
+}
+
+// valid touching detect threshold.
+void FT5206_Class::adjustTheshold(uint8_t thresh)
+{
+    if (!_init)return;
+    _writeByte(FT5206_THRESHHOLD_REG, 1, &thresh);
+}
+
+TP_Point FT5206_Class::getPoint(uint8_t num)
+{
+    if (!_init) return TP_Point(0, 0);
+    _readRegister();
+    if ((_touches == 0) || (num > 1)) {
+        return TP_Point(0, 0);
+    } else {
+        return TP_Point(_x[num], _y[num]);
+    }
+}
+
+uint8_t FT5206_Class::touched()
+{
+    if (!_init)return 0;
+    uint8_t val = 0;
+    _readByte(FT5206_TOUCHES_REG,1,&val);
+    return val > 2 ? 0: val;
+}
+
+void FT5206_Class::enterSleepMode()
+{
+    if (!_init)return;
+    uint8_t val = FT5206_SLEEP_IN;
+    _writeByte(FT5206_POWER_REG, 1, &val);
+}
+
+void FT5206_Class::enterMonitorMode()
+{
+    if (!_init)return;
+    uint8_t val = FT5206_MONITOR;
+    _writeByte(FT5206_POWER_REG, 1, &val);
+}
+
+void FT5206_Class::_readRegister()
+{
+    _readByte(DEVIDE_MODE, 16, _data);
+    _touches = _data[TD_STATUS];
+    if ((_touches > 2) || (_touches == 0)) {
+        _touches = 0;
+        return;
+    }
+    for (uint8_t i = 0; i < 2; i++) {
+        _x[i] = _data[TOUCH1_XH + i * 6] & 0x0F;
+        _x[i] <<= 8;
+        _x[i] |= _data[TOUCH1_XL + i * 6];
+        _y[i] = _data[TOUCH1_YH + i * 6] & 0x0F;
+        _y[i] <<= 8;
+        _y[i] |= _data[TOUCH1_YL + i * 6];
+        _id[i] = _data[TOUCH1_YH + i * 6] >> 4;
+    }
+}
diff --git a/lib/FT5206_Library/src/FT5206.h b/lib/lib_i2c/FT5206_Library/src/FT5206.h
old mode 100755
new mode 100644
similarity index 96%
rename from lib/FT5206_Library/src/FT5206.h
rename to lib/lib_i2c/FT5206_Library/src/FT5206.h
index d8b6a8e3a..d4c07db5c
--- a/lib/FT5206_Library/src/FT5206.h
+++ b/lib/lib_i2c/FT5206_Library/src/FT5206.h
@@ -1,123 +1,123 @@
-/////////////////////////////////////////////////////////////////
-/*
-MIT License
-
-Copyright (c) 2019 lewis he
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-FT5206.h - Arduino library for FT5206 chip.
-Created by Lewis on April 17, 2019.
-github:https://github.com/lewisxhe/FT5206_Library
-*/
-/////////////////////////////////////////////////////////////////
-#pragma once
-
-#include <Arduino.h>
-#include <Wire.h>
-
-#define FT5206_SLAVE_ADDRESS    (0x38)
-#define FT5206_MODE_REG         (0x00)
-#define FT5206_TOUCHES_REG      (0x02)
-#define FT5206_VENDID_REG       (0xA8)
-#define FT5206_CHIPID_REG       (0xA3)
-#define FT5206_THRESHHOLD_REG   (0x80)
-#define FT5206_POWER_REG        (0x87)
-
-#define FT5206_MONITOR         (0x01)
-#define FT5206_SLEEP_IN        (0x03)
-
-#define FT5206_VENDID           0x11
-#define FT6206_CHIPID           0x06
-#define FT6236_CHIPID           0x36
-#define FT6236U_CHIPID          0x64
-#define FT5206U_CHIPID          0x64
-
-#define FT5316_CHIPID           0x0a
-
-#define DEVIDE_MODE 0x00
-#define TD_STATUS   0x02
-#define TOUCH1_XH   0x03
-#define TOUCH1_XL   0x04
-#define TOUCH1_YH   0x05
-#define TOUCH1_YL   0x06
-
-class TP_Point
-{
-public:
-    TP_Point(void)
-    {
-        x = 0;
-        y = 0;
-    }
-    TP_Point(int16_t _x, int16_t _y)
-    {
-        x = _x;
-        y = _y;
-    }
-    int16_t x;
-    int16_t y;
-};
-
-
-class FT5206_Class
-{
-public:
-    FT5206_Class() {};
-    int begin(TwoWire &port = Wire, uint8_t addr = FT5206_SLAVE_ADDRESS);
-    // valid touching detect threshold.
-    void adjustTheshold(uint8_t thresh);
-    TP_Point getPoint(uint8_t num = 0);
-    uint8_t touched();
-    void enterSleepMode();
-    void enterMonitorMode();
-private:
-    void _readRegister();
-    int _readByte(uint8_t reg, uint8_t nbytes, uint8_t *data)
-    {
-        _i2cPort->beginTransmission(_address);
-        _i2cPort->write(reg);
-        _i2cPort->endTransmission();
-        _i2cPort->requestFrom(_address, nbytes);
-        uint8_t index = 0;
-        while (_i2cPort->available())
-            data[index++] = _i2cPort->read();
-        return 0;
-    }
-
-    int _writeByte(uint8_t reg, uint8_t nbytes, uint8_t *data)
-    {
-        _i2cPort->beginTransmission(_address);
-        _i2cPort->write(reg);
-        for (uint8_t i = 0; i < nbytes; i++) {
-            _i2cPort->write(data[i]);
-        }
-        _i2cPort->endTransmission();
-        return 0;
-    }
-
-    uint8_t _address;
-    uint8_t _data[16];
-    uint16_t _x[2];
-    uint16_t _y[2];
-    uint16_t _id[2];
-    uint8_t _touches = 0;
-    bool _init = false;
-    TwoWire *_i2cPort;
-};
+/////////////////////////////////////////////////////////////////
+/*
+MIT License
+
+Copyright (c) 2019 lewis he
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+FT5206.h - Arduino library for FT5206 chip.
+Created by Lewis on April 17, 2019.
+github:https://github.com/lewisxhe/FT5206_Library
+*/
+/////////////////////////////////////////////////////////////////
+#pragma once
+
+#include <Arduino.h>
+#include <Wire.h>
+
+#define FT5206_SLAVE_ADDRESS    (0x38)
+#define FT5206_MODE_REG         (0x00)
+#define FT5206_TOUCHES_REG      (0x02)
+#define FT5206_VENDID_REG       (0xA8)
+#define FT5206_CHIPID_REG       (0xA3)
+#define FT5206_THRESHHOLD_REG   (0x80)
+#define FT5206_POWER_REG        (0x87)
+
+#define FT5206_MONITOR         (0x01)
+#define FT5206_SLEEP_IN        (0x03)
+
+#define FT5206_VENDID           0x11
+#define FT6206_CHIPID           0x06
+#define FT6236_CHIPID           0x36
+#define FT6236U_CHIPID          0x64
+#define FT5206U_CHIPID          0x64
+
+#define FT5316_CHIPID           0x0a
+
+#define DEVIDE_MODE 0x00
+#define TD_STATUS   0x02
+#define TOUCH1_XH   0x03
+#define TOUCH1_XL   0x04
+#define TOUCH1_YH   0x05
+#define TOUCH1_YL   0x06
+
+class TP_Point
+{
+public:
+    TP_Point(void)
+    {
+        x = 0;
+        y = 0;
+    }
+    TP_Point(int16_t _x, int16_t _y)
+    {
+        x = _x;
+        y = _y;
+    }
+    int16_t x;
+    int16_t y;
+};
+
+
+class FT5206_Class
+{
+public:
+    FT5206_Class() {};
+    int begin(TwoWire &port = Wire, uint8_t addr = FT5206_SLAVE_ADDRESS);
+    // valid touching detect threshold.
+    void adjustTheshold(uint8_t thresh);
+    TP_Point getPoint(uint8_t num = 0);
+    uint8_t touched();
+    void enterSleepMode();
+    void enterMonitorMode();
+private:
+    void _readRegister();
+    int _readByte(uint8_t reg, uint8_t nbytes, uint8_t *data)
+    {
+        _i2cPort->beginTransmission(_address);
+        _i2cPort->write(reg);
+        _i2cPort->endTransmission();
+        _i2cPort->requestFrom(_address, nbytes);
+        uint8_t index = 0;
+        while (_i2cPort->available())
+            data[index++] = _i2cPort->read();
+        return 0;
+    }
+
+    int _writeByte(uint8_t reg, uint8_t nbytes, uint8_t *data)
+    {
+        _i2cPort->beginTransmission(_address);
+        _i2cPort->write(reg);
+        for (uint8_t i = 0; i < nbytes; i++) {
+            _i2cPort->write(data[i]);
+        }
+        _i2cPort->endTransmission();
+        return 0;
+    }
+
+    uint8_t _address;
+    uint8_t _data[16];
+    uint16_t _x[2];
+    uint16_t _y[2];
+    uint16_t _id[2];
+    uint8_t _touches = 0;
+    bool _init = false;
+    TwoWire *_i2cPort;
+};
diff --git a/lib/FrogmoreScd30/FrogmoreScd30.cpp b/lib/lib_i2c/FrogmoreScd30/FrogmoreScd30.cpp
similarity index 100%
rename from lib/FrogmoreScd30/FrogmoreScd30.cpp
rename to lib/lib_i2c/FrogmoreScd30/FrogmoreScd30.cpp
diff --git a/lib/FrogmoreScd30/FrogmoreScd30.h b/lib/lib_i2c/FrogmoreScd30/FrogmoreScd30.h
similarity index 100%
rename from lib/FrogmoreScd30/FrogmoreScd30.h
rename to lib/lib_i2c/FrogmoreScd30/FrogmoreScd30.h
diff --git a/lib/FrogmoreScd30/library.properties b/lib/lib_i2c/FrogmoreScd30/library.properties
similarity index 100%
rename from lib/FrogmoreScd30/library.properties
rename to lib/lib_i2c/FrogmoreScd30/library.properties
diff --git a/lib/HPMA115S0/LICENSE.md b/lib/lib_i2c/HPMA115S0/LICENSE.md
similarity index 100%
rename from lib/HPMA115S0/LICENSE.md
rename to lib/lib_i2c/HPMA115S0/LICENSE.md
diff --git a/lib/HPMA115S0/README.md b/lib/lib_i2c/HPMA115S0/README.md
similarity index 100%
rename from lib/HPMA115S0/README.md
rename to lib/lib_i2c/HPMA115S0/README.md
diff --git a/lib/HPMA115S0/example/example.ino b/lib/lib_i2c/HPMA115S0/example/example.ino
similarity index 100%
rename from lib/HPMA115S0/example/example.ino
rename to lib/lib_i2c/HPMA115S0/example/example.ino
diff --git a/lib/HPMA115S0/library.properties b/lib/lib_i2c/HPMA115S0/library.properties
similarity index 100%
rename from lib/HPMA115S0/library.properties
rename to lib/lib_i2c/HPMA115S0/library.properties
diff --git a/lib/HPMA115S0/src/hpma115S0.cpp b/lib/lib_i2c/HPMA115S0/src/hpma115S0.cpp
similarity index 100%
rename from lib/HPMA115S0/src/hpma115S0.cpp
rename to lib/lib_i2c/HPMA115S0/src/hpma115S0.cpp
diff --git a/lib/HPMA115S0/src/hpma115S0.h b/lib/lib_i2c/HPMA115S0/src/hpma115S0.h
similarity index 100%
rename from lib/HPMA115S0/src/hpma115S0.h
rename to lib/lib_i2c/HPMA115S0/src/hpma115S0.h
diff --git a/lib/I2Cdevlib-Core/.library.json b/lib/lib_i2c/I2Cdevlib-Core/.library.json
similarity index 100%
rename from lib/I2Cdevlib-Core/.library.json
rename to lib/lib_i2c/I2Cdevlib-Core/.library.json
diff --git a/lib/I2Cdevlib-Core/I2Cdev.cpp b/lib/lib_i2c/I2Cdevlib-Core/I2Cdev.cpp
similarity index 100%
rename from lib/I2Cdevlib-Core/I2Cdev.cpp
rename to lib/lib_i2c/I2Cdevlib-Core/I2Cdev.cpp
diff --git a/lib/I2Cdevlib-Core/I2Cdev.h b/lib/lib_i2c/I2Cdevlib-Core/I2Cdev.h
similarity index 100%
rename from lib/I2Cdevlib-Core/I2Cdev.h
rename to lib/lib_i2c/I2Cdevlib-Core/I2Cdev.h
diff --git a/lib/I2Cdevlib-Core/keywords.txt b/lib/lib_i2c/I2Cdevlib-Core/keywords.txt
similarity index 100%
rename from lib/I2Cdevlib-Core/keywords.txt
rename to lib/lib_i2c/I2Cdevlib-Core/keywords.txt
diff --git a/lib/I2Cdevlib-Core/library.json b/lib/lib_i2c/I2Cdevlib-Core/library.json
similarity index 100%
rename from lib/I2Cdevlib-Core/library.json
rename to lib/lib_i2c/I2Cdevlib-Core/library.json
diff --git a/lib/I2Cdevlib-MPU6050/Examples/MPU6050_DMP6/MPU6050_DMP6.ino b/lib/lib_i2c/I2Cdevlib-MPU6050/Examples/MPU6050_DMP6/MPU6050_DMP6.ino
similarity index 100%
rename from lib/I2Cdevlib-MPU6050/Examples/MPU6050_DMP6/MPU6050_DMP6.ino
rename to lib/lib_i2c/I2Cdevlib-MPU6050/Examples/MPU6050_DMP6/MPU6050_DMP6.ino
diff --git a/lib/I2Cdevlib-MPU6050/Examples/MPU6050_DMP6/Processing/MPUTeapot/MPUTeapot.pde b/lib/lib_i2c/I2Cdevlib-MPU6050/Examples/MPU6050_DMP6/Processing/MPUTeapot/MPUTeapot.pde
similarity index 100%
rename from lib/I2Cdevlib-MPU6050/Examples/MPU6050_DMP6/Processing/MPUTeapot/MPUTeapot.pde
rename to lib/lib_i2c/I2Cdevlib-MPU6050/Examples/MPU6050_DMP6/Processing/MPUTeapot/MPUTeapot.pde
diff --git a/lib/I2Cdevlib-MPU6050/Examples/MPU6050_raw/MPU6050_raw.ino b/lib/lib_i2c/I2Cdevlib-MPU6050/Examples/MPU6050_raw/MPU6050_raw.ino
similarity index 100%
rename from lib/I2Cdevlib-MPU6050/Examples/MPU6050_raw/MPU6050_raw.ino
rename to lib/lib_i2c/I2Cdevlib-MPU6050/Examples/MPU6050_raw/MPU6050_raw.ino
diff --git a/lib/I2Cdevlib-MPU6050/MPU6050.cpp b/lib/lib_i2c/I2Cdevlib-MPU6050/MPU6050.cpp
similarity index 100%
rename from lib/I2Cdevlib-MPU6050/MPU6050.cpp
rename to lib/lib_i2c/I2Cdevlib-MPU6050/MPU6050.cpp
diff --git a/lib/I2Cdevlib-MPU6050/MPU6050.h b/lib/lib_i2c/I2Cdevlib-MPU6050/MPU6050.h
similarity index 100%
rename from lib/I2Cdevlib-MPU6050/MPU6050.h
rename to lib/lib_i2c/I2Cdevlib-MPU6050/MPU6050.h
diff --git a/lib/I2Cdevlib-MPU6050/MPU6050_6Axis_MotionApps20.h b/lib/lib_i2c/I2Cdevlib-MPU6050/MPU6050_6Axis_MotionApps20.h
similarity index 100%
rename from lib/I2Cdevlib-MPU6050/MPU6050_6Axis_MotionApps20.h
rename to lib/lib_i2c/I2Cdevlib-MPU6050/MPU6050_6Axis_MotionApps20.h
diff --git a/lib/I2Cdevlib-MPU6050/MPU6050_9Axis_MotionApps41.h b/lib/lib_i2c/I2Cdevlib-MPU6050/MPU6050_9Axis_MotionApps41.h
similarity index 100%
rename from lib/I2Cdevlib-MPU6050/MPU6050_9Axis_MotionApps41.h
rename to lib/lib_i2c/I2Cdevlib-MPU6050/MPU6050_9Axis_MotionApps41.h
diff --git a/lib/I2Cdevlib-MPU6050/helper_3dmath.h b/lib/lib_i2c/I2Cdevlib-MPU6050/helper_3dmath.h
similarity index 100%
rename from lib/I2Cdevlib-MPU6050/helper_3dmath.h
rename to lib/lib_i2c/I2Cdevlib-MPU6050/helper_3dmath.h
diff --git a/lib/I2Cdevlib-MPU6050/library.properties b/lib/lib_i2c/I2Cdevlib-MPU6050/library.properties
similarity index 100%
rename from lib/I2Cdevlib-MPU6050/library.properties
rename to lib/lib_i2c/I2Cdevlib-MPU6050/library.properties
diff --git a/lib/Joba_Tsl2561-2.0.10/.gitignore b/lib/lib_i2c/Joba_Tsl2561-2.0.10/.gitignore
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/.gitignore
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/.gitignore
diff --git a/lib/Joba_Tsl2561-2.0.10/.hgignore b/lib/lib_i2c/Joba_Tsl2561-2.0.10/.hgignore
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/.hgignore
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/.hgignore
diff --git a/lib/Joba_Tsl2561-2.0.10/.travis.yml b/lib/lib_i2c/Joba_Tsl2561-2.0.10/.travis.yml
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/.travis.yml
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/.travis.yml
diff --git a/lib/Joba_Tsl2561-2.0.10/COPYING b/lib/lib_i2c/Joba_Tsl2561-2.0.10/COPYING
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/COPYING
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/COPYING
diff --git a/lib/Joba_Tsl2561-2.0.10/COPYING.LESSER b/lib/lib_i2c/Joba_Tsl2561-2.0.10/COPYING.LESSER
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/COPYING.LESSER
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/COPYING.LESSER
diff --git a/lib/Joba_Tsl2561-2.0.10/README b/lib/lib_i2c/Joba_Tsl2561-2.0.10/README
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/README
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/README
diff --git a/lib/Joba_Tsl2561-2.0.10/examples/Autogain/Autogain.ino b/lib/lib_i2c/Joba_Tsl2561-2.0.10/examples/Autogain/Autogain.ino
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/examples/Autogain/Autogain.ino
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/examples/Autogain/Autogain.ino
diff --git a/lib/Joba_Tsl2561-2.0.10/examples/Simple/Simple.ino b/lib/lib_i2c/Joba_Tsl2561-2.0.10/examples/Simple/Simple.ino
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/examples/Simple/Simple.ino
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/examples/Simple/Simple.ino
diff --git a/lib/Joba_Tsl2561-2.0.10/examples/Testing/Testing.ino b/lib/lib_i2c/Joba_Tsl2561-2.0.10/examples/Testing/Testing.ino
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/examples/Testing/Testing.ino
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/examples/Testing/Testing.ino
diff --git a/lib/Joba_Tsl2561-2.0.10/examples/Utility/Utility.ino b/lib/lib_i2c/Joba_Tsl2561-2.0.10/examples/Utility/Utility.ino
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/examples/Utility/Utility.ino
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/examples/Utility/Utility.ino
diff --git a/lib/Joba_Tsl2561-2.0.10/examples/platformio.ini b/lib/lib_i2c/Joba_Tsl2561-2.0.10/examples/platformio.ini
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/examples/platformio.ini
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/examples/platformio.ini
diff --git a/lib/Joba_Tsl2561-2.0.10/examples/platformio.sh b/lib/lib_i2c/Joba_Tsl2561-2.0.10/examples/platformio.sh
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/examples/platformio.sh
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/examples/platformio.sh
diff --git a/lib/Joba_Tsl2561-2.0.10/lib/readme.txt b/lib/lib_i2c/Joba_Tsl2561-2.0.10/lib/readme.txt
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/lib/readme.txt
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/lib/readme.txt
diff --git a/lib/Joba_Tsl2561-2.0.10/library.json b/lib/lib_i2c/Joba_Tsl2561-2.0.10/library.json
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/library.json
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/library.json
diff --git a/lib/Joba_Tsl2561-2.0.10/library.properties b/lib/lib_i2c/Joba_Tsl2561-2.0.10/library.properties
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/library.properties
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/library.properties
diff --git a/lib/Joba_Tsl2561-2.0.10/platformio.ini b/lib/lib_i2c/Joba_Tsl2561-2.0.10/platformio.ini
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/platformio.ini
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/platformio.ini
diff --git a/lib/Joba_Tsl2561-2.0.10/src/Tsl2561.cpp b/lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561.cpp
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/src/Tsl2561.cpp
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561.cpp
diff --git a/lib/Joba_Tsl2561-2.0.10/src/Tsl2561.h b/lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561.h
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/src/Tsl2561.h
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561.h
diff --git a/lib/Joba_Tsl2561-2.0.10/src/Tsl2561Util.cpp b/lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561Util.cpp
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/src/Tsl2561Util.cpp
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561Util.cpp
diff --git a/lib/Joba_Tsl2561-2.0.10/src/Tsl2561Util.h b/lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561Util.h
similarity index 100%
rename from lib/Joba_Tsl2561-2.0.10/src/Tsl2561Util.h
rename to lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561Util.h
diff --git a/lib/LOLIN_HP303B/README.md b/lib/lib_i2c/LOLIN_HP303B/README.md
similarity index 100%
rename from lib/LOLIN_HP303B/README.md
rename to lib/lib_i2c/LOLIN_HP303B/README.md
diff --git a/lib/LOLIN_HP303B/examples/i2c_background/i2c_background.ino b/lib/lib_i2c/LOLIN_HP303B/examples/i2c_background/i2c_background.ino
similarity index 100%
rename from lib/LOLIN_HP303B/examples/i2c_background/i2c_background.ino
rename to lib/lib_i2c/LOLIN_HP303B/examples/i2c_background/i2c_background.ino
diff --git a/lib/LOLIN_HP303B/examples/i2c_command/i2c_command.ino b/lib/lib_i2c/LOLIN_HP303B/examples/i2c_command/i2c_command.ino
similarity index 100%
rename from lib/LOLIN_HP303B/examples/i2c_command/i2c_command.ino
rename to lib/lib_i2c/LOLIN_HP303B/examples/i2c_command/i2c_command.ino
diff --git a/lib/LOLIN_HP303B/examples/i2c_interrupt/i2c_interrupt.ino b/lib/lib_i2c/LOLIN_HP303B/examples/i2c_interrupt/i2c_interrupt.ino
similarity index 100%
rename from lib/LOLIN_HP303B/examples/i2c_interrupt/i2c_interrupt.ino
rename to lib/lib_i2c/LOLIN_HP303B/examples/i2c_interrupt/i2c_interrupt.ino
diff --git a/lib/LOLIN_HP303B/examples/library.properties b/lib/lib_i2c/LOLIN_HP303B/examples/library.properties
similarity index 100%
rename from lib/LOLIN_HP303B/examples/library.properties
rename to lib/lib_i2c/LOLIN_HP303B/examples/library.properties
diff --git a/lib/LOLIN_HP303B/keywords.txt b/lib/lib_i2c/LOLIN_HP303B/keywords.txt
similarity index 100%
rename from lib/LOLIN_HP303B/keywords.txt
rename to lib/lib_i2c/LOLIN_HP303B/keywords.txt
diff --git a/lib/LOLIN_HP303B/library.properties b/lib/lib_i2c/LOLIN_HP303B/library.properties
similarity index 100%
rename from lib/LOLIN_HP303B/library.properties
rename to lib/lib_i2c/LOLIN_HP303B/library.properties
diff --git a/lib/LOLIN_HP303B/src/LOLIN_HP303B.cpp b/lib/lib_i2c/LOLIN_HP303B/src/LOLIN_HP303B.cpp
similarity index 100%
rename from lib/LOLIN_HP303B/src/LOLIN_HP303B.cpp
rename to lib/lib_i2c/LOLIN_HP303B/src/LOLIN_HP303B.cpp
diff --git a/lib/LOLIN_HP303B/src/LOLIN_HP303B.h b/lib/lib_i2c/LOLIN_HP303B/src/LOLIN_HP303B.h
similarity index 100%
rename from lib/LOLIN_HP303B/src/LOLIN_HP303B.h
rename to lib/lib_i2c/LOLIN_HP303B/src/LOLIN_HP303B.h
diff --git a/lib/LOLIN_HP303B/src/util/hp303b_consts.h b/lib/lib_i2c/LOLIN_HP303B/src/util/hp303b_consts.h
similarity index 100%
rename from lib/LOLIN_HP303B/src/util/hp303b_consts.h
rename to lib/lib_i2c/LOLIN_HP303B/src/util/hp303b_consts.h
diff --git a/lib/LinkedList-1.2.3/LICENSE.txt b/lib/lib_i2c/LinkedList-1.2.3/LICENSE.txt
similarity index 100%
rename from lib/LinkedList-1.2.3/LICENSE.txt
rename to lib/lib_i2c/LinkedList-1.2.3/LICENSE.txt
diff --git a/lib/LinkedList-1.2.3/LinkedList.h b/lib/lib_i2c/LinkedList-1.2.3/LinkedList.h
old mode 100755
new mode 100644
similarity index 100%
rename from lib/LinkedList-1.2.3/LinkedList.h
rename to lib/lib_i2c/LinkedList-1.2.3/LinkedList.h
diff --git a/lib/LinkedList-1.2.3/README.md b/lib/lib_i2c/LinkedList-1.2.3/README.md
similarity index 100%
rename from lib/LinkedList-1.2.3/README.md
rename to lib/lib_i2c/LinkedList-1.2.3/README.md
diff --git a/lib/LinkedList-1.2.3/examples/ClassList/ClassList.pde b/lib/lib_i2c/LinkedList-1.2.3/examples/ClassList/ClassList.pde
similarity index 100%
rename from lib/LinkedList-1.2.3/examples/ClassList/ClassList.pde
rename to lib/lib_i2c/LinkedList-1.2.3/examples/ClassList/ClassList.pde
diff --git a/lib/LinkedList-1.2.3/examples/SimpleIntegerList/SimpleIntegerList.pde b/lib/lib_i2c/LinkedList-1.2.3/examples/SimpleIntegerList/SimpleIntegerList.pde
similarity index 100%
rename from lib/LinkedList-1.2.3/examples/SimpleIntegerList/SimpleIntegerList.pde
rename to lib/lib_i2c/LinkedList-1.2.3/examples/SimpleIntegerList/SimpleIntegerList.pde
diff --git a/lib/LinkedList-1.2.3/keywords.txt b/lib/lib_i2c/LinkedList-1.2.3/keywords.txt
similarity index 100%
rename from lib/LinkedList-1.2.3/keywords.txt
rename to lib/lib_i2c/LinkedList-1.2.3/keywords.txt
diff --git a/lib/LinkedList-1.2.3/library.json b/lib/lib_i2c/LinkedList-1.2.3/library.json
similarity index 100%
rename from lib/LinkedList-1.2.3/library.json
rename to lib/lib_i2c/LinkedList-1.2.3/library.json
diff --git a/lib/LinkedList-1.2.3/library.properties b/lib/lib_i2c/LinkedList-1.2.3/library.properties
similarity index 100%
rename from lib/LinkedList-1.2.3/library.properties
rename to lib/lib_i2c/LinkedList-1.2.3/library.properties
diff --git a/lib/Mutichannel_Gas_Sensor/License.txt b/lib/lib_i2c/Mutichannel_Gas_Sensor/License.txt
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/License.txt
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/License.txt
diff --git a/lib/Mutichannel_Gas_Sensor/README.md b/lib/lib_i2c/Mutichannel_Gas_Sensor/README.md
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/README.md
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/README.md
diff --git a/lib/Mutichannel_Gas_Sensor/examples/GetVersion/GetVersion.ino b/lib/lib_i2c/Mutichannel_Gas_Sensor/examples/GetVersion/GetVersion.ino
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/examples/GetVersion/GetVersion.ino
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/examples/GetVersion/GetVersion.ino
diff --git a/lib/Mutichannel_Gas_Sensor/examples/I2C_Address/I2C_Address.ino b/lib/lib_i2c/Mutichannel_Gas_Sensor/examples/I2C_Address/I2C_Address.ino
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/examples/I2C_Address/I2C_Address.ino
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/examples/I2C_Address/I2C_Address.ino
diff --git a/lib/Mutichannel_Gas_Sensor/examples/RawData/RawData.ino b/lib/lib_i2c/Mutichannel_Gas_Sensor/examples/RawData/RawData.ino
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/examples/RawData/RawData.ino
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/examples/RawData/RawData.ino
diff --git a/lib/Mutichannel_Gas_Sensor/examples/ReadSensorValue_Grove/ReadSensorValue_Grove.ino b/lib/lib_i2c/Mutichannel_Gas_Sensor/examples/ReadSensorValue_Grove/ReadSensorValue_Grove.ino
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/examples/ReadSensorValue_Grove/ReadSensorValue_Grove.ino
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/examples/ReadSensorValue_Grove/ReadSensorValue_Grove.ino
diff --git a/lib/Mutichannel_Gas_Sensor/examples/ReadSensorValue_Xadow/ReadSensorValue_Xadow.ino b/lib/lib_i2c/Mutichannel_Gas_Sensor/examples/ReadSensorValue_Xadow/ReadSensorValue_Xadow.ino
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/examples/ReadSensorValue_Xadow/ReadSensorValue_Xadow.ino
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/examples/ReadSensorValue_Xadow/ReadSensorValue_Xadow.ino
diff --git a/lib/Mutichannel_Gas_Sensor/examples/UpdateFrimware/UpdateFrimware.ino b/lib/lib_i2c/Mutichannel_Gas_Sensor/examples/UpdateFrimware/UpdateFrimware.ino
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/examples/UpdateFrimware/UpdateFrimware.ino
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/examples/UpdateFrimware/UpdateFrimware.ino
diff --git a/lib/Mutichannel_Gas_Sensor/examples/UpdateFrimware/bootloader_atmega168.h b/lib/lib_i2c/Mutichannel_Gas_Sensor/examples/UpdateFrimware/bootloader_atmega168.h
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/examples/UpdateFrimware/bootloader_atmega168.h
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/examples/UpdateFrimware/bootloader_atmega168.h
diff --git a/lib/Mutichannel_Gas_Sensor/examples/UpdateFrimware/gpl.txt b/lib/lib_i2c/Mutichannel_Gas_Sensor/examples/UpdateFrimware/gpl.txt
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/examples/UpdateFrimware/gpl.txt
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/examples/UpdateFrimware/gpl.txt
diff --git a/lib/Mutichannel_Gas_Sensor/examples/calibration/calibration.ino b/lib/lib_i2c/Mutichannel_Gas_Sensor/examples/calibration/calibration.ino
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/examples/calibration/calibration.ino
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/examples/calibration/calibration.ino
diff --git a/lib/Mutichannel_Gas_Sensor/examples/factory_setting/factory_setting.ino b/lib/lib_i2c/Mutichannel_Gas_Sensor/examples/factory_setting/factory_setting.ino
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/examples/factory_setting/factory_setting.ino
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/examples/factory_setting/factory_setting.ino
diff --git a/lib/Mutichannel_Gas_Sensor/examples/new_firmware/new_firmware.ino b/lib/lib_i2c/Mutichannel_Gas_Sensor/examples/new_firmware/new_firmware.ino
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/examples/new_firmware/new_firmware.ino
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/examples/new_firmware/new_firmware.ino
diff --git a/lib/Mutichannel_Gas_Sensor/library.json b/lib/lib_i2c/Mutichannel_Gas_Sensor/library.json
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/library.json
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/library.json
diff --git a/lib/Mutichannel_Gas_Sensor/library.properties b/lib/lib_i2c/Mutichannel_Gas_Sensor/library.properties
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/library.properties
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/library.properties
diff --git a/lib/Mutichannel_Gas_Sensor/src/MutichannelGasSensor.cpp b/lib/lib_i2c/Mutichannel_Gas_Sensor/src/MutichannelGasSensor.cpp
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/src/MutichannelGasSensor.cpp
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/src/MutichannelGasSensor.cpp
diff --git a/lib/Mutichannel_Gas_Sensor/src/MutichannelGasSensor.h b/lib/lib_i2c/Mutichannel_Gas_Sensor/src/MutichannelGasSensor.h
similarity index 100%
rename from lib/Mutichannel_Gas_Sensor/src/MutichannelGasSensor.h
rename to lib/lib_i2c/Mutichannel_Gas_Sensor/src/MutichannelGasSensor.h
diff --git a/lib/mlx90640-library/MLX90640_API.cpp b/lib/lib_i2c/mlx90640-library/MLX90640_API.cpp
similarity index 96%
rename from lib/mlx90640-library/MLX90640_API.cpp
rename to lib/lib_i2c/mlx90640-library/MLX90640_API.cpp
index 87d871530..8b1822bf4 100644
--- a/lib/mlx90640-library/MLX90640_API.cpp
+++ b/lib/lib_i2c/mlx90640-library/MLX90640_API.cpp
@@ -1,1640 +1,1640 @@
-/**
- * @copyright (C) 2017 Melexis N.V.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <MLX90640_API.h>
-#include <math.h>
-#include <Wire.h>
-
-void ExtractVDDParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
-void ExtractPTATParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
-void ExtractGainParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
-void ExtractTgcParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
-void ExtractResolutionParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
-void ExtractKsTaParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
-void ExtractKsToParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
-void ExtractAlphaParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
-void ExtractOffsetParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
-void ExtractKtaPixelParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
-void ExtractKvPixelParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
-void ExtractCPParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
-void ExtractCILCParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
-int ExtractDeviatingPixels(uint16_t *eeData, paramsMLX90640 *mlx90640);
-int CheckAdjacentPixels(uint16_t pix1, uint16_t pix2);  
-float GetMedian(float *values, int n);
-int IsPixelBad(uint16_t pixel,paramsMLX90640 *params);
-int ValidateFrameData(uint16_t *frameData);
-int ValidateAuxData(uint16_t *auxData);
-int MLX90640_I2CRead(uint8_t addr, uint32_t reg, uint16_t len, uint16_t *reg_data);
-int MLX90640_I2CWrite(uint8_t _deviceAddress, unsigned int writeAddress, uint16_t data);
-
-// I2C
-#define I2C_BUFFER_LENGTH 128
-
-int MLX90640_I2CRead(uint8_t addr, uint32_t reg, uint16_t len, uint16_t *reg_data){
-  int bytesRemaining = len * 2;
-  int dataSpot = 0; //Start at beginning of array
-  while (bytesRemaining > 0)
-  {
-    Wire.beginTransmission(addr);
-    Wire.write(reg >> 8); //MSB
-    Wire.write(reg & 0xFF); //LSB
-    if (Wire.endTransmission(false) != 0) //Do not release bus
-    {
-      return (0); //Sensor did not ACK
-    }
-    int numberOfBytesToRead = bytesRemaining;
-    if (numberOfBytesToRead > I2C_BUFFER_LENGTH) numberOfBytesToRead = I2C_BUFFER_LENGTH;
-    Wire.requestFrom((int)addr, numberOfBytesToRead);
-    if (Wire.available())
-    {
-      for (uint32_t x = 0 ; x < numberOfBytesToRead / 2; x++)
-      {
-        reg_data[dataSpot] = Wire.read() << 8; //MSB
-        reg_data[dataSpot] |= Wire.read(); //LSB
-        dataSpot++;
-      }
-    }
-    bytesRemaining -= numberOfBytesToRead;
-    reg += numberOfBytesToRead / 2;
-  }
-  return (0); //Success
-}
-
-int MLX90640_I2CWrite(uint8_t _deviceAddress, unsigned int writeAddress, uint16_t data)
-{
-  Wire.beginTransmission((uint8_t)_deviceAddress);
-  Wire.write(writeAddress >> 8); //MSB
-  Wire.write(writeAddress & 0xFF); //LSB
-  Wire.write(data >> 8); //MSB
-  Wire.write(data & 0xFF); //LSB
-  if (Wire.endTransmission() != 0)
-  {
-    //Sensor did not ACK
-    return (-1);
-  }
-  uint16_t dataCheck;
-  MLX90640_I2CRead(_deviceAddress, writeAddress, 1, &dataCheck);
-  if (dataCheck != data)
-  {
-    return -2;
-  }
-  return (0); //Success
-}
-  
-int MLX90640_DumpEE(uint8_t slaveAddr, uint16_t *eeData)
-{
-     return MLX90640_I2CRead(slaveAddr, 0x2400, 832, eeData);
-}
-
-int MLX90640_SynchFrame(uint8_t slaveAddr)
-{
-    uint16_t dataReady = 0;
-    uint16_t statusRegister;
-    int error = 1;
-    
-    error = MLX90640_I2CWrite(slaveAddr, 0x8000, 0x0030);
-    if(error == -1)
-    {
-        return error;
-    }
-    
-    while(dataReady == 0)
-    {
-        error = MLX90640_I2CRead(slaveAddr, 0x8000, 1, &statusRegister);
-        if(error != 0)
-        {
-            return error;
-        }    
-        dataReady = statusRegister & 0x0008;
-    }      
-    
-   return 0;   
-}
-
-// int MLX90640_TriggerMeasurement(uint8_t slaveAddr) // ATM not used in Tasmota
-// {
-//     int error = 1;
-//     uint16_t ctrlReg;
-    
-//     error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &ctrlReg);
-    
-//     if ( error != 0) 
-//     {
-//         return error;
-//     }    
-                                                
-//     ctrlReg |= 0x8000;
-//     error = MLX90640_I2CWrite(slaveAddr, 0x800D, ctrlReg);
-    
-//     if ( error != 0)
-//     {
-//         return error;
-//     }    
-    
-//     // error = MLX90640_I2CGeneralReset();
-    
-//     // if ( error != 0)
-//     // {
-//     //     return error;
-//     // }    
-    
-//     error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &ctrlReg);
-    
-//     if ( error != 0)
-//     {
-//         return error;
-//     }    
-    
-//     if ((ctrlReg & 0x8000) != 0)
-//     {
-//         return -9;
-//     }
-    
-//     return 0;    
-// }
-    
-int MLX90640_GetFrameData(uint8_t slaveAddr, uint16_t *frameData)
-{
-    uint16_t dataReady = 0;
-    uint16_t controlRegister1;
-    uint16_t statusRegister;
-    int error = 1;
-    uint16_t data[64];
-    uint8_t cnt = 0;
-    
-    while(dataReady == 0)
-    {
-        error = MLX90640_I2CRead(slaveAddr, 0x8000, 1, &statusRegister);
-        if(error != 0)
-        {
-            return error;
-        }    
-        dataReady = statusRegister & 0x0008;
-    }      
-    
-    error = MLX90640_I2CWrite(slaveAddr, 0x8000, 0x0030);
-    if(error == -1)
-    {
-        return error;
-    }
-                     
-    error = MLX90640_I2CRead(slaveAddr, 0x0400, 768, frameData); 
-    if(error != 0)
-    {
-        return error;
-    }                       
-    
-    error = MLX90640_I2CRead(slaveAddr, 0x0700, 64, data); 
-    if(error != 0)
-    {
-        return error;
-    }     
-        
-    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
-    frameData[832] = controlRegister1;
-    frameData[833] = statusRegister & 0x0001;
-    
-    if(error != 0)
-    {
-        return error;
-    }
-    
-    error = ValidateAuxData(data);
-    if(error == 0)
-    {
-        for(cnt=0; cnt<64; cnt++)
-        {
-            frameData[cnt+768] = data[cnt];
-        }
-    }        
-    
-    error = ValidateFrameData(frameData);
-    if (error != 0)
-    {
-        return error;
-    }
-    
-    return frameData[833];    
-}
-
-int ValidateFrameData(uint16_t *frameData)
-{
-    uint8_t line = 0;
-    
-    for(int i=0; i<768; i+=32)
-    {
-        if((frameData[i] == 0x7FFF) && (line%2 == frameData[833])) return -8;
-        line = line + 1;
-    }    
-        
-    return 0;    
-}
-
-int ValidateAuxData(uint16_t *auxData)
-{
-    
-    if(auxData[0] == 0x7FFF) return -8;    
-    
-    for(int i=8; i<19; i++)
-    {
-        if(auxData[i] == 0x7FFF) return -8;
-    }
-    
-    for(int i=20; i<23; i++)
-    {
-        if(auxData[i] == 0x7FFF) return -8;
-    }
-    
-    for(int i=24; i<33; i++)
-    {
-        if(auxData[i] == 0x7FFF) return -8;
-    }
-    
-    for(int i=40; i<51; i++)
-    {
-        if(auxData[i] == 0x7FFF) return -8;
-    }
-    
-    for(int i=52; i<55; i++)
-    {
-        if(auxData[i] == 0x7FFF) return -8;
-    }
-    
-    for(int i=56; i<64; i++)
-    {
-        if(auxData[i] == 0x7FFF) return -8;
-    }
-    
-    return 0;
-    
-}
-    
-int MLX90640_ExtractParameters(uint16_t *eeData, paramsMLX90640 *mlx90640, int _chunk) // Tasmota
-{
-    int error = 0;
-    switch(_chunk){
-      case 0:
-        ExtractVDDParameters(eeData, mlx90640);
-        ExtractPTATParameters(eeData, mlx90640);
-        ExtractGainParameters(eeData, mlx90640);
-        ExtractTgcParameters(eeData, mlx90640);
-        ExtractResolutionParameters(eeData, mlx90640);
-        ExtractKsTaParameters(eeData, mlx90640);
-        ExtractKsToParameters(eeData, mlx90640);
-      break;
-      case 1:
-        ExtractCPParameters(eeData, mlx90640);
-        ExtractAlphaParameters(eeData, mlx90640);
-      break;
-      case 2:
-        ExtractOffsetParameters(eeData, mlx90640);
-      break;
-      case 3:
-        ExtractKtaPixelParameters(eeData, mlx90640);
-      break;
-      case 4:
-        ExtractKvPixelParameters(eeData, mlx90640);
-      break;
-      case 5:
-        ExtractCILCParameters(eeData, mlx90640);
-        error = ExtractDeviatingPixels(eeData, mlx90640);
-      break;
-    }
-    return error;
-}
-
-//------------------------------------------------------------------------------
-
-int MLX90640_SetResolution(uint8_t slaveAddr, uint8_t resolution)
-{
-    uint16_t controlRegister1;
-    int value;
-    int error;
-    
-    value = (resolution & 0x03) << 10;
-    
-    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
-    
-    if(error == 0)
-    {
-        value = (controlRegister1 & 0xF3FF) | value;
-        error = MLX90640_I2CWrite(slaveAddr, 0x800D, value);        
-    }    
-    
-    return error;
-}
-
-//------------------------------------------------------------------------------
-
-int MLX90640_GetCurResolution(uint8_t slaveAddr)
-{
-    uint16_t controlRegister1;
-    int resolutionRAM;
-    int error;
-    
-    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
-    if(error != 0)
-    {
-        return error;
-    }    
-    resolutionRAM = (controlRegister1 & 0x0C00) >> 10;
-    
-    return resolutionRAM; 
-}
-
-//------------------------------------------------------------------------------
-
-int MLX90640_SetRefreshRate(uint8_t slaveAddr, uint8_t refreshRate)
-{
-    uint16_t controlRegister1;
-    int value;
-    int error;
-    
-    value = (refreshRate & 0x07)<<7;
-    
-    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
-    if(error == 0)
-    {
-        value = (controlRegister1 & 0xFC7F) | value;
-        error = MLX90640_I2CWrite(slaveAddr, 0x800D, value);
-    }    
-    
-    return error;
-}
-
-//------------------------------------------------------------------------------
-
-int MLX90640_GetRefreshRate(uint8_t slaveAddr)
-{
-    uint16_t controlRegister1;
-    int refreshRate;
-    int error;
-    
-    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
-    if(error != 0)
-    {
-        return error;
-    }    
-    refreshRate = (controlRegister1 & 0x0380) >> 7;
-    
-    return refreshRate;
-}
-
-//------------------------------------------------------------------------------
-
-int MLX90640_SetInterleavedMode(uint8_t slaveAddr)
-{
-    uint16_t controlRegister1;
-    int value;
-    int error;
-    
-    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
-    
-    if(error == 0)
-    {
-        value = (controlRegister1 & 0xEFFF);
-        error = MLX90640_I2CWrite(slaveAddr, 0x800D, value);        
-    }    
-    
-    return error;
-}
-
-//------------------------------------------------------------------------------
-
-int MLX90640_SetChessMode(uint8_t slaveAddr)
-{
-    uint16_t controlRegister1;
-    int value;
-    int error;
-        
-    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
-    
-    if(error == 0)
-    {
-        value = (controlRegister1 | 0x1000);
-        error = MLX90640_I2CWrite(slaveAddr, 0x800D, value);        
-    }    
-    
-    return error;
-}
-
-//------------------------------------------------------------------------------
-
-int MLX90640_GetCurMode(uint8_t slaveAddr)
-{
-    uint16_t controlRegister1;
-    int modeRAM;
-    int error;
-    
-    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
-    if(error != 0)
-    {
-        return error;
-    }    
-    modeRAM = (controlRegister1 & 0x1000) >> 12;
-    
-    return modeRAM; 
-}
-
-//------------------------------------------------------------------------------
-void MLX90640_CalculateTo(uint16_t *frameData, const paramsMLX90640 *params, float emissivity, float tr, float *result, uint8_t _part)
-{
-    float vdd;
-    float ta;
-    float ta4;
-    float tr4;
-    float taTr;
-    float gain;
-    float irDataCP[2];
-    float irData;
-    float alphaCompensated;
-    uint8_t mode;
-    int8_t ilPattern;
-    int8_t chessPattern;
-    int8_t pattern;
-    int8_t conversionPattern;
-    float Sx;
-    float To;
-    float alphaCorrR[4];
-    int8_t range;
-    uint16_t subPage;
-    float ktaScale;
-    float kvScale;
-    float alphaScale;
-    float kta;
-    float kv;
-    
-    subPage = frameData[833];
-    vdd = MLX90640_GetVdd(frameData, params);
-    ta = MLX90640_GetTa(frameData, params);
-    
-    ta4 = (ta + 273.15);
-    ta4 = ta4 * ta4;
-    ta4 = ta4 * ta4;
-    tr4 = (tr + 273.15);
-    tr4 = tr4 * tr4;
-    tr4 = tr4 * tr4;
-    taTr = tr4 - (tr4-ta4)/emissivity;
-    
-    ktaScale = pow(2,(double)params->ktaScale);
-    kvScale = pow(2,(double)params->kvScale);
-    alphaScale = pow(2,(double)params->alphaScale);
-    
-    alphaCorrR[0] = 1 / (1 + params->ksTo[0] * 40);
-    alphaCorrR[1] = 1 ;
-    alphaCorrR[2] = (1 + params->ksTo[1] * params->ct[2]);
-    alphaCorrR[3] = alphaCorrR[2] * (1 + params->ksTo[2] * (params->ct[3] - params->ct[2]));
-    
-//------------------------- Gain calculation -----------------------------------    
-    gain = frameData[778];
-    if(gain > 32767)
-    {
-        gain = gain - 65536;
-    }
-    
-    gain = params->gainEE / gain; 
-  
-//------------------------- To calculation -------------------------------------    
-    mode = (frameData[832] & 0x1000) >> 5;
-    
-    irDataCP[0] = frameData[776];  
-    irDataCP[1] = frameData[808];
-    for( int i = 0; i < 2; i++)
-    {
-        if(irDataCP[i] > 32767)
-        {
-            irDataCP[i] = irDataCP[i] - 65536;
-        }
-        irDataCP[i] = irDataCP[i] * gain;
-    }
-    irDataCP[0] = irDataCP[0] - params->cpOffset[0] * (1 + params->cpKta * (ta - 25)) * (1 + params->cpKv * (vdd - 3.3));
-    if( mode ==  params->calibrationModeEE)
-    {
-        irDataCP[1] = irDataCP[1] - params->cpOffset[1] * (1 + params->cpKta * (ta - 25)) * (1 + params->cpKv * (vdd - 3.3));
-    }
-    else
-    {
-      irDataCP[1] = irDataCP[1] - (params->cpOffset[1] + params->ilChessC[0]) * (1 + params->cpKta * (ta - 25)) * (1 + params->cpKv * (vdd - 3.3));
-    }
-
-    uint32_t _offset = _part*(768/2);
-    for( int pixelNumber = _offset; pixelNumber < (_offset+(768/2)); pixelNumber++)
-    {
-        ilPattern = pixelNumber / 32 - (pixelNumber / 64) * 2; 
-        chessPattern = ilPattern ^ (pixelNumber - (pixelNumber/2)*2); 
-        conversionPattern = ((pixelNumber + 2) / 4 - (pixelNumber + 3) / 4 + (pixelNumber + 1) / 4 - pixelNumber / 4) * (1 - 2 * ilPattern);
-        
-        if(mode == 0)
-        {
-          pattern = ilPattern; 
-        }
-        else 
-        {
-          pattern = chessPattern; 
-        }               
-        
-        if(pattern == frameData[833])
-        {    
-            irData = frameData[pixelNumber];
-            if(irData > 32767)
-            {
-                irData = irData - 65536;
-            }
-            irData = irData * gain;
-            
-            kta = params->kta[pixelNumber]/ktaScale;
-            kv = params->kv[pixelNumber]/kvScale;
-            irData = irData - params->offset[pixelNumber]*(1 + kta*(ta - 25))*(1 + kv*(vdd - 3.3));
-            
-            if(mode !=  params->calibrationModeEE)
-            {
-              irData = irData + params->ilChessC[2] * (2 * ilPattern - 1) - params->ilChessC[1] * conversionPattern; 
-            }                       
-    
-            irData = irData - params->tgc * irDataCP[subPage];
-            irData = irData / emissivity;
-            
-            alphaCompensated = SCALEALPHA*alphaScale/params->alpha[pixelNumber];
-            alphaCompensated = alphaCompensated*(1 + params->KsTa * (ta - 25));
-                        
-            Sx = alphaCompensated * alphaCompensated * alphaCompensated * (irData + alphaCompensated * taTr);
-            Sx = sqrt(sqrt(Sx)) * params->ksTo[1];            
-            
-            To = sqrt(sqrt(irData/(alphaCompensated * (1 - params->ksTo[1] * 273.15) + Sx) + taTr)) - 273.15;                     
-                    
-            if(To < params->ct[1])
-            {
-                range = 0;
-            }
-            else if(To < params->ct[2])   
-            {
-                range = 1;            
-            }   
-            else if(To < params->ct[3])
-            {
-                range = 2;            
-            }
-            else
-            {
-                range = 3;            
-            }      
-            
-            To = sqrt(sqrt(irData / (alphaCompensated * alphaCorrR[range] * (1 + params->ksTo[range] * (To - params->ct[range]))) + taTr)) - 273.15;
-                        
-            result[pixelNumber] = To;
-        }
-    }
-}
-
-//------------------------------------------------------------------------------
-
-// void MLX90640_GetImage(uint16_t *frameData, const paramsMLX90640 *params, float *result)
-// {
-//     float vdd;
-//     float ta;
-//     float gain;
-//     float irDataCP[2];
-//     float irData;
-//     float alphaCompensated;
-//     uint8_t mode;
-//     int8_t ilPattern;
-//     int8_t chessPattern;
-//     int8_t pattern;
-//     int8_t conversionPattern;
-//     float image;
-//     uint16_t subPage;
-//     float ktaScale;
-//     float kvScale;
-//     float kta;
-//     float kv;
-    
-//     subPage = frameData[833];
-//     vdd = MLX90640_GetVdd(frameData, params);
-//     ta = MLX90640_GetTa(frameData, params);
-    
-//     ktaScale = pow(2,(double)params->ktaScale);
-//     kvScale = pow(2,(double)params->kvScale);
-    
-// //------------------------- Gain calculation -----------------------------------    
-//     gain = frameData[778];
-//     if(gain > 32767)
-//     {
-//         gain = gain - 65536;
-//     }
-    
-//     gain = params->gainEE / gain; 
-  
-// //------------------------- Image calculation -------------------------------------    
-//     mode = (frameData[832] & 0x1000) >> 5;
-    
-//     irDataCP[0] = frameData[776];  
-//     irDataCP[1] = frameData[808];
-//     for( int i = 0; i < 2; i++)
-//     {
-//         if(irDataCP[i] > 32767)
-//         {
-//             irDataCP[i] = irDataCP[i] - 65536;
-//         }
-//         irDataCP[i] = irDataCP[i] * gain;
-//     }
-//     irDataCP[0] = irDataCP[0] - params->cpOffset[0] * (1 + params->cpKta * (ta - 25)) * (1 + params->cpKv * (vdd - 3.3));
-//     if( mode ==  params->calibrationModeEE)
-//     {
-//         irDataCP[1] = irDataCP[1] - params->cpOffset[1] * (1 + params->cpKta * (ta - 25)) * (1 + params->cpKv * (vdd - 3.3));
-//     }
-//     else
-//     {
-//       irDataCP[1] = irDataCP[1] - (params->cpOffset[1] + params->ilChessC[0]) * (1 + params->cpKta * (ta - 25)) * (1 + params->cpKv * (vdd - 3.3));
-//     }
-
-//     for( int pixelNumber = 0; pixelNumber < 768; pixelNumber++)
-//     {
-//         ilPattern = pixelNumber / 32 - (pixelNumber / 64) * 2; 
-//         chessPattern = ilPattern ^ (pixelNumber - (pixelNumber/2)*2); 
-//         conversionPattern = ((pixelNumber + 2) / 4 - (pixelNumber + 3) / 4 + (pixelNumber + 1) / 4 - pixelNumber / 4) * (1 - 2 * ilPattern);
-        
-//         if(mode == 0)
-//         {
-//           pattern = ilPattern; 
-//         }
-//         else 
-//         {
-//           pattern = chessPattern; 
-//         }
-        
-//         if(pattern == frameData[833])
-//         {    
-//             irData = frameData[pixelNumber];
-//             if(irData > 32767)
-//             {
-//                 irData = irData - 65536;
-//             }
-//             irData = irData * gain;
-            
-//             kta = params->kta[pixelNumber]/ktaScale;
-//             kv = params->kv[pixelNumber]/kvScale;
-//             irData = irData - params->offset[pixelNumber]*(1 + kta*(ta - 25))*(1 + kv*(vdd - 3.3));
-
-//             if(mode !=  params->calibrationModeEE)
-//             {
-//               irData = irData + params->ilChessC[2] * (2 * ilPattern - 1) - params->ilChessC[1] * conversionPattern; 
-//             }
-            
-//             irData = irData - params->tgc * irDataCP[subPage];
-                        
-//             alphaCompensated = params->alpha[pixelNumber];
-            
-//             image = irData*alphaCompensated;
-            
-//             result[pixelNumber] = image;
-//         }
-//     }
-// }
-
-//------------------------------------------------------------------------------
-
-float MLX90640_GetVdd(uint16_t *frameData, const paramsMLX90640 *params)
-{
-    float vdd;
-    float resolutionCorrection;
-
-    int resolutionRAM;    
-    
-    vdd = frameData[810];
-    if(vdd > 32767)
-    {
-        vdd = vdd - 65536;
-    }
-    resolutionRAM = (frameData[832] & 0x0C00) >> 10;
-    resolutionCorrection = pow(2, (double)params->resolutionEE) / pow(2, (double)resolutionRAM);
-    vdd = (resolutionCorrection * vdd - params->vdd25) / params->kVdd + 3.3;
-    
-    return vdd;
-}
-
-//------------------------------------------------------------------------------
-
-float MLX90640_GetTa(uint16_t *frameData, const paramsMLX90640 *params)
-{
-    float ptat;
-    float ptatArt;
-    float vdd;
-    float ta;
-    
-    vdd = MLX90640_GetVdd(frameData, params);
-    
-    ptat = frameData[800];
-    if(ptat > 32767)
-    {
-        ptat = ptat - 65536;
-    }
-    
-    ptatArt = frameData[768];
-    if(ptatArt > 32767)
-    {
-        ptatArt = ptatArt - 65536;
-    }
-    ptatArt = (ptat / (ptat * params->alphaPTAT + ptatArt)) * pow(2, (double)18);
-    
-    ta = (ptatArt / (1 + params->KvPTAT * (vdd - 3.3)) - params->vPTAT25);
-    ta = ta / params->KtPTAT + 25;
-    
-    return ta;
-}
-
-//------------------------------------------------------------------------------
-
-int MLX90640_GetSubPageNumber(uint16_t *frameData)
-{
-    return frameData[833];    
-
-}    
-
-//------------------------------------------------------------------------------
-void MLX90640_BadPixelsCorrection(uint16_t *pixels, float *to, int mode, paramsMLX90640 *params)
-{   
-    float ap[4];
-    uint8_t pix;
-    uint8_t line;
-    uint8_t column;
-    
-    pix = 0;
-    while(pixels[pix] != 0xFFFF)
-    {
-        line = pixels[pix]>>5;
-        column = pixels[pix] - (line<<5);
-        
-        if(mode == 1)
-        {        
-            if(line == 0)
-            {
-                if(column == 0)
-                {        
-                    to[pixels[pix]] = to[33];                    
-                }
-                else if(column == 31)
-                {
-                    to[pixels[pix]] = to[62];                      
-                }
-                else
-                {
-                    to[pixels[pix]] = (to[pixels[pix]+31] + to[pixels[pix]+33])/2.0;                    
-                }        
-            }
-            else if(line == 23)
-            {
-                if(column == 0)
-                {
-                    to[pixels[pix]] = to[705];                    
-                }
-                else if(column == 31)
-                {
-                    to[pixels[pix]] = to[734];                       
-                }
-                else
-                {
-                    to[pixels[pix]] = (to[pixels[pix]-33] + to[pixels[pix]-31])/2.0;                       
-                }                       
-            } 
-            else if(column == 0)
-            {
-                to[pixels[pix]] = (to[pixels[pix]-31] + to[pixels[pix]+33])/2.0;                
-            }
-            else if(column == 31)
-            {
-                to[pixels[pix]] = (to[pixels[pix]-33] + to[pixels[pix]+31])/2.0;                
-            } 
-            else
-            {
-                ap[0] = to[pixels[pix]-33];
-                ap[1] = to[pixels[pix]-31];
-                ap[2] = to[pixels[pix]+31];
-                ap[3] = to[pixels[pix]+33];
-                to[pixels[pix]] = GetMedian(ap,4);
-            }                   
-        }
-        else
-        {        
-            if(column == 0)
-            {
-                to[pixels[pix]] = to[pixels[pix]+1];            
-            }
-            else if(column == 1 || column == 30)
-            {
-                to[pixels[pix]] = (to[pixels[pix]-1]+to[pixels[pix]+1])/2.0;                
-            } 
-            else if(column == 31)
-            {
-                to[pixels[pix]] = to[pixels[pix]-1];
-            } 
-            else
-            {
-                if(IsPixelBad(pixels[pix]-2,params) == 0 && IsPixelBad(pixels[pix]+2,params) == 0)
-                {
-                    ap[0] = to[pixels[pix]+1] - to[pixels[pix]+2];
-                    ap[1] = to[pixels[pix]-1] - to[pixels[pix]-2];
-                    if(fabs(ap[0]) > fabs(ap[1]))
-                    {
-                        to[pixels[pix]] = to[pixels[pix]-1] + ap[1];                        
-                    }
-                    else
-                    {
-                        to[pixels[pix]] = to[pixels[pix]+1] + ap[0];                        
-                    }
-                }
-                else
-                {
-                    to[pixels[pix]] = (to[pixels[pix]-1]+to[pixels[pix]+1])/2.0;                    
-                }            
-            }                      
-        } 
-        pix = pix + 1;    
-    }    
-}
-
-//------------------------------------------------------------------------------
-
-void ExtractVDDParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    int16_t kVdd;
-    int16_t vdd25;
-    
-    kVdd = eeData[51];
-    
-    kVdd = (eeData[51] & 0xFF00) >> 8;
-    if(kVdd > 127)
-    {
-        kVdd = kVdd - 256;
-    }
-    kVdd = 32 * kVdd;
-    vdd25 = eeData[51] & 0x00FF;
-    vdd25 = ((vdd25 - 256) << 5) - 8192;
-    
-    mlx90640->kVdd = kVdd;
-    mlx90640->vdd25 = vdd25; 
-}
-
-//------------------------------------------------------------------------------
-
-void ExtractPTATParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    float KvPTAT;
-    float KtPTAT;
-    int16_t vPTAT25;
-    float alphaPTAT;
-    
-    KvPTAT = (eeData[50] & 0xFC00) >> 10;
-    if(KvPTAT > 31)
-    {
-        KvPTAT = KvPTAT - 64;
-    }
-    KvPTAT = KvPTAT/4096;
-    
-    KtPTAT = eeData[50] & 0x03FF;
-    if(KtPTAT > 511)
-    {
-        KtPTAT = KtPTAT - 1024;
-    }
-    KtPTAT = KtPTAT/8;
-    
-    vPTAT25 = eeData[49];
-    
-    alphaPTAT = (eeData[16] & 0xF000) / pow(2, (double)14) + 8.0f;
-    
-    mlx90640->KvPTAT = KvPTAT;
-    mlx90640->KtPTAT = KtPTAT;    
-    mlx90640->vPTAT25 = vPTAT25;
-    mlx90640->alphaPTAT = alphaPTAT;   
-}
-
-//------------------------------------------------------------------------------
-
-void ExtractGainParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    int16_t gainEE;
-    
-    gainEE = eeData[48];
-    if(gainEE > 32767)
-    {
-        gainEE = gainEE -65536;
-    }
-    
-    mlx90640->gainEE = gainEE;    
-}
-
-//------------------------------------------------------------------------------
-
-void ExtractTgcParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    float tgc;
-    tgc = eeData[60] & 0x00FF;
-    if(tgc > 127)
-    {
-        tgc = tgc - 256;
-    }
-    tgc = tgc / 32.0f;
-    
-    mlx90640->tgc = tgc;        
-}
-
-//------------------------------------------------------------------------------
-
-void ExtractResolutionParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    uint8_t resolutionEE;
-    resolutionEE = (eeData[56] & 0x3000) >> 12;    
-    
-    mlx90640->resolutionEE = resolutionEE;
-}
-
-//------------------------------------------------------------------------------
-
-void ExtractKsTaParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    float KsTa;
-    KsTa = (eeData[60] & 0xFF00) >> 8;
-    if(KsTa > 127)
-    {
-        KsTa = KsTa -256;
-    }
-    KsTa = KsTa / 8192.0f;
-    
-    mlx90640->KsTa = KsTa;
-}
-
-//------------------------------------------------------------------------------
-
-void ExtractKsToParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    int KsToScale;
-    int8_t step;
-    
-    step = ((eeData[63] & 0x3000) >> 12) * 10;
-    
-    mlx90640->ct[0] = -40;
-    mlx90640->ct[1] = 0;
-    mlx90640->ct[2] = (eeData[63] & 0x00F0) >> 4;
-    mlx90640->ct[3] = (eeData[63] & 0x0F00) >> 8;    
-    
-    mlx90640->ct[2] = mlx90640->ct[2]*step;
-    mlx90640->ct[3] = mlx90640->ct[2] + mlx90640->ct[3]*step;
-    mlx90640->ct[4] = 400;
-    
-    KsToScale = (eeData[63] & 0x000F) + 8;
-    KsToScale = 1 << KsToScale;
-    
-    mlx90640->ksTo[0] = eeData[61] & 0x00FF;
-    mlx90640->ksTo[1] = (eeData[61] & 0xFF00) >> 8;
-    mlx90640->ksTo[2] = eeData[62] & 0x00FF;
-    mlx90640->ksTo[3] = (eeData[62] & 0xFF00) >> 8;      
-    
-    for(int i = 0; i < 4; i++)
-    {
-        if(mlx90640->ksTo[i] > 127)
-        {
-            mlx90640->ksTo[i] = mlx90640->ksTo[i] - 256;
-        }
-        mlx90640->ksTo[i] = mlx90640->ksTo[i] / KsToScale;
-    } 
-    
-    mlx90640->ksTo[4] = -0.0002;
-}
-
-//------------------------------------------------------------------------------
-
-void ExtractAlphaParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    int accRow[24];
-    int accColumn[32];
-    int p = 0;
-    int alphaRef;
-    uint8_t alphaScale;
-    uint8_t accRowScale;
-    uint8_t accColumnScale;
-    uint8_t accRemScale;
-    float alphaTemp[768];
-    float temp;
-    
-
-    accRemScale = eeData[32] & 0x000F;
-    accColumnScale = (eeData[32] & 0x00F0) >> 4;
-    accRowScale = (eeData[32] & 0x0F00) >> 8;
-    alphaScale = ((eeData[32] & 0xF000) >> 12) + 30;
-    alphaRef = eeData[33];
-    
-    for(int i = 0; i < 6; i++)
-    {
-        p = i * 4;
-        accRow[p + 0] = (eeData[34 + i] & 0x000F);
-        accRow[p + 1] = (eeData[34 + i] & 0x00F0) >> 4;
-        accRow[p + 2] = (eeData[34 + i] & 0x0F00) >> 8;
-        accRow[p + 3] = (eeData[34 + i] & 0xF000) >> 12;
-    }
-    
-    for(int i = 0; i < 24; i++)
-    {
-        if (accRow[i] > 7)
-        {
-            accRow[i] = accRow[i] - 16;
-        }
-    }
-    
-    for(int i = 0; i < 8; i++)
-    {
-        p = i * 4;
-        accColumn[p + 0] = (eeData[40 + i] & 0x000F);
-        accColumn[p + 1] = (eeData[40 + i] & 0x00F0) >> 4;
-        accColumn[p + 2] = (eeData[40 + i] & 0x0F00) >> 8;
-        accColumn[p + 3] = (eeData[40 + i] & 0xF000) >> 12;
-    }
-    
-    for(int i = 0; i < 32; i ++)
-    {
-        if (accColumn[i] > 7)
-        {
-            accColumn[i] = accColumn[i] - 16;
-        }
-    }
-
-    for(int i = 0; i < 24; i++)
-    {
-        for(int j = 0; j < 32; j ++)
-        {
-            p = 32 * i +j;
-            alphaTemp[p] = (eeData[64 + p] & 0x03F0) >> 4;
-            if (alphaTemp[p] > 31)
-            {
-                alphaTemp[p] = alphaTemp[p] - 64;
-            }
-            alphaTemp[p] = alphaTemp[p]*(1 << accRemScale);
-            alphaTemp[p] = (alphaRef + (accRow[i] << accRowScale) + (accColumn[j] << accColumnScale) + alphaTemp[p]);
-            alphaTemp[p] = alphaTemp[p] / pow(2,(double)alphaScale);
-            alphaTemp[p] = alphaTemp[p] - mlx90640->tgc * (mlx90640->cpAlpha[0] + mlx90640->cpAlpha[1])/2;
-            alphaTemp[p] = SCALEALPHA/alphaTemp[p];
-        }
-    }
-    
-    temp = alphaTemp[0];
-    for(int i = 1; i < 768; i++)
-    {
-        if (alphaTemp[i] > temp)
-        {
-            temp = alphaTemp[i];
-        }
-    }
-    
-    alphaScale = 0;
-    while(temp < 32767.4)
-    {
-        temp = temp*2;
-        alphaScale = alphaScale + 1;
-    } 
-    
-    for(int i = 0; i < 768; i++)
-    {
-        temp = alphaTemp[i] * pow(2,(double)alphaScale);        
-        mlx90640->alpha[i] = (temp + 0.5);        
-        
-    } 
-    
-    mlx90640->alphaScale = alphaScale;      
-   
-}
-
-//------------------------------------------------------------------------------
-
-void ExtractOffsetParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    int occRow[24];
-    int occColumn[32];
-    int p = 0;
-    int16_t offsetRef;
-    uint8_t occRowScale;
-    uint8_t occColumnScale;
-    uint8_t occRemScale;
-    
-
-    occRemScale = (eeData[16] & 0x000F);
-    occColumnScale = (eeData[16] & 0x00F0) >> 4;
-    occRowScale = (eeData[16] & 0x0F00) >> 8;
-    offsetRef = eeData[17];
-    if (offsetRef > 32767)
-    {
-        offsetRef = offsetRef - 65536;
-    }
-    
-    for(int i = 0; i < 6; i++)
-    {
-        p = i * 4;
-        occRow[p + 0] = (eeData[18 + i] & 0x000F);
-        occRow[p + 1] = (eeData[18 + i] & 0x00F0) >> 4;
-        occRow[p + 2] = (eeData[18 + i] & 0x0F00) >> 8;
-        occRow[p + 3] = (eeData[18 + i] & 0xF000) >> 12;
-    }
-    
-    for(int i = 0; i < 24; i++)
-    {
-        if (occRow[i] > 7)
-        {
-            occRow[i] = occRow[i] - 16;
-        }
-    }
-    
-    for(int i = 0; i < 8; i++)
-    {
-        p = i * 4;
-        occColumn[p + 0] = (eeData[24 + i] & 0x000F);
-        occColumn[p + 1] = (eeData[24 + i] & 0x00F0) >> 4;
-        occColumn[p + 2] = (eeData[24 + i] & 0x0F00) >> 8;
-        occColumn[p + 3] = (eeData[24 + i] & 0xF000) >> 12;
-    }
-    
-    for(int i = 0; i < 32; i ++)
-    {
-        if (occColumn[i] > 7)
-        {
-            occColumn[i] = occColumn[i] - 16;
-        }
-    }
-
-    for(int i = 0; i < 24; i++)
-    {
-        for(int j = 0; j < 32; j ++)
-        {
-            p = 32 * i +j;
-            mlx90640->offset[p] = (eeData[64 + p] & 0xFC00) >> 10;
-            if (mlx90640->offset[p] > 31)
-            {
-                mlx90640->offset[p] = mlx90640->offset[p] - 64;
-            }
-            mlx90640->offset[p] = mlx90640->offset[p]*(1 << occRemScale);
-            mlx90640->offset[p] = (offsetRef + (occRow[i] << occRowScale) + (occColumn[j] << occColumnScale) + mlx90640->offset[p]);
-        }
-    }
-}
-
-//------------------------------------------------------------------------------
-
-void ExtractKtaPixelParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    int p = 0;
-    int8_t KtaRC[4];
-    int8_t KtaRoCo;
-    int8_t KtaRoCe;
-    int8_t KtaReCo;
-    int8_t KtaReCe;
-    uint8_t ktaScale1;
-    uint8_t ktaScale2;
-    uint8_t split;
-    float ktaTemp[768];
-    float temp;
-    
-    KtaRoCo = (eeData[54] & 0xFF00) >> 8;
-    if (KtaRoCo > 127)
-    {
-        KtaRoCo = KtaRoCo - 256;
-    }
-    KtaRC[0] = KtaRoCo;
-    
-    KtaReCo = (eeData[54] & 0x00FF);
-    if (KtaReCo > 127)
-    {
-        KtaReCo = KtaReCo - 256;
-    }
-    KtaRC[2] = KtaReCo;
-      
-    KtaRoCe = (eeData[55] & 0xFF00) >> 8;
-    if (KtaRoCe > 127)
-    {
-        KtaRoCe = KtaRoCe - 256;
-    }
-    KtaRC[1] = KtaRoCe;
-      
-    KtaReCe = (eeData[55] & 0x00FF);
-    if (KtaReCe > 127)
-    {
-        KtaReCe = KtaReCe - 256;
-    }
-    KtaRC[3] = KtaReCe;
-  
-    ktaScale1 = ((eeData[56] & 0x00F0) >> 4) + 8;
-    ktaScale2 = (eeData[56] & 0x000F);
-
-    for(int i = 0; i < 24; i++)
-    {
-        for(int j = 0; j < 32; j ++)
-        {
-            p = 32 * i +j;
-            split = 2*(p/32 - (p/64)*2) + p%2;
-            ktaTemp[p] = (eeData[64 + p] & 0x000E) >> 1;
-            if (ktaTemp[p] > 3)
-            {
-                ktaTemp[p] = ktaTemp[p] - 8;
-            }
-            ktaTemp[p] = ktaTemp[p] * (1 << ktaScale2);
-            ktaTemp[p] = KtaRC[split] + ktaTemp[p];
-            ktaTemp[p] = ktaTemp[p] / pow(2,(double)ktaScale1);
-            //ktaTemp[p] = ktaTemp[p] * mlx90640->offset[p];
-        }
-    }
-    
-    temp = fabs(ktaTemp[0]);
-    for(int i = 1; i < 768; i++)
-    {
-        if (fabs(ktaTemp[i]) > temp)
-        {
-            temp = fabs(ktaTemp[i]);
-        }
-    }
-    
-    ktaScale1 = 0;
-    while(temp < 63.4)
-    {
-        temp = temp*2;
-        ktaScale1 = ktaScale1 + 1;
-    }    
-     
-    for(int i = 0; i < 768; i++)
-    {
-        temp = ktaTemp[i] * pow(2,(double)ktaScale1);
-        if (temp < 0)
-        {
-            mlx90640->kta[i] = (temp - 0.5);
-        }
-        else
-        {
-            mlx90640->kta[i] = (temp + 0.5);
-        }        
-        
-    } 
-    
-    mlx90640->ktaScale = ktaScale1;           
-}
-
-
-//------------------------------------------------------------------------------
-
-void ExtractKvPixelParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    int p = 0;
-    int8_t KvT[4];
-    int8_t KvRoCo;
-    int8_t KvRoCe;
-    int8_t KvReCo;
-    int8_t KvReCe;
-    uint8_t kvScale;
-    uint8_t split;
-    float kvTemp[768];
-    float temp;
-
-    KvRoCo = (eeData[52] & 0xF000) >> 12;
-    if (KvRoCo > 7)
-    {
-        KvRoCo = KvRoCo - 16;
-    }
-    KvT[0] = KvRoCo;
-    
-    KvReCo = (eeData[52] & 0x0F00) >> 8;
-    if (KvReCo > 7)
-    {
-        KvReCo = KvReCo - 16;
-    }
-    KvT[2] = KvReCo;
-      
-    KvRoCe = (eeData[52] & 0x00F0) >> 4;
-    if (KvRoCe > 7)
-    {
-        KvRoCe = KvRoCe - 16;
-    }
-    KvT[1] = KvRoCe;
-      
-    KvReCe = (eeData[52] & 0x000F);
-    if (KvReCe > 7)
-    {
-        KvReCe = KvReCe - 16;
-    }
-    KvT[3] = KvReCe;
-  
-    kvScale = (eeData[56] & 0x0F00) >> 8;
-
-
-    for(int i = 0; i < 24; i++)
-    {
-        for(int j = 0; j < 32; j ++)
-        {
-            p = 32 * i +j;
-            split = 2*(p/32 - (p/64)*2) + p%2;
-            kvTemp[p] = KvT[split];
-            kvTemp[p] = kvTemp[p] / pow(2,(double)kvScale);
-            //kvTemp[p] = kvTemp[p] * mlx90640->offset[p];
-        }
-    }
-    
-    temp = fabs(kvTemp[0]);
-    for(int i = 1; i < 768; i++)
-    {
-        if (fabs(kvTemp[i]) > temp)
-        {
-            temp = fabs(kvTemp[i]);
-        }
-    }
-    
-    kvScale = 0;
-    while(temp < 63.4)
-    {
-        temp = temp*2;
-        kvScale = kvScale + 1;
-    }
-     
-    for(int i = 0; i < 768; i++)
-    {
-        temp = kvTemp[i] * pow(2,(double)kvScale);
-        if (temp < 0)
-        {
-            mlx90640->kv[i] = (temp - 0.5);
-        }
-        else
-        {
-            mlx90640->kv[i] = (temp + 0.5);
-        }        
-        
-    } 
-    
-    mlx90640->kvScale = kvScale;        
-}
-
-//------------------------------------------------------------------------------
-
-void ExtractCPParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    float alphaSP[2];
-    int16_t offsetSP[2];
-    float cpKv;
-    float cpKta;
-    uint8_t alphaScale;
-    uint8_t ktaScale1;
-    uint8_t kvScale;
-
-    alphaScale = ((eeData[32] & 0xF000) >> 12) + 27;
-    
-    offsetSP[0] = (eeData[58] & 0x03FF);
-    if (offsetSP[0] > 511)
-    {
-        offsetSP[0] = offsetSP[0] - 1024;
-    }
-    
-    offsetSP[1] = (eeData[58] & 0xFC00) >> 10;
-    if (offsetSP[1] > 31)
-    {
-        offsetSP[1] = offsetSP[1] - 64;
-    }
-    offsetSP[1] = offsetSP[1] + offsetSP[0]; 
-    
-    alphaSP[0] = (eeData[57] & 0x03FF);
-    if (alphaSP[0] > 511)
-    {
-        alphaSP[0] = alphaSP[0] - 1024;
-    }
-    alphaSP[0] = alphaSP[0] /  pow(2,(double)alphaScale);
-    
-    alphaSP[1] = (eeData[57] & 0xFC00) >> 10;
-    if (alphaSP[1] > 31)
-    {
-        alphaSP[1] = alphaSP[1] - 64;
-    }
-    alphaSP[1] = (1 + alphaSP[1]/128) * alphaSP[0];
-    
-    cpKta = (eeData[59] & 0x00FF);
-    if (cpKta > 127)
-    {
-        cpKta = cpKta - 256;
-    }
-    ktaScale1 = ((eeData[56] & 0x00F0) >> 4) + 8;    
-    mlx90640->cpKta = cpKta / pow(2,(double)ktaScale1);
-    
-    cpKv = (eeData[59] & 0xFF00) >> 8;
-    if (cpKv > 127)
-    {
-        cpKv = cpKv - 256;
-    }
-    kvScale = (eeData[56] & 0x0F00) >> 8;
-    mlx90640->cpKv = cpKv / pow(2,(double)kvScale);
-       
-    mlx90640->cpAlpha[0] = alphaSP[0];
-    mlx90640->cpAlpha[1] = alphaSP[1];
-    mlx90640->cpOffset[0] = offsetSP[0];
-    mlx90640->cpOffset[1] = offsetSP[1];  
-}
-
-//------------------------------------------------------------------------------
-
-void ExtractCILCParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    float ilChessC[3];
-    uint8_t calibrationModeEE;
-    
-    calibrationModeEE = (eeData[10] & 0x0800) >> 4;
-    calibrationModeEE = calibrationModeEE ^ 0x80;
-
-    ilChessC[0] = (eeData[53] & 0x003F);
-    if (ilChessC[0] > 31)
-    {
-        ilChessC[0] = ilChessC[0] - 64;
-    }
-    ilChessC[0] = ilChessC[0] / 16.0f;
-    
-    ilChessC[1] = (eeData[53] & 0x07C0) >> 6;
-    if (ilChessC[1] > 15)
-    {
-        ilChessC[1] = ilChessC[1] - 32;
-    }
-    ilChessC[1] = ilChessC[1] / 2.0f;
-    
-    ilChessC[2] = (eeData[53] & 0xF800) >> 11;
-    if (ilChessC[2] > 15)
-    {
-        ilChessC[2] = ilChessC[2] - 32;
-    }
-    ilChessC[2] = ilChessC[2] / 8.0f;
-    
-    mlx90640->calibrationModeEE = calibrationModeEE;
-    mlx90640->ilChessC[0] = ilChessC[0];
-    mlx90640->ilChessC[1] = ilChessC[1];
-    mlx90640->ilChessC[2] = ilChessC[2];
-}
-
-//------------------------------------------------------------------------------
-
-int ExtractDeviatingPixels(uint16_t *eeData, paramsMLX90640 *mlx90640)
-{
-    uint16_t pixCnt = 0;
-    uint16_t brokenPixCnt = 0;
-    uint16_t outlierPixCnt = 0;
-    int warn = 0;
-    int i;
-    
-    for(pixCnt = 0; pixCnt<5; pixCnt++)
-    {
-        mlx90640->brokenPixels[pixCnt] = 0xFFFF;
-        mlx90640->outlierPixels[pixCnt] = 0xFFFF;
-    }
-        
-    pixCnt = 0;    
-    while (pixCnt < 768 && brokenPixCnt < 5 && outlierPixCnt < 5)
-    {
-        if(eeData[pixCnt+64] == 0)
-        {
-            mlx90640->brokenPixels[brokenPixCnt] = pixCnt;
-            brokenPixCnt = brokenPixCnt + 1;
-        }    
-        else if((eeData[pixCnt+64] & 0x0001) != 0)
-        {
-            mlx90640->outlierPixels[outlierPixCnt] = pixCnt;
-            outlierPixCnt = outlierPixCnt + 1;
-        }    
-        
-        pixCnt = pixCnt + 1;
-        
-    } 
-    
-    if(brokenPixCnt > 4)  
-    {
-        warn = -3;
-    }         
-    else if(outlierPixCnt > 4)  
-    {
-        warn = -4;
-    }
-    else if((brokenPixCnt + outlierPixCnt) > 4)  
-    {
-        warn = -5;
-    } 
-    else
-    {
-        for(pixCnt=0; pixCnt<brokenPixCnt; pixCnt++)
-        {
-            for(i=pixCnt+1; i<brokenPixCnt; i++)
-            {
-                warn = CheckAdjacentPixels(mlx90640->brokenPixels[pixCnt],mlx90640->brokenPixels[i]);
-                if(warn != 0)
-                {
-                    return warn;
-                }    
-            }    
-        }
-        
-        for(pixCnt=0; pixCnt<outlierPixCnt; pixCnt++)
-        {
-            for(i=pixCnt+1; i<outlierPixCnt; i++)
-            {
-                warn = CheckAdjacentPixels(mlx90640->outlierPixels[pixCnt],mlx90640->outlierPixels[i]);
-                if(warn != 0)
-                {
-                    return warn;
-                }    
-            }    
-        } 
-        
-        for(pixCnt=0; pixCnt<brokenPixCnt; pixCnt++)
-        {
-            for(i=0; i<outlierPixCnt; i++)
-            {
-                warn = CheckAdjacentPixels(mlx90640->brokenPixels[pixCnt],mlx90640->outlierPixels[i]);
-                if(warn != 0)
-                {
-                    return warn;
-                }    
-            }    
-        }    
-        
-    }    
-    
-    
-    return warn;
-       
-}
-
-//------------------------------------------------------------------------------
-
- int CheckAdjacentPixels(uint16_t pix1, uint16_t pix2)
- {
-     int pixPosDif;
-     
-     pixPosDif = pix1 - pix2;
-     if(pixPosDif > -34 && pixPosDif < -30)
-     {
-         return -6;
-     } 
-     if(pixPosDif > -2 && pixPosDif < 2)
-     {
-         return -6;
-     } 
-     if(pixPosDif > 30 && pixPosDif < 34)
-     {
-         return -6;
-     }
-     
-     return 0;    
- }
- 
-//------------------------------------------------------------------------------
- 
-float GetMedian(float *values, int n)
- {
-    float temp;
-    
-    for(int i=0; i<n-1; i++)
-    {
-        for(int j=i+1; j<n; j++)
-        {
-            if(values[j] < values[i]) 
-            {                
-                temp = values[i];
-                values[i] = values[j];
-                values[j] = temp;
-            }
-        }
-    }
-    
-    if(n%2==0) 
-    {
-        return ((values[n/2] + values[n/2 - 1]) / 2.0);
-        
-    } 
-    else 
-    {
-        return values[n/2];
-    }
-    
- }           
-
-//------------------------------------------------------------------------------
-
-int IsPixelBad(uint16_t pixel,paramsMLX90640 *params)
-{
-    for(int i=0; i<5; i++)
-    {
-        if(pixel == params->outlierPixels[i] || pixel == params->brokenPixels[i])
-        {
-            return 1;
-        }    
-    }   
-    
-    return 0;     
-}     
-
-//------------------------------------------------------------------------------
+/**
+ * @copyright (C) 2017 Melexis N.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <MLX90640_API.h>
+#include <math.h>
+#include <Wire.h>
+
+void ExtractVDDParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
+void ExtractPTATParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
+void ExtractGainParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
+void ExtractTgcParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
+void ExtractResolutionParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
+void ExtractKsTaParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
+void ExtractKsToParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
+void ExtractAlphaParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
+void ExtractOffsetParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
+void ExtractKtaPixelParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
+void ExtractKvPixelParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
+void ExtractCPParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
+void ExtractCILCParameters(uint16_t *eeData, paramsMLX90640 *mlx90640);
+int ExtractDeviatingPixels(uint16_t *eeData, paramsMLX90640 *mlx90640);
+int CheckAdjacentPixels(uint16_t pix1, uint16_t pix2);  
+float GetMedian(float *values, int n);
+int IsPixelBad(uint16_t pixel,paramsMLX90640 *params);
+int ValidateFrameData(uint16_t *frameData);
+int ValidateAuxData(uint16_t *auxData);
+int MLX90640_I2CRead(uint8_t addr, uint32_t reg, uint16_t len, uint16_t *reg_data);
+int MLX90640_I2CWrite(uint8_t _deviceAddress, unsigned int writeAddress, uint16_t data);
+
+// I2C
+#define I2C_BUFFER_LENGTH 128
+
+int MLX90640_I2CRead(uint8_t addr, uint32_t reg, uint16_t len, uint16_t *reg_data){
+  int bytesRemaining = len * 2;
+  int dataSpot = 0; //Start at beginning of array
+  while (bytesRemaining > 0)
+  {
+    Wire.beginTransmission(addr);
+    Wire.write(reg >> 8); //MSB
+    Wire.write(reg & 0xFF); //LSB
+    if (Wire.endTransmission(false) != 0) //Do not release bus
+    {
+      return (0); //Sensor did not ACK
+    }
+    int numberOfBytesToRead = bytesRemaining;
+    if (numberOfBytesToRead > I2C_BUFFER_LENGTH) numberOfBytesToRead = I2C_BUFFER_LENGTH;
+    Wire.requestFrom((int)addr, numberOfBytesToRead);
+    if (Wire.available())
+    {
+      for (uint32_t x = 0 ; x < numberOfBytesToRead / 2; x++)
+      {
+        reg_data[dataSpot] = Wire.read() << 8; //MSB
+        reg_data[dataSpot] |= Wire.read(); //LSB
+        dataSpot++;
+      }
+    }
+    bytesRemaining -= numberOfBytesToRead;
+    reg += numberOfBytesToRead / 2;
+  }
+  return (0); //Success
+}
+
+int MLX90640_I2CWrite(uint8_t _deviceAddress, unsigned int writeAddress, uint16_t data)
+{
+  Wire.beginTransmission((uint8_t)_deviceAddress);
+  Wire.write(writeAddress >> 8); //MSB
+  Wire.write(writeAddress & 0xFF); //LSB
+  Wire.write(data >> 8); //MSB
+  Wire.write(data & 0xFF); //LSB
+  if (Wire.endTransmission() != 0)
+  {
+    //Sensor did not ACK
+    return (-1);
+  }
+  uint16_t dataCheck;
+  MLX90640_I2CRead(_deviceAddress, writeAddress, 1, &dataCheck);
+  if (dataCheck != data)
+  {
+    return -2;
+  }
+  return (0); //Success
+}
+  
+int MLX90640_DumpEE(uint8_t slaveAddr, uint16_t *eeData)
+{
+     return MLX90640_I2CRead(slaveAddr, 0x2400, 832, eeData);
+}
+
+int MLX90640_SynchFrame(uint8_t slaveAddr)
+{
+    uint16_t dataReady = 0;
+    uint16_t statusRegister;
+    int error = 1;
+    
+    error = MLX90640_I2CWrite(slaveAddr, 0x8000, 0x0030);
+    if(error == -1)
+    {
+        return error;
+    }
+    
+    while(dataReady == 0)
+    {
+        error = MLX90640_I2CRead(slaveAddr, 0x8000, 1, &statusRegister);
+        if(error != 0)
+        {
+            return error;
+        }    
+        dataReady = statusRegister & 0x0008;
+    }      
+    
+   return 0;   
+}
+
+// int MLX90640_TriggerMeasurement(uint8_t slaveAddr) // ATM not used in Tasmota
+// {
+//     int error = 1;
+//     uint16_t ctrlReg;
+    
+//     error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &ctrlReg);
+    
+//     if ( error != 0) 
+//     {
+//         return error;
+//     }    
+                                                
+//     ctrlReg |= 0x8000;
+//     error = MLX90640_I2CWrite(slaveAddr, 0x800D, ctrlReg);
+    
+//     if ( error != 0)
+//     {
+//         return error;
+//     }    
+    
+//     // error = MLX90640_I2CGeneralReset();
+    
+//     // if ( error != 0)
+//     // {
+//     //     return error;
+//     // }    
+    
+//     error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &ctrlReg);
+    
+//     if ( error != 0)
+//     {
+//         return error;
+//     }    
+    
+//     if ((ctrlReg & 0x8000) != 0)
+//     {
+//         return -9;
+//     }
+    
+//     return 0;    
+// }
+    
+int MLX90640_GetFrameData(uint8_t slaveAddr, uint16_t *frameData)
+{
+    uint16_t dataReady = 0;
+    uint16_t controlRegister1;
+    uint16_t statusRegister;
+    int error = 1;
+    uint16_t data[64];
+    uint8_t cnt = 0;
+    
+    while(dataReady == 0)
+    {
+        error = MLX90640_I2CRead(slaveAddr, 0x8000, 1, &statusRegister);
+        if(error != 0)
+        {
+            return error;
+        }    
+        dataReady = statusRegister & 0x0008;
+    }      
+    
+    error = MLX90640_I2CWrite(slaveAddr, 0x8000, 0x0030);
+    if(error == -1)
+    {
+        return error;
+    }
+                     
+    error = MLX90640_I2CRead(slaveAddr, 0x0400, 768, frameData); 
+    if(error != 0)
+    {
+        return error;
+    }                       
+    
+    error = MLX90640_I2CRead(slaveAddr, 0x0700, 64, data); 
+    if(error != 0)
+    {
+        return error;
+    }     
+        
+    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
+    frameData[832] = controlRegister1;
+    frameData[833] = statusRegister & 0x0001;
+    
+    if(error != 0)
+    {
+        return error;
+    }
+    
+    error = ValidateAuxData(data);
+    if(error == 0)
+    {
+        for(cnt=0; cnt<64; cnt++)
+        {
+            frameData[cnt+768] = data[cnt];
+        }
+    }        
+    
+    error = ValidateFrameData(frameData);
+    if (error != 0)
+    {
+        return error;
+    }
+    
+    return frameData[833];    
+}
+
+int ValidateFrameData(uint16_t *frameData)
+{
+    uint8_t line = 0;
+    
+    for(int i=0; i<768; i+=32)
+    {
+        if((frameData[i] == 0x7FFF) && (line%2 == frameData[833])) return -8;
+        line = line + 1;
+    }    
+        
+    return 0;    
+}
+
+int ValidateAuxData(uint16_t *auxData)
+{
+    
+    if(auxData[0] == 0x7FFF) return -8;    
+    
+    for(int i=8; i<19; i++)
+    {
+        if(auxData[i] == 0x7FFF) return -8;
+    }
+    
+    for(int i=20; i<23; i++)
+    {
+        if(auxData[i] == 0x7FFF) return -8;
+    }
+    
+    for(int i=24; i<33; i++)
+    {
+        if(auxData[i] == 0x7FFF) return -8;
+    }
+    
+    for(int i=40; i<51; i++)
+    {
+        if(auxData[i] == 0x7FFF) return -8;
+    }
+    
+    for(int i=52; i<55; i++)
+    {
+        if(auxData[i] == 0x7FFF) return -8;
+    }
+    
+    for(int i=56; i<64; i++)
+    {
+        if(auxData[i] == 0x7FFF) return -8;
+    }
+    
+    return 0;
+    
+}
+    
+int MLX90640_ExtractParameters(uint16_t *eeData, paramsMLX90640 *mlx90640, int _chunk) // Tasmota
+{
+    int error = 0;
+    switch(_chunk){
+      case 0:
+        ExtractVDDParameters(eeData, mlx90640);
+        ExtractPTATParameters(eeData, mlx90640);
+        ExtractGainParameters(eeData, mlx90640);
+        ExtractTgcParameters(eeData, mlx90640);
+        ExtractResolutionParameters(eeData, mlx90640);
+        ExtractKsTaParameters(eeData, mlx90640);
+        ExtractKsToParameters(eeData, mlx90640);
+      break;
+      case 1:
+        ExtractCPParameters(eeData, mlx90640);
+        ExtractAlphaParameters(eeData, mlx90640);
+      break;
+      case 2:
+        ExtractOffsetParameters(eeData, mlx90640);
+      break;
+      case 3:
+        ExtractKtaPixelParameters(eeData, mlx90640);
+      break;
+      case 4:
+        ExtractKvPixelParameters(eeData, mlx90640);
+      break;
+      case 5:
+        ExtractCILCParameters(eeData, mlx90640);
+        error = ExtractDeviatingPixels(eeData, mlx90640);
+      break;
+    }
+    return error;
+}
+
+//------------------------------------------------------------------------------
+
+int MLX90640_SetResolution(uint8_t slaveAddr, uint8_t resolution)
+{
+    uint16_t controlRegister1;
+    int value;
+    int error;
+    
+    value = (resolution & 0x03) << 10;
+    
+    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
+    
+    if(error == 0)
+    {
+        value = (controlRegister1 & 0xF3FF) | value;
+        error = MLX90640_I2CWrite(slaveAddr, 0x800D, value);        
+    }    
+    
+    return error;
+}
+
+//------------------------------------------------------------------------------
+
+int MLX90640_GetCurResolution(uint8_t slaveAddr)
+{
+    uint16_t controlRegister1;
+    int resolutionRAM;
+    int error;
+    
+    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
+    if(error != 0)
+    {
+        return error;
+    }    
+    resolutionRAM = (controlRegister1 & 0x0C00) >> 10;
+    
+    return resolutionRAM; 
+}
+
+//------------------------------------------------------------------------------
+
+int MLX90640_SetRefreshRate(uint8_t slaveAddr, uint8_t refreshRate)
+{
+    uint16_t controlRegister1;
+    int value;
+    int error;
+    
+    value = (refreshRate & 0x07)<<7;
+    
+    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
+    if(error == 0)
+    {
+        value = (controlRegister1 & 0xFC7F) | value;
+        error = MLX90640_I2CWrite(slaveAddr, 0x800D, value);
+    }    
+    
+    return error;
+}
+
+//------------------------------------------------------------------------------
+
+int MLX90640_GetRefreshRate(uint8_t slaveAddr)
+{
+    uint16_t controlRegister1;
+    int refreshRate;
+    int error;
+    
+    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
+    if(error != 0)
+    {
+        return error;
+    }    
+    refreshRate = (controlRegister1 & 0x0380) >> 7;
+    
+    return refreshRate;
+}
+
+//------------------------------------------------------------------------------
+
+int MLX90640_SetInterleavedMode(uint8_t slaveAddr)
+{
+    uint16_t controlRegister1;
+    int value;
+    int error;
+    
+    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
+    
+    if(error == 0)
+    {
+        value = (controlRegister1 & 0xEFFF);
+        error = MLX90640_I2CWrite(slaveAddr, 0x800D, value);        
+    }    
+    
+    return error;
+}
+
+//------------------------------------------------------------------------------
+
+int MLX90640_SetChessMode(uint8_t slaveAddr)
+{
+    uint16_t controlRegister1;
+    int value;
+    int error;
+        
+    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
+    
+    if(error == 0)
+    {
+        value = (controlRegister1 | 0x1000);
+        error = MLX90640_I2CWrite(slaveAddr, 0x800D, value);        
+    }    
+    
+    return error;
+}
+
+//------------------------------------------------------------------------------
+
+int MLX90640_GetCurMode(uint8_t slaveAddr)
+{
+    uint16_t controlRegister1;
+    int modeRAM;
+    int error;
+    
+    error = MLX90640_I2CRead(slaveAddr, 0x800D, 1, &controlRegister1);
+    if(error != 0)
+    {
+        return error;
+    }    
+    modeRAM = (controlRegister1 & 0x1000) >> 12;
+    
+    return modeRAM; 
+}
+
+//------------------------------------------------------------------------------
+void MLX90640_CalculateTo(uint16_t *frameData, const paramsMLX90640 *params, float emissivity, float tr, float *result, uint8_t _part)
+{
+    float vdd;
+    float ta;
+    float ta4;
+    float tr4;
+    float taTr;
+    float gain;
+    float irDataCP[2];
+    float irData;
+    float alphaCompensated;
+    uint8_t mode;
+    int8_t ilPattern;
+    int8_t chessPattern;
+    int8_t pattern;
+    int8_t conversionPattern;
+    float Sx;
+    float To;
+    float alphaCorrR[4];
+    int8_t range;
+    uint16_t subPage;
+    float ktaScale;
+    float kvScale;
+    float alphaScale;
+    float kta;
+    float kv;
+    
+    subPage = frameData[833];
+    vdd = MLX90640_GetVdd(frameData, params);
+    ta = MLX90640_GetTa(frameData, params);
+    
+    ta4 = (ta + 273.15);
+    ta4 = ta4 * ta4;
+    ta4 = ta4 * ta4;
+    tr4 = (tr + 273.15);
+    tr4 = tr4 * tr4;
+    tr4 = tr4 * tr4;
+    taTr = tr4 - (tr4-ta4)/emissivity;
+    
+    ktaScale = pow(2,(double)params->ktaScale);
+    kvScale = pow(2,(double)params->kvScale);
+    alphaScale = pow(2,(double)params->alphaScale);
+    
+    alphaCorrR[0] = 1 / (1 + params->ksTo[0] * 40);
+    alphaCorrR[1] = 1 ;
+    alphaCorrR[2] = (1 + params->ksTo[1] * params->ct[2]);
+    alphaCorrR[3] = alphaCorrR[2] * (1 + params->ksTo[2] * (params->ct[3] - params->ct[2]));
+    
+//------------------------- Gain calculation -----------------------------------    
+    gain = frameData[778];
+    if(gain > 32767)
+    {
+        gain = gain - 65536;
+    }
+    
+    gain = params->gainEE / gain; 
+  
+//------------------------- To calculation -------------------------------------    
+    mode = (frameData[832] & 0x1000) >> 5;
+    
+    irDataCP[0] = frameData[776];  
+    irDataCP[1] = frameData[808];
+    for( int i = 0; i < 2; i++)
+    {
+        if(irDataCP[i] > 32767)
+        {
+            irDataCP[i] = irDataCP[i] - 65536;
+        }
+        irDataCP[i] = irDataCP[i] * gain;
+    }
+    irDataCP[0] = irDataCP[0] - params->cpOffset[0] * (1 + params->cpKta * (ta - 25)) * (1 + params->cpKv * (vdd - 3.3));
+    if( mode ==  params->calibrationModeEE)
+    {
+        irDataCP[1] = irDataCP[1] - params->cpOffset[1] * (1 + params->cpKta * (ta - 25)) * (1 + params->cpKv * (vdd - 3.3));
+    }
+    else
+    {
+      irDataCP[1] = irDataCP[1] - (params->cpOffset[1] + params->ilChessC[0]) * (1 + params->cpKta * (ta - 25)) * (1 + params->cpKv * (vdd - 3.3));
+    }
+
+    uint32_t _offset = _part*(768/2);
+    for( int pixelNumber = _offset; pixelNumber < (_offset+(768/2)); pixelNumber++)
+    {
+        ilPattern = pixelNumber / 32 - (pixelNumber / 64) * 2; 
+        chessPattern = ilPattern ^ (pixelNumber - (pixelNumber/2)*2); 
+        conversionPattern = ((pixelNumber + 2) / 4 - (pixelNumber + 3) / 4 + (pixelNumber + 1) / 4 - pixelNumber / 4) * (1 - 2 * ilPattern);
+        
+        if(mode == 0)
+        {
+          pattern = ilPattern; 
+        }
+        else 
+        {
+          pattern = chessPattern; 
+        }               
+        
+        if(pattern == frameData[833])
+        {    
+            irData = frameData[pixelNumber];
+            if(irData > 32767)
+            {
+                irData = irData - 65536;
+            }
+            irData = irData * gain;
+            
+            kta = params->kta[pixelNumber]/ktaScale;
+            kv = params->kv[pixelNumber]/kvScale;
+            irData = irData - params->offset[pixelNumber]*(1 + kta*(ta - 25))*(1 + kv*(vdd - 3.3));
+            
+            if(mode !=  params->calibrationModeEE)
+            {
+              irData = irData + params->ilChessC[2] * (2 * ilPattern - 1) - params->ilChessC[1] * conversionPattern; 
+            }                       
+    
+            irData = irData - params->tgc * irDataCP[subPage];
+            irData = irData / emissivity;
+            
+            alphaCompensated = SCALEALPHA*alphaScale/params->alpha[pixelNumber];
+            alphaCompensated = alphaCompensated*(1 + params->KsTa * (ta - 25));
+                        
+            Sx = alphaCompensated * alphaCompensated * alphaCompensated * (irData + alphaCompensated * taTr);
+            Sx = sqrt(sqrt(Sx)) * params->ksTo[1];            
+            
+            To = sqrt(sqrt(irData/(alphaCompensated * (1 - params->ksTo[1] * 273.15) + Sx) + taTr)) - 273.15;                     
+                    
+            if(To < params->ct[1])
+            {
+                range = 0;
+            }
+            else if(To < params->ct[2])   
+            {
+                range = 1;            
+            }   
+            else if(To < params->ct[3])
+            {
+                range = 2;            
+            }
+            else
+            {
+                range = 3;            
+            }      
+            
+            To = sqrt(sqrt(irData / (alphaCompensated * alphaCorrR[range] * (1 + params->ksTo[range] * (To - params->ct[range]))) + taTr)) - 273.15;
+                        
+            result[pixelNumber] = To;
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+
+// void MLX90640_GetImage(uint16_t *frameData, const paramsMLX90640 *params, float *result)
+// {
+//     float vdd;
+//     float ta;
+//     float gain;
+//     float irDataCP[2];
+//     float irData;
+//     float alphaCompensated;
+//     uint8_t mode;
+//     int8_t ilPattern;
+//     int8_t chessPattern;
+//     int8_t pattern;
+//     int8_t conversionPattern;
+//     float image;
+//     uint16_t subPage;
+//     float ktaScale;
+//     float kvScale;
+//     float kta;
+//     float kv;
+    
+//     subPage = frameData[833];
+//     vdd = MLX90640_GetVdd(frameData, params);
+//     ta = MLX90640_GetTa(frameData, params);
+    
+//     ktaScale = pow(2,(double)params->ktaScale);
+//     kvScale = pow(2,(double)params->kvScale);
+    
+// //------------------------- Gain calculation -----------------------------------    
+//     gain = frameData[778];
+//     if(gain > 32767)
+//     {
+//         gain = gain - 65536;
+//     }
+    
+//     gain = params->gainEE / gain; 
+  
+// //------------------------- Image calculation -------------------------------------    
+//     mode = (frameData[832] & 0x1000) >> 5;
+    
+//     irDataCP[0] = frameData[776];  
+//     irDataCP[1] = frameData[808];
+//     for( int i = 0; i < 2; i++)
+//     {
+//         if(irDataCP[i] > 32767)
+//         {
+//             irDataCP[i] = irDataCP[i] - 65536;
+//         }
+//         irDataCP[i] = irDataCP[i] * gain;
+//     }
+//     irDataCP[0] = irDataCP[0] - params->cpOffset[0] * (1 + params->cpKta * (ta - 25)) * (1 + params->cpKv * (vdd - 3.3));
+//     if( mode ==  params->calibrationModeEE)
+//     {
+//         irDataCP[1] = irDataCP[1] - params->cpOffset[1] * (1 + params->cpKta * (ta - 25)) * (1 + params->cpKv * (vdd - 3.3));
+//     }
+//     else
+//     {
+//       irDataCP[1] = irDataCP[1] - (params->cpOffset[1] + params->ilChessC[0]) * (1 + params->cpKta * (ta - 25)) * (1 + params->cpKv * (vdd - 3.3));
+//     }
+
+//     for( int pixelNumber = 0; pixelNumber < 768; pixelNumber++)
+//     {
+//         ilPattern = pixelNumber / 32 - (pixelNumber / 64) * 2; 
+//         chessPattern = ilPattern ^ (pixelNumber - (pixelNumber/2)*2); 
+//         conversionPattern = ((pixelNumber + 2) / 4 - (pixelNumber + 3) / 4 + (pixelNumber + 1) / 4 - pixelNumber / 4) * (1 - 2 * ilPattern);
+        
+//         if(mode == 0)
+//         {
+//           pattern = ilPattern; 
+//         }
+//         else 
+//         {
+//           pattern = chessPattern; 
+//         }
+        
+//         if(pattern == frameData[833])
+//         {    
+//             irData = frameData[pixelNumber];
+//             if(irData > 32767)
+//             {
+//                 irData = irData - 65536;
+//             }
+//             irData = irData * gain;
+            
+//             kta = params->kta[pixelNumber]/ktaScale;
+//             kv = params->kv[pixelNumber]/kvScale;
+//             irData = irData - params->offset[pixelNumber]*(1 + kta*(ta - 25))*(1 + kv*(vdd - 3.3));
+
+//             if(mode !=  params->calibrationModeEE)
+//             {
+//               irData = irData + params->ilChessC[2] * (2 * ilPattern - 1) - params->ilChessC[1] * conversionPattern; 
+//             }
+            
+//             irData = irData - params->tgc * irDataCP[subPage];
+                        
+//             alphaCompensated = params->alpha[pixelNumber];
+            
+//             image = irData*alphaCompensated;
+            
+//             result[pixelNumber] = image;
+//         }
+//     }
+// }
+
+//------------------------------------------------------------------------------
+
+float MLX90640_GetVdd(uint16_t *frameData, const paramsMLX90640 *params)
+{
+    float vdd;
+    float resolutionCorrection;
+
+    int resolutionRAM;    
+    
+    vdd = frameData[810];
+    if(vdd > 32767)
+    {
+        vdd = vdd - 65536;
+    }
+    resolutionRAM = (frameData[832] & 0x0C00) >> 10;
+    resolutionCorrection = pow(2, (double)params->resolutionEE) / pow(2, (double)resolutionRAM);
+    vdd = (resolutionCorrection * vdd - params->vdd25) / params->kVdd + 3.3;
+    
+    return vdd;
+}
+
+//------------------------------------------------------------------------------
+
+float MLX90640_GetTa(uint16_t *frameData, const paramsMLX90640 *params)
+{
+    float ptat;
+    float ptatArt;
+    float vdd;
+    float ta;
+    
+    vdd = MLX90640_GetVdd(frameData, params);
+    
+    ptat = frameData[800];
+    if(ptat > 32767)
+    {
+        ptat = ptat - 65536;
+    }
+    
+    ptatArt = frameData[768];
+    if(ptatArt > 32767)
+    {
+        ptatArt = ptatArt - 65536;
+    }
+    ptatArt = (ptat / (ptat * params->alphaPTAT + ptatArt)) * pow(2, (double)18);
+    
+    ta = (ptatArt / (1 + params->KvPTAT * (vdd - 3.3)) - params->vPTAT25);
+    ta = ta / params->KtPTAT + 25;
+    
+    return ta;
+}
+
+//------------------------------------------------------------------------------
+
+int MLX90640_GetSubPageNumber(uint16_t *frameData)
+{
+    return frameData[833];    
+
+}    
+
+//------------------------------------------------------------------------------
+void MLX90640_BadPixelsCorrection(uint16_t *pixels, float *to, int mode, paramsMLX90640 *params)
+{   
+    float ap[4];
+    uint8_t pix;
+    uint8_t line;
+    uint8_t column;
+    
+    pix = 0;
+    while(pixels[pix] != 0xFFFF)
+    {
+        line = pixels[pix]>>5;
+        column = pixels[pix] - (line<<5);
+        
+        if(mode == 1)
+        {        
+            if(line == 0)
+            {
+                if(column == 0)
+                {        
+                    to[pixels[pix]] = to[33];                    
+                }
+                else if(column == 31)
+                {
+                    to[pixels[pix]] = to[62];                      
+                }
+                else
+                {
+                    to[pixels[pix]] = (to[pixels[pix]+31] + to[pixels[pix]+33])/2.0;                    
+                }        
+            }
+            else if(line == 23)
+            {
+                if(column == 0)
+                {
+                    to[pixels[pix]] = to[705];                    
+                }
+                else if(column == 31)
+                {
+                    to[pixels[pix]] = to[734];                       
+                }
+                else
+                {
+                    to[pixels[pix]] = (to[pixels[pix]-33] + to[pixels[pix]-31])/2.0;                       
+                }                       
+            } 
+            else if(column == 0)
+            {
+                to[pixels[pix]] = (to[pixels[pix]-31] + to[pixels[pix]+33])/2.0;                
+            }
+            else if(column == 31)
+            {
+                to[pixels[pix]] = (to[pixels[pix]-33] + to[pixels[pix]+31])/2.0;                
+            } 
+            else
+            {
+                ap[0] = to[pixels[pix]-33];
+                ap[1] = to[pixels[pix]-31];
+                ap[2] = to[pixels[pix]+31];
+                ap[3] = to[pixels[pix]+33];
+                to[pixels[pix]] = GetMedian(ap,4);
+            }                   
+        }
+        else
+        {        
+            if(column == 0)
+            {
+                to[pixels[pix]] = to[pixels[pix]+1];            
+            }
+            else if(column == 1 || column == 30)
+            {
+                to[pixels[pix]] = (to[pixels[pix]-1]+to[pixels[pix]+1])/2.0;                
+            } 
+            else if(column == 31)
+            {
+                to[pixels[pix]] = to[pixels[pix]-1];
+            } 
+            else
+            {
+                if(IsPixelBad(pixels[pix]-2,params) == 0 && IsPixelBad(pixels[pix]+2,params) == 0)
+                {
+                    ap[0] = to[pixels[pix]+1] - to[pixels[pix]+2];
+                    ap[1] = to[pixels[pix]-1] - to[pixels[pix]-2];
+                    if(fabs(ap[0]) > fabs(ap[1]))
+                    {
+                        to[pixels[pix]] = to[pixels[pix]-1] + ap[1];                        
+                    }
+                    else
+                    {
+                        to[pixels[pix]] = to[pixels[pix]+1] + ap[0];                        
+                    }
+                }
+                else
+                {
+                    to[pixels[pix]] = (to[pixels[pix]-1]+to[pixels[pix]+1])/2.0;                    
+                }            
+            }                      
+        } 
+        pix = pix + 1;    
+    }    
+}
+
+//------------------------------------------------------------------------------
+
+void ExtractVDDParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    int16_t kVdd;
+    int16_t vdd25;
+    
+    kVdd = eeData[51];
+    
+    kVdd = (eeData[51] & 0xFF00) >> 8;
+    if(kVdd > 127)
+    {
+        kVdd = kVdd - 256;
+    }
+    kVdd = 32 * kVdd;
+    vdd25 = eeData[51] & 0x00FF;
+    vdd25 = ((vdd25 - 256) << 5) - 8192;
+    
+    mlx90640->kVdd = kVdd;
+    mlx90640->vdd25 = vdd25; 
+}
+
+//------------------------------------------------------------------------------
+
+void ExtractPTATParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    float KvPTAT;
+    float KtPTAT;
+    int16_t vPTAT25;
+    float alphaPTAT;
+    
+    KvPTAT = (eeData[50] & 0xFC00) >> 10;
+    if(KvPTAT > 31)
+    {
+        KvPTAT = KvPTAT - 64;
+    }
+    KvPTAT = KvPTAT/4096;
+    
+    KtPTAT = eeData[50] & 0x03FF;
+    if(KtPTAT > 511)
+    {
+        KtPTAT = KtPTAT - 1024;
+    }
+    KtPTAT = KtPTAT/8;
+    
+    vPTAT25 = eeData[49];
+    
+    alphaPTAT = (eeData[16] & 0xF000) / pow(2, (double)14) + 8.0f;
+    
+    mlx90640->KvPTAT = KvPTAT;
+    mlx90640->KtPTAT = KtPTAT;    
+    mlx90640->vPTAT25 = vPTAT25;
+    mlx90640->alphaPTAT = alphaPTAT;   
+}
+
+//------------------------------------------------------------------------------
+
+void ExtractGainParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    int16_t gainEE;
+    
+    gainEE = eeData[48];
+    if(gainEE > 32767)
+    {
+        gainEE = gainEE -65536;
+    }
+    
+    mlx90640->gainEE = gainEE;    
+}
+
+//------------------------------------------------------------------------------
+
+void ExtractTgcParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    float tgc;
+    tgc = eeData[60] & 0x00FF;
+    if(tgc > 127)
+    {
+        tgc = tgc - 256;
+    }
+    tgc = tgc / 32.0f;
+    
+    mlx90640->tgc = tgc;        
+}
+
+//------------------------------------------------------------------------------
+
+void ExtractResolutionParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    uint8_t resolutionEE;
+    resolutionEE = (eeData[56] & 0x3000) >> 12;    
+    
+    mlx90640->resolutionEE = resolutionEE;
+}
+
+//------------------------------------------------------------------------------
+
+void ExtractKsTaParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    float KsTa;
+    KsTa = (eeData[60] & 0xFF00) >> 8;
+    if(KsTa > 127)
+    {
+        KsTa = KsTa -256;
+    }
+    KsTa = KsTa / 8192.0f;
+    
+    mlx90640->KsTa = KsTa;
+}
+
+//------------------------------------------------------------------------------
+
+void ExtractKsToParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    int KsToScale;
+    int8_t step;
+    
+    step = ((eeData[63] & 0x3000) >> 12) * 10;
+    
+    mlx90640->ct[0] = -40;
+    mlx90640->ct[1] = 0;
+    mlx90640->ct[2] = (eeData[63] & 0x00F0) >> 4;
+    mlx90640->ct[3] = (eeData[63] & 0x0F00) >> 8;    
+    
+    mlx90640->ct[2] = mlx90640->ct[2]*step;
+    mlx90640->ct[3] = mlx90640->ct[2] + mlx90640->ct[3]*step;
+    mlx90640->ct[4] = 400;
+    
+    KsToScale = (eeData[63] & 0x000F) + 8;
+    KsToScale = 1 << KsToScale;
+    
+    mlx90640->ksTo[0] = eeData[61] & 0x00FF;
+    mlx90640->ksTo[1] = (eeData[61] & 0xFF00) >> 8;
+    mlx90640->ksTo[2] = eeData[62] & 0x00FF;
+    mlx90640->ksTo[3] = (eeData[62] & 0xFF00) >> 8;      
+    
+    for(int i = 0; i < 4; i++)
+    {
+        if(mlx90640->ksTo[i] > 127)
+        {
+            mlx90640->ksTo[i] = mlx90640->ksTo[i] - 256;
+        }
+        mlx90640->ksTo[i] = mlx90640->ksTo[i] / KsToScale;
+    } 
+    
+    mlx90640->ksTo[4] = -0.0002;
+}
+
+//------------------------------------------------------------------------------
+
+void ExtractAlphaParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    int accRow[24];
+    int accColumn[32];
+    int p = 0;
+    int alphaRef;
+    uint8_t alphaScale;
+    uint8_t accRowScale;
+    uint8_t accColumnScale;
+    uint8_t accRemScale;
+    float alphaTemp[768];
+    float temp;
+    
+
+    accRemScale = eeData[32] & 0x000F;
+    accColumnScale = (eeData[32] & 0x00F0) >> 4;
+    accRowScale = (eeData[32] & 0x0F00) >> 8;
+    alphaScale = ((eeData[32] & 0xF000) >> 12) + 30;
+    alphaRef = eeData[33];
+    
+    for(int i = 0; i < 6; i++)
+    {
+        p = i * 4;
+        accRow[p + 0] = (eeData[34 + i] & 0x000F);
+        accRow[p + 1] = (eeData[34 + i] & 0x00F0) >> 4;
+        accRow[p + 2] = (eeData[34 + i] & 0x0F00) >> 8;
+        accRow[p + 3] = (eeData[34 + i] & 0xF000) >> 12;
+    }
+    
+    for(int i = 0; i < 24; i++)
+    {
+        if (accRow[i] > 7)
+        {
+            accRow[i] = accRow[i] - 16;
+        }
+    }
+    
+    for(int i = 0; i < 8; i++)
+    {
+        p = i * 4;
+        accColumn[p + 0] = (eeData[40 + i] & 0x000F);
+        accColumn[p + 1] = (eeData[40 + i] & 0x00F0) >> 4;
+        accColumn[p + 2] = (eeData[40 + i] & 0x0F00) >> 8;
+        accColumn[p + 3] = (eeData[40 + i] & 0xF000) >> 12;
+    }
+    
+    for(int i = 0; i < 32; i ++)
+    {
+        if (accColumn[i] > 7)
+        {
+            accColumn[i] = accColumn[i] - 16;
+        }
+    }
+
+    for(int i = 0; i < 24; i++)
+    {
+        for(int j = 0; j < 32; j ++)
+        {
+            p = 32 * i +j;
+            alphaTemp[p] = (eeData[64 + p] & 0x03F0) >> 4;
+            if (alphaTemp[p] > 31)
+            {
+                alphaTemp[p] = alphaTemp[p] - 64;
+            }
+            alphaTemp[p] = alphaTemp[p]*(1 << accRemScale);
+            alphaTemp[p] = (alphaRef + (accRow[i] << accRowScale) + (accColumn[j] << accColumnScale) + alphaTemp[p]);
+            alphaTemp[p] = alphaTemp[p] / pow(2,(double)alphaScale);
+            alphaTemp[p] = alphaTemp[p] - mlx90640->tgc * (mlx90640->cpAlpha[0] + mlx90640->cpAlpha[1])/2;
+            alphaTemp[p] = SCALEALPHA/alphaTemp[p];
+        }
+    }
+    
+    temp = alphaTemp[0];
+    for(int i = 1; i < 768; i++)
+    {
+        if (alphaTemp[i] > temp)
+        {
+            temp = alphaTemp[i];
+        }
+    }
+    
+    alphaScale = 0;
+    while(temp < 32767.4)
+    {
+        temp = temp*2;
+        alphaScale = alphaScale + 1;
+    } 
+    
+    for(int i = 0; i < 768; i++)
+    {
+        temp = alphaTemp[i] * pow(2,(double)alphaScale);        
+        mlx90640->alpha[i] = (temp + 0.5);        
+        
+    } 
+    
+    mlx90640->alphaScale = alphaScale;      
+   
+}
+
+//------------------------------------------------------------------------------
+
+void ExtractOffsetParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    int occRow[24];
+    int occColumn[32];
+    int p = 0;
+    int16_t offsetRef;
+    uint8_t occRowScale;
+    uint8_t occColumnScale;
+    uint8_t occRemScale;
+    
+
+    occRemScale = (eeData[16] & 0x000F);
+    occColumnScale = (eeData[16] & 0x00F0) >> 4;
+    occRowScale = (eeData[16] & 0x0F00) >> 8;
+    offsetRef = eeData[17];
+    if (offsetRef > 32767)
+    {
+        offsetRef = offsetRef - 65536;
+    }
+    
+    for(int i = 0; i < 6; i++)
+    {
+        p = i * 4;
+        occRow[p + 0] = (eeData[18 + i] & 0x000F);
+        occRow[p + 1] = (eeData[18 + i] & 0x00F0) >> 4;
+        occRow[p + 2] = (eeData[18 + i] & 0x0F00) >> 8;
+        occRow[p + 3] = (eeData[18 + i] & 0xF000) >> 12;
+    }
+    
+    for(int i = 0; i < 24; i++)
+    {
+        if (occRow[i] > 7)
+        {
+            occRow[i] = occRow[i] - 16;
+        }
+    }
+    
+    for(int i = 0; i < 8; i++)
+    {
+        p = i * 4;
+        occColumn[p + 0] = (eeData[24 + i] & 0x000F);
+        occColumn[p + 1] = (eeData[24 + i] & 0x00F0) >> 4;
+        occColumn[p + 2] = (eeData[24 + i] & 0x0F00) >> 8;
+        occColumn[p + 3] = (eeData[24 + i] & 0xF000) >> 12;
+    }
+    
+    for(int i = 0; i < 32; i ++)
+    {
+        if (occColumn[i] > 7)
+        {
+            occColumn[i] = occColumn[i] - 16;
+        }
+    }
+
+    for(int i = 0; i < 24; i++)
+    {
+        for(int j = 0; j < 32; j ++)
+        {
+            p = 32 * i +j;
+            mlx90640->offset[p] = (eeData[64 + p] & 0xFC00) >> 10;
+            if (mlx90640->offset[p] > 31)
+            {
+                mlx90640->offset[p] = mlx90640->offset[p] - 64;
+            }
+            mlx90640->offset[p] = mlx90640->offset[p]*(1 << occRemScale);
+            mlx90640->offset[p] = (offsetRef + (occRow[i] << occRowScale) + (occColumn[j] << occColumnScale) + mlx90640->offset[p]);
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+
+void ExtractKtaPixelParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    int p = 0;
+    int8_t KtaRC[4];
+    int8_t KtaRoCo;
+    int8_t KtaRoCe;
+    int8_t KtaReCo;
+    int8_t KtaReCe;
+    uint8_t ktaScale1;
+    uint8_t ktaScale2;
+    uint8_t split;
+    float ktaTemp[768];
+    float temp;
+    
+    KtaRoCo = (eeData[54] & 0xFF00) >> 8;
+    if (KtaRoCo > 127)
+    {
+        KtaRoCo = KtaRoCo - 256;
+    }
+    KtaRC[0] = KtaRoCo;
+    
+    KtaReCo = (eeData[54] & 0x00FF);
+    if (KtaReCo > 127)
+    {
+        KtaReCo = KtaReCo - 256;
+    }
+    KtaRC[2] = KtaReCo;
+      
+    KtaRoCe = (eeData[55] & 0xFF00) >> 8;
+    if (KtaRoCe > 127)
+    {
+        KtaRoCe = KtaRoCe - 256;
+    }
+    KtaRC[1] = KtaRoCe;
+      
+    KtaReCe = (eeData[55] & 0x00FF);
+    if (KtaReCe > 127)
+    {
+        KtaReCe = KtaReCe - 256;
+    }
+    KtaRC[3] = KtaReCe;
+  
+    ktaScale1 = ((eeData[56] & 0x00F0) >> 4) + 8;
+    ktaScale2 = (eeData[56] & 0x000F);
+
+    for(int i = 0; i < 24; i++)
+    {
+        for(int j = 0; j < 32; j ++)
+        {
+            p = 32 * i +j;
+            split = 2*(p/32 - (p/64)*2) + p%2;
+            ktaTemp[p] = (eeData[64 + p] & 0x000E) >> 1;
+            if (ktaTemp[p] > 3)
+            {
+                ktaTemp[p] = ktaTemp[p] - 8;
+            }
+            ktaTemp[p] = ktaTemp[p] * (1 << ktaScale2);
+            ktaTemp[p] = KtaRC[split] + ktaTemp[p];
+            ktaTemp[p] = ktaTemp[p] / pow(2,(double)ktaScale1);
+            //ktaTemp[p] = ktaTemp[p] * mlx90640->offset[p];
+        }
+    }
+    
+    temp = fabs(ktaTemp[0]);
+    for(int i = 1; i < 768; i++)
+    {
+        if (fabs(ktaTemp[i]) > temp)
+        {
+            temp = fabs(ktaTemp[i]);
+        }
+    }
+    
+    ktaScale1 = 0;
+    while(temp < 63.4)
+    {
+        temp = temp*2;
+        ktaScale1 = ktaScale1 + 1;
+    }    
+     
+    for(int i = 0; i < 768; i++)
+    {
+        temp = ktaTemp[i] * pow(2,(double)ktaScale1);
+        if (temp < 0)
+        {
+            mlx90640->kta[i] = (temp - 0.5);
+        }
+        else
+        {
+            mlx90640->kta[i] = (temp + 0.5);
+        }        
+        
+    } 
+    
+    mlx90640->ktaScale = ktaScale1;           
+}
+
+
+//------------------------------------------------------------------------------
+
+void ExtractKvPixelParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    int p = 0;
+    int8_t KvT[4];
+    int8_t KvRoCo;
+    int8_t KvRoCe;
+    int8_t KvReCo;
+    int8_t KvReCe;
+    uint8_t kvScale;
+    uint8_t split;
+    float kvTemp[768];
+    float temp;
+
+    KvRoCo = (eeData[52] & 0xF000) >> 12;
+    if (KvRoCo > 7)
+    {
+        KvRoCo = KvRoCo - 16;
+    }
+    KvT[0] = KvRoCo;
+    
+    KvReCo = (eeData[52] & 0x0F00) >> 8;
+    if (KvReCo > 7)
+    {
+        KvReCo = KvReCo - 16;
+    }
+    KvT[2] = KvReCo;
+      
+    KvRoCe = (eeData[52] & 0x00F0) >> 4;
+    if (KvRoCe > 7)
+    {
+        KvRoCe = KvRoCe - 16;
+    }
+    KvT[1] = KvRoCe;
+      
+    KvReCe = (eeData[52] & 0x000F);
+    if (KvReCe > 7)
+    {
+        KvReCe = KvReCe - 16;
+    }
+    KvT[3] = KvReCe;
+  
+    kvScale = (eeData[56] & 0x0F00) >> 8;
+
+
+    for(int i = 0; i < 24; i++)
+    {
+        for(int j = 0; j < 32; j ++)
+        {
+            p = 32 * i +j;
+            split = 2*(p/32 - (p/64)*2) + p%2;
+            kvTemp[p] = KvT[split];
+            kvTemp[p] = kvTemp[p] / pow(2,(double)kvScale);
+            //kvTemp[p] = kvTemp[p] * mlx90640->offset[p];
+        }
+    }
+    
+    temp = fabs(kvTemp[0]);
+    for(int i = 1; i < 768; i++)
+    {
+        if (fabs(kvTemp[i]) > temp)
+        {
+            temp = fabs(kvTemp[i]);
+        }
+    }
+    
+    kvScale = 0;
+    while(temp < 63.4)
+    {
+        temp = temp*2;
+        kvScale = kvScale + 1;
+    }
+     
+    for(int i = 0; i < 768; i++)
+    {
+        temp = kvTemp[i] * pow(2,(double)kvScale);
+        if (temp < 0)
+        {
+            mlx90640->kv[i] = (temp - 0.5);
+        }
+        else
+        {
+            mlx90640->kv[i] = (temp + 0.5);
+        }        
+        
+    } 
+    
+    mlx90640->kvScale = kvScale;        
+}
+
+//------------------------------------------------------------------------------
+
+void ExtractCPParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    float alphaSP[2];
+    int16_t offsetSP[2];
+    float cpKv;
+    float cpKta;
+    uint8_t alphaScale;
+    uint8_t ktaScale1;
+    uint8_t kvScale;
+
+    alphaScale = ((eeData[32] & 0xF000) >> 12) + 27;
+    
+    offsetSP[0] = (eeData[58] & 0x03FF);
+    if (offsetSP[0] > 511)
+    {
+        offsetSP[0] = offsetSP[0] - 1024;
+    }
+    
+    offsetSP[1] = (eeData[58] & 0xFC00) >> 10;
+    if (offsetSP[1] > 31)
+    {
+        offsetSP[1] = offsetSP[1] - 64;
+    }
+    offsetSP[1] = offsetSP[1] + offsetSP[0]; 
+    
+    alphaSP[0] = (eeData[57] & 0x03FF);
+    if (alphaSP[0] > 511)
+    {
+        alphaSP[0] = alphaSP[0] - 1024;
+    }
+    alphaSP[0] = alphaSP[0] /  pow(2,(double)alphaScale);
+    
+    alphaSP[1] = (eeData[57] & 0xFC00) >> 10;
+    if (alphaSP[1] > 31)
+    {
+        alphaSP[1] = alphaSP[1] - 64;
+    }
+    alphaSP[1] = (1 + alphaSP[1]/128) * alphaSP[0];
+    
+    cpKta = (eeData[59] & 0x00FF);
+    if (cpKta > 127)
+    {
+        cpKta = cpKta - 256;
+    }
+    ktaScale1 = ((eeData[56] & 0x00F0) >> 4) + 8;    
+    mlx90640->cpKta = cpKta / pow(2,(double)ktaScale1);
+    
+    cpKv = (eeData[59] & 0xFF00) >> 8;
+    if (cpKv > 127)
+    {
+        cpKv = cpKv - 256;
+    }
+    kvScale = (eeData[56] & 0x0F00) >> 8;
+    mlx90640->cpKv = cpKv / pow(2,(double)kvScale);
+       
+    mlx90640->cpAlpha[0] = alphaSP[0];
+    mlx90640->cpAlpha[1] = alphaSP[1];
+    mlx90640->cpOffset[0] = offsetSP[0];
+    mlx90640->cpOffset[1] = offsetSP[1];  
+}
+
+//------------------------------------------------------------------------------
+
+void ExtractCILCParameters(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    float ilChessC[3];
+    uint8_t calibrationModeEE;
+    
+    calibrationModeEE = (eeData[10] & 0x0800) >> 4;
+    calibrationModeEE = calibrationModeEE ^ 0x80;
+
+    ilChessC[0] = (eeData[53] & 0x003F);
+    if (ilChessC[0] > 31)
+    {
+        ilChessC[0] = ilChessC[0] - 64;
+    }
+    ilChessC[0] = ilChessC[0] / 16.0f;
+    
+    ilChessC[1] = (eeData[53] & 0x07C0) >> 6;
+    if (ilChessC[1] > 15)
+    {
+        ilChessC[1] = ilChessC[1] - 32;
+    }
+    ilChessC[1] = ilChessC[1] / 2.0f;
+    
+    ilChessC[2] = (eeData[53] & 0xF800) >> 11;
+    if (ilChessC[2] > 15)
+    {
+        ilChessC[2] = ilChessC[2] - 32;
+    }
+    ilChessC[2] = ilChessC[2] / 8.0f;
+    
+    mlx90640->calibrationModeEE = calibrationModeEE;
+    mlx90640->ilChessC[0] = ilChessC[0];
+    mlx90640->ilChessC[1] = ilChessC[1];
+    mlx90640->ilChessC[2] = ilChessC[2];
+}
+
+//------------------------------------------------------------------------------
+
+int ExtractDeviatingPixels(uint16_t *eeData, paramsMLX90640 *mlx90640)
+{
+    uint16_t pixCnt = 0;
+    uint16_t brokenPixCnt = 0;
+    uint16_t outlierPixCnt = 0;
+    int warn = 0;
+    int i;
+    
+    for(pixCnt = 0; pixCnt<5; pixCnt++)
+    {
+        mlx90640->brokenPixels[pixCnt] = 0xFFFF;
+        mlx90640->outlierPixels[pixCnt] = 0xFFFF;
+    }
+        
+    pixCnt = 0;    
+    while (pixCnt < 768 && brokenPixCnt < 5 && outlierPixCnt < 5)
+    {
+        if(eeData[pixCnt+64] == 0)
+        {
+            mlx90640->brokenPixels[brokenPixCnt] = pixCnt;
+            brokenPixCnt = brokenPixCnt + 1;
+        }    
+        else if((eeData[pixCnt+64] & 0x0001) != 0)
+        {
+            mlx90640->outlierPixels[outlierPixCnt] = pixCnt;
+            outlierPixCnt = outlierPixCnt + 1;
+        }    
+        
+        pixCnt = pixCnt + 1;
+        
+    } 
+    
+    if(brokenPixCnt > 4)  
+    {
+        warn = -3;
+    }         
+    else if(outlierPixCnt > 4)  
+    {
+        warn = -4;
+    }
+    else if((brokenPixCnt + outlierPixCnt) > 4)  
+    {
+        warn = -5;
+    } 
+    else
+    {
+        for(pixCnt=0; pixCnt<brokenPixCnt; pixCnt++)
+        {
+            for(i=pixCnt+1; i<brokenPixCnt; i++)
+            {
+                warn = CheckAdjacentPixels(mlx90640->brokenPixels[pixCnt],mlx90640->brokenPixels[i]);
+                if(warn != 0)
+                {
+                    return warn;
+                }    
+            }    
+        }
+        
+        for(pixCnt=0; pixCnt<outlierPixCnt; pixCnt++)
+        {
+            for(i=pixCnt+1; i<outlierPixCnt; i++)
+            {
+                warn = CheckAdjacentPixels(mlx90640->outlierPixels[pixCnt],mlx90640->outlierPixels[i]);
+                if(warn != 0)
+                {
+                    return warn;
+                }    
+            }    
+        } 
+        
+        for(pixCnt=0; pixCnt<brokenPixCnt; pixCnt++)
+        {
+            for(i=0; i<outlierPixCnt; i++)
+            {
+                warn = CheckAdjacentPixels(mlx90640->brokenPixels[pixCnt],mlx90640->outlierPixels[i]);
+                if(warn != 0)
+                {
+                    return warn;
+                }    
+            }    
+        }    
+        
+    }    
+    
+    
+    return warn;
+       
+}
+
+//------------------------------------------------------------------------------
+
+ int CheckAdjacentPixels(uint16_t pix1, uint16_t pix2)
+ {
+     int pixPosDif;
+     
+     pixPosDif = pix1 - pix2;
+     if(pixPosDif > -34 && pixPosDif < -30)
+     {
+         return -6;
+     } 
+     if(pixPosDif > -2 && pixPosDif < 2)
+     {
+         return -6;
+     } 
+     if(pixPosDif > 30 && pixPosDif < 34)
+     {
+         return -6;
+     }
+     
+     return 0;    
+ }
+ 
+//------------------------------------------------------------------------------
+ 
+float GetMedian(float *values, int n)
+ {
+    float temp;
+    
+    for(int i=0; i<n-1; i++)
+    {
+        for(int j=i+1; j<n; j++)
+        {
+            if(values[j] < values[i]) 
+            {                
+                temp = values[i];
+                values[i] = values[j];
+                values[j] = temp;
+            }
+        }
+    }
+    
+    if(n%2==0) 
+    {
+        return ((values[n/2] + values[n/2 - 1]) / 2.0);
+        
+    } 
+    else 
+    {
+        return values[n/2];
+    }
+    
+ }           
+
+//------------------------------------------------------------------------------
+
+int IsPixelBad(uint16_t pixel,paramsMLX90640 *params)
+{
+    for(int i=0; i<5; i++)
+    {
+        if(pixel == params->outlierPixels[i] || pixel == params->brokenPixels[i])
+        {
+            return 1;
+        }    
+    }   
+    
+    return 0;     
+}     
+
+//------------------------------------------------------------------------------
diff --git a/lib/mlx90640-library/MLX90640_API.h b/lib/lib_i2c/mlx90640-library/MLX90640_API.h
similarity index 97%
rename from lib/mlx90640-library/MLX90640_API.h
rename to lib/lib_i2c/mlx90640-library/MLX90640_API.h
index efbcdff5b..e820e7ee0 100644
--- a/lib/mlx90640-library/MLX90640_API.h
+++ b/lib/lib_i2c/mlx90640-library/MLX90640_API.h
@@ -1,74 +1,74 @@
-/**
- * @copyright (C) 2017 Melexis N.V.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#ifndef _MLX90640_API_H_
-#define _MLX90640_API_H_
-
-#include <stdint.h>
-
-#define SCALEALPHA 0.000001
-    
-typedef struct
-    {
-        int16_t kVdd;
-        int16_t vdd25;
-        float KvPTAT;
-        float KtPTAT;
-        uint16_t vPTAT25;
-        float alphaPTAT;
-        int16_t gainEE;
-        float tgc;
-        float cpKv;
-        float cpKta;
-        uint8_t resolutionEE;
-        uint8_t calibrationModeEE;
-        float KsTa;
-        float ksTo[5];
-        int16_t ct[5];
-        uint16_t alpha[768];    
-        uint8_t alphaScale;
-        int16_t offset[768];    
-        int8_t kta[768];
-        uint8_t ktaScale;    
-        int8_t kv[768];
-        uint8_t kvScale;
-        float cpAlpha[2];
-        int16_t cpOffset[2];
-        float ilChessC[3]; 
-        uint16_t brokenPixels[5];
-        uint16_t outlierPixels[5];  
-    } paramsMLX90640;
-    
-    int MLX90640_DumpEE(uint8_t slaveAddr, uint16_t *eeData);
-    int MLX90640_SynchFrame(uint8_t slaveAddr);
-    // int MLX90640_TriggerMeasurement(uint8_t slaveAddr);
-    int MLX90640_GetFrameData(uint8_t slaveAddr, uint16_t *frameData);
-    int MLX90640_ExtractParameters(uint16_t *eeData, paramsMLX90640 *mlx90640,int _chunk);
-    float MLX90640_GetVdd(uint16_t *frameData, const paramsMLX90640 *params);
-    float MLX90640_GetTa(uint16_t *frameData, const paramsMLX90640 *params);
-    // void MLX90640_GetImage(uint16_t *frameData, const paramsMLX90640 *params, float *result);
-    void MLX90640_CalculateTo(uint16_t *frameData, const paramsMLX90640 *params, float emissivity, float tr, float *result, uint8_t _part);
-    int MLX90640_SetResolution(uint8_t slaveAddr, uint8_t resolution);
-    int MLX90640_GetCurResolution(uint8_t slaveAddr);
-    int MLX90640_SetRefreshRate(uint8_t slaveAddr, uint8_t refreshRate);   
-    int MLX90640_GetRefreshRate(uint8_t slaveAddr);  
-    int MLX90640_GetSubPageNumber(uint16_t *frameData);
-    int MLX90640_GetCurMode(uint8_t slaveAddr); 
-    int MLX90640_SetInterleavedMode(uint8_t slaveAddr);
-    int MLX90640_SetChessMode(uint8_t slaveAddr);
-    void MLX90640_BadPixelsCorrection(uint16_t *pixels, float *to, int mode, paramsMLX90640 *params);
-    
-#endif
+/**
+ * @copyright (C) 2017 Melexis N.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+#ifndef _MLX90640_API_H_
+#define _MLX90640_API_H_
+
+#include <stdint.h>
+
+#define SCALEALPHA 0.000001
+    
+typedef struct
+    {
+        int16_t kVdd;
+        int16_t vdd25;
+        float KvPTAT;
+        float KtPTAT;
+        uint16_t vPTAT25;
+        float alphaPTAT;
+        int16_t gainEE;
+        float tgc;
+        float cpKv;
+        float cpKta;
+        uint8_t resolutionEE;
+        uint8_t calibrationModeEE;
+        float KsTa;
+        float ksTo[5];
+        int16_t ct[5];
+        uint16_t alpha[768];    
+        uint8_t alphaScale;
+        int16_t offset[768];    
+        int8_t kta[768];
+        uint8_t ktaScale;    
+        int8_t kv[768];
+        uint8_t kvScale;
+        float cpAlpha[2];
+        int16_t cpOffset[2];
+        float ilChessC[3]; 
+        uint16_t brokenPixels[5];
+        uint16_t outlierPixels[5];  
+    } paramsMLX90640;
+    
+    int MLX90640_DumpEE(uint8_t slaveAddr, uint16_t *eeData);
+    int MLX90640_SynchFrame(uint8_t slaveAddr);
+    // int MLX90640_TriggerMeasurement(uint8_t slaveAddr);
+    int MLX90640_GetFrameData(uint8_t slaveAddr, uint16_t *frameData);
+    int MLX90640_ExtractParameters(uint16_t *eeData, paramsMLX90640 *mlx90640,int _chunk);
+    float MLX90640_GetVdd(uint16_t *frameData, const paramsMLX90640 *params);
+    float MLX90640_GetTa(uint16_t *frameData, const paramsMLX90640 *params);
+    // void MLX90640_GetImage(uint16_t *frameData, const paramsMLX90640 *params, float *result);
+    void MLX90640_CalculateTo(uint16_t *frameData, const paramsMLX90640 *params, float emissivity, float tr, float *result, uint8_t _part);
+    int MLX90640_SetResolution(uint8_t slaveAddr, uint8_t resolution);
+    int MLX90640_GetCurResolution(uint8_t slaveAddr);
+    int MLX90640_SetRefreshRate(uint8_t slaveAddr, uint8_t refreshRate);   
+    int MLX90640_GetRefreshRate(uint8_t slaveAddr);  
+    int MLX90640_GetSubPageNumber(uint16_t *frameData);
+    int MLX90640_GetCurMode(uint8_t slaveAddr); 
+    int MLX90640_SetInterleavedMode(uint8_t slaveAddr);
+    int MLX90640_SetChessMode(uint8_t slaveAddr);
+    void MLX90640_BadPixelsCorrection(uint16_t *pixels, float *to, int mode, paramsMLX90640 *params);
+    
+#endif
diff --git a/lib/mlx90640-library/library.properties b/lib/lib_i2c/mlx90640-library/library.properties
similarity index 100%
rename from lib/mlx90640-library/library.properties
rename to lib/lib_i2c/mlx90640-library/library.properties
diff --git a/lib/vl53l0x-arduino-1.02/.travis.yml b/lib/lib_i2c/vl53l0x-arduino-1.02/.travis.yml
similarity index 100%
rename from lib/vl53l0x-arduino-1.02/.travis.yml
rename to lib/lib_i2c/vl53l0x-arduino-1.02/.travis.yml
diff --git a/lib/vl53l0x-arduino-1.02/LICENSE.txt b/lib/lib_i2c/vl53l0x-arduino-1.02/LICENSE.txt
similarity index 100%
rename from lib/vl53l0x-arduino-1.02/LICENSE.txt
rename to lib/lib_i2c/vl53l0x-arduino-1.02/LICENSE.txt
diff --git a/lib/vl53l0x-arduino-1.02/README.md b/lib/lib_i2c/vl53l0x-arduino-1.02/README.md
similarity index 100%
rename from lib/vl53l0x-arduino-1.02/README.md
rename to lib/lib_i2c/vl53l0x-arduino-1.02/README.md
diff --git a/lib/vl53l0x-arduino-1.02/VL53L0X.cpp b/lib/lib_i2c/vl53l0x-arduino-1.02/VL53L0X.cpp
similarity index 100%
rename from lib/vl53l0x-arduino-1.02/VL53L0X.cpp
rename to lib/lib_i2c/vl53l0x-arduino-1.02/VL53L0X.cpp
diff --git a/lib/vl53l0x-arduino-1.02/VL53L0X.h b/lib/lib_i2c/vl53l0x-arduino-1.02/VL53L0X.h
similarity index 100%
rename from lib/vl53l0x-arduino-1.02/VL53L0X.h
rename to lib/lib_i2c/vl53l0x-arduino-1.02/VL53L0X.h
diff --git a/lib/vl53l0x-arduino-1.02/examples/Continuous/Continuous.ino b/lib/lib_i2c/vl53l0x-arduino-1.02/examples/Continuous/Continuous.ino
similarity index 100%
rename from lib/vl53l0x-arduino-1.02/examples/Continuous/Continuous.ino
rename to lib/lib_i2c/vl53l0x-arduino-1.02/examples/Continuous/Continuous.ino
diff --git a/lib/vl53l0x-arduino-1.02/examples/Single/Single.ino b/lib/lib_i2c/vl53l0x-arduino-1.02/examples/Single/Single.ino
similarity index 100%
rename from lib/vl53l0x-arduino-1.02/examples/Single/Single.ino
rename to lib/lib_i2c/vl53l0x-arduino-1.02/examples/Single/Single.ino
diff --git a/lib/vl53l0x-arduino-1.02/keywords.txt b/lib/lib_i2c/vl53l0x-arduino-1.02/keywords.txt
similarity index 100%
rename from lib/vl53l0x-arduino-1.02/keywords.txt
rename to lib/lib_i2c/vl53l0x-arduino-1.02/keywords.txt
diff --git a/lib/vl53l0x-arduino-1.02/library.properties b/lib/lib_i2c/vl53l0x-arduino-1.02/library.properties
similarity index 100%
rename from lib/vl53l0x-arduino-1.02/library.properties
rename to lib/lib_i2c/vl53l0x-arduino-1.02/library.properties
diff --git a/lib/vl53l1x-arduino-1.01/LICENSE.txt b/lib/lib_i2c/vl53l1x-arduino-1.01/LICENSE.txt
similarity index 100%
rename from lib/vl53l1x-arduino-1.01/LICENSE.txt
rename to lib/lib_i2c/vl53l1x-arduino-1.01/LICENSE.txt
diff --git a/lib/vl53l1x-arduino-1.01/README.md b/lib/lib_i2c/vl53l1x-arduino-1.01/README.md
similarity index 100%
rename from lib/vl53l1x-arduino-1.01/README.md
rename to lib/lib_i2c/vl53l1x-arduino-1.01/README.md
diff --git a/lib/vl53l1x-arduino-1.01/VL53L1X.cpp b/lib/lib_i2c/vl53l1x-arduino-1.01/VL53L1X.cpp
similarity index 100%
rename from lib/vl53l1x-arduino-1.01/VL53L1X.cpp
rename to lib/lib_i2c/vl53l1x-arduino-1.01/VL53L1X.cpp
diff --git a/lib/vl53l1x-arduino-1.01/VL53L1X.h b/lib/lib_i2c/vl53l1x-arduino-1.01/VL53L1X.h
similarity index 100%
rename from lib/vl53l1x-arduino-1.01/VL53L1X.h
rename to lib/lib_i2c/vl53l1x-arduino-1.01/VL53L1X.h
diff --git a/lib/vl53l1x-arduino-1.01/examples/Continuous/Continuous.ino b/lib/lib_i2c/vl53l1x-arduino-1.01/examples/Continuous/Continuous.ino
similarity index 100%
rename from lib/vl53l1x-arduino-1.01/examples/Continuous/Continuous.ino
rename to lib/lib_i2c/vl53l1x-arduino-1.01/examples/Continuous/Continuous.ino
diff --git a/lib/vl53l1x-arduino-1.01/examples/ContinuousWithDetails/ContinuousWithDetails.ino b/lib/lib_i2c/vl53l1x-arduino-1.01/examples/ContinuousWithDetails/ContinuousWithDetails.ino
similarity index 100%
rename from lib/vl53l1x-arduino-1.01/examples/ContinuousWithDetails/ContinuousWithDetails.ino
rename to lib/lib_i2c/vl53l1x-arduino-1.01/examples/ContinuousWithDetails/ContinuousWithDetails.ino
diff --git a/lib/vl53l1x-arduino-1.01/keywords.txt b/lib/lib_i2c/vl53l1x-arduino-1.01/keywords.txt
similarity index 100%
rename from lib/vl53l1x-arduino-1.01/keywords.txt
rename to lib/lib_i2c/vl53l1x-arduino-1.01/keywords.txt
diff --git a/lib/vl53l1x-arduino-1.01/library.properties b/lib/lib_i2c/vl53l1x-arduino-1.01/library.properties
similarity index 100%
rename from lib/vl53l1x-arduino-1.01/library.properties
rename to lib/lib_i2c/vl53l1x-arduino-1.01/library.properties
diff --git a/lib/KeeloqLib/README.md b/lib/lib_rf/KeeloqLib/README.md
similarity index 100%
rename from lib/KeeloqLib/README.md
rename to lib/lib_rf/KeeloqLib/README.md
diff --git a/lib/KeeloqLib/keywords.txt b/lib/lib_rf/KeeloqLib/keywords.txt
similarity index 100%
rename from lib/KeeloqLib/keywords.txt
rename to lib/lib_rf/KeeloqLib/keywords.txt
diff --git a/lib/KeeloqLib/library.properties b/lib/lib_rf/KeeloqLib/library.properties
similarity index 100%
rename from lib/KeeloqLib/library.properties
rename to lib/lib_rf/KeeloqLib/library.properties
diff --git a/lib/KeeloqLib/src/KeeloqLib.cpp b/lib/lib_rf/KeeloqLib/src/KeeloqLib.cpp
similarity index 100%
rename from lib/KeeloqLib/src/KeeloqLib.cpp
rename to lib/lib_rf/KeeloqLib/src/KeeloqLib.cpp
diff --git a/lib/KeeloqLib/src/KeeloqLib.h b/lib/lib_rf/KeeloqLib/src/KeeloqLib.h
similarity index 100%
rename from lib/KeeloqLib/src/KeeloqLib.h
rename to lib/lib_rf/KeeloqLib/src/KeeloqLib.h
diff --git a/lib/KeeloqLib/tests/KeeloqLibTest/KeeloqLibTest.ino b/lib/lib_rf/KeeloqLib/tests/KeeloqLibTest/KeeloqLibTest.ino
similarity index 100%
rename from lib/KeeloqLib/tests/KeeloqLibTest/KeeloqLibTest.ino
rename to lib/lib_rf/KeeloqLib/tests/KeeloqLibTest/KeeloqLibTest.ino
diff --git a/lib/RF24/.gitignore b/lib/lib_rf/RF24/.gitignore
similarity index 100%
rename from lib/RF24/.gitignore
rename to lib/lib_rf/RF24/.gitignore
diff --git a/lib/RF24/CONTRIBUTING.md b/lib/lib_rf/RF24/CONTRIBUTING.md
similarity index 100%
rename from lib/RF24/CONTRIBUTING.md
rename to lib/lib_rf/RF24/CONTRIBUTING.md
diff --git a/lib/RF24/Doxyfile b/lib/lib_rf/RF24/Doxyfile
similarity index 100%
rename from lib/RF24/Doxyfile
rename to lib/lib_rf/RF24/Doxyfile
diff --git a/lib/RF24/LICENSE b/lib/lib_rf/RF24/LICENSE
similarity index 100%
rename from lib/RF24/LICENSE
rename to lib/lib_rf/RF24/LICENSE
diff --git a/lib/RF24/Makefile b/lib/lib_rf/RF24/Makefile
similarity index 100%
rename from lib/RF24/Makefile
rename to lib/lib_rf/RF24/Makefile
diff --git a/lib/RF24/README.md b/lib/lib_rf/RF24/README.md
similarity index 100%
rename from lib/RF24/README.md
rename to lib/lib_rf/RF24/README.md
diff --git a/lib/RF24/RF24.cpp b/lib/lib_rf/RF24/RF24.cpp
similarity index 100%
rename from lib/RF24/RF24.cpp
rename to lib/lib_rf/RF24/RF24.cpp
diff --git a/lib/RF24/RF24.h b/lib/lib_rf/RF24/RF24.h
similarity index 100%
rename from lib/RF24/RF24.h
rename to lib/lib_rf/RF24/RF24.h
diff --git a/lib/RF24/RF24_config.h b/lib/lib_rf/RF24/RF24_config.h
similarity index 100%
rename from lib/RF24/RF24_config.h
rename to lib/lib_rf/RF24/RF24_config.h
diff --git a/lib/RF24/configure b/lib/lib_rf/RF24/configure
old mode 100755
new mode 100644
similarity index 100%
rename from lib/RF24/configure
rename to lib/lib_rf/RF24/configure
diff --git a/lib/RF24/doxygen-custom.css b/lib/lib_rf/RF24/doxygen-custom.css
similarity index 100%
rename from lib/RF24/doxygen-custom.css
rename to lib/lib_rf/RF24/doxygen-custom.css
diff --git a/lib/RF24/examples/GettingStarted/GettingStarted.ino b/lib/lib_rf/RF24/examples/GettingStarted/GettingStarted.ino
similarity index 100%
rename from lib/RF24/examples/GettingStarted/GettingStarted.ino
rename to lib/lib_rf/RF24/examples/GettingStarted/GettingStarted.ino
diff --git a/lib/RF24/examples/GettingStarted_CallResponse/GettingStarted_CallResponse.ino b/lib/lib_rf/RF24/examples/GettingStarted_CallResponse/GettingStarted_CallResponse.ino
similarity index 100%
rename from lib/RF24/examples/GettingStarted_CallResponse/GettingStarted_CallResponse.ino
rename to lib/lib_rf/RF24/examples/GettingStarted_CallResponse/GettingStarted_CallResponse.ino
diff --git a/lib/RF24/examples/GettingStarted_HandlingData/GettingStarted_HandlingData.ino b/lib/lib_rf/RF24/examples/GettingStarted_HandlingData/GettingStarted_HandlingData.ino
old mode 100755
new mode 100644
similarity index 100%
rename from lib/RF24/examples/GettingStarted_HandlingData/GettingStarted_HandlingData.ino
rename to lib/lib_rf/RF24/examples/GettingStarted_HandlingData/GettingStarted_HandlingData.ino
diff --git a/lib/RF24/examples/GettingStarted_HandlingFailures/GettingStarted_HandlingFailures.ino b/lib/lib_rf/RF24/examples/GettingStarted_HandlingFailures/GettingStarted_HandlingFailures.ino
similarity index 100%
rename from lib/RF24/examples/GettingStarted_HandlingFailures/GettingStarted_HandlingFailures.ino
rename to lib/lib_rf/RF24/examples/GettingStarted_HandlingFailures/GettingStarted_HandlingFailures.ino
diff --git a/lib/RF24/examples/Transfer/Transfer.ino b/lib/lib_rf/RF24/examples/Transfer/Transfer.ino
similarity index 100%
rename from lib/RF24/examples/Transfer/Transfer.ino
rename to lib/lib_rf/RF24/examples/Transfer/Transfer.ino
diff --git a/lib/RF24/examples/TransferTimeouts/TransferTimeouts.ino b/lib/lib_rf/RF24/examples/TransferTimeouts/TransferTimeouts.ino
similarity index 100%
rename from lib/RF24/examples/TransferTimeouts/TransferTimeouts.ino
rename to lib/lib_rf/RF24/examples/TransferTimeouts/TransferTimeouts.ino
diff --git a/lib/RF24/examples/Usage/led_remote/Jamfile b/lib/lib_rf/RF24/examples/Usage/led_remote/Jamfile
similarity index 100%
rename from lib/RF24/examples/Usage/led_remote/Jamfile
rename to lib/lib_rf/RF24/examples/Usage/led_remote/Jamfile
diff --git a/lib/RF24/examples/Usage/led_remote/led_remote.pde b/lib/lib_rf/RF24/examples/Usage/led_remote/led_remote.pde
similarity index 100%
rename from lib/RF24/examples/Usage/led_remote/led_remote.pde
rename to lib/lib_rf/RF24/examples/Usage/led_remote/led_remote.pde
diff --git a/lib/RF24/examples/Usage/nordic_fob/Jamfile b/lib/lib_rf/RF24/examples/Usage/nordic_fob/Jamfile
similarity index 100%
rename from lib/RF24/examples/Usage/nordic_fob/Jamfile
rename to lib/lib_rf/RF24/examples/Usage/nordic_fob/Jamfile
diff --git a/lib/RF24/examples/Usage/nordic_fob/nordic_fob.pde b/lib/lib_rf/RF24/examples/Usage/nordic_fob/nordic_fob.pde
similarity index 100%
rename from lib/RF24/examples/Usage/nordic_fob/nordic_fob.pde
rename to lib/lib_rf/RF24/examples/Usage/nordic_fob/nordic_fob.pde
diff --git a/lib/RF24/examples/Usage/pingpair_maple/Jamfile b/lib/lib_rf/RF24/examples/Usage/pingpair_maple/Jamfile
similarity index 100%
rename from lib/RF24/examples/Usage/pingpair_maple/Jamfile
rename to lib/lib_rf/RF24/examples/Usage/pingpair_maple/Jamfile
diff --git a/lib/RF24/examples/Usage/pingpair_maple/main.cpp b/lib/lib_rf/RF24/examples/Usage/pingpair_maple/main.cpp
similarity index 100%
rename from lib/RF24/examples/Usage/pingpair_maple/main.cpp
rename to lib/lib_rf/RF24/examples/Usage/pingpair_maple/main.cpp
diff --git a/lib/RF24/examples/Usage/pingpair_maple/pingpair_maple.pde b/lib/lib_rf/RF24/examples/Usage/pingpair_maple/pingpair_maple.pde
similarity index 100%
rename from lib/RF24/examples/Usage/pingpair_maple/pingpair_maple.pde
rename to lib/lib_rf/RF24/examples/Usage/pingpair_maple/pingpair_maple.pde
diff --git a/lib/RF24/examples/Usage/readme.md b/lib/lib_rf/RF24/examples/Usage/readme.md
similarity index 100%
rename from lib/RF24/examples/Usage/readme.md
rename to lib/lib_rf/RF24/examples/Usage/readme.md
diff --git a/lib/RF24/examples/pingpair_ack/pingpair_ack.ino b/lib/lib_rf/RF24/examples/pingpair_ack/pingpair_ack.ino
similarity index 100%
rename from lib/RF24/examples/pingpair_ack/pingpair_ack.ino
rename to lib/lib_rf/RF24/examples/pingpair_ack/pingpair_ack.ino
diff --git a/lib/RF24/examples/pingpair_dyn/Jamfile b/lib/lib_rf/RF24/examples/pingpair_dyn/Jamfile
similarity index 100%
rename from lib/RF24/examples/pingpair_dyn/Jamfile
rename to lib/lib_rf/RF24/examples/pingpair_dyn/Jamfile
diff --git a/lib/RF24/examples/pingpair_dyn/pingpair_dyn.ino b/lib/lib_rf/RF24/examples/pingpair_dyn/pingpair_dyn.ino
similarity index 100%
rename from lib/RF24/examples/pingpair_dyn/pingpair_dyn.ino
rename to lib/lib_rf/RF24/examples/pingpair_dyn/pingpair_dyn.ino
diff --git a/lib/RF24/examples/pingpair_irq/pingpair_irq.ino b/lib/lib_rf/RF24/examples/pingpair_irq/pingpair_irq.ino
similarity index 100%
rename from lib/RF24/examples/pingpair_irq/pingpair_irq.ino
rename to lib/lib_rf/RF24/examples/pingpair_irq/pingpair_irq.ino
diff --git a/lib/RF24/examples/pingpair_irq_simple/pingpair_irq_simple.ino b/lib/lib_rf/RF24/examples/pingpair_irq_simple/pingpair_irq_simple.ino
similarity index 100%
rename from lib/RF24/examples/pingpair_irq_simple/pingpair_irq_simple.ino
rename to lib/lib_rf/RF24/examples/pingpair_irq_simple/pingpair_irq_simple.ino
diff --git a/lib/RF24/examples/pingpair_multi_dyn/Jamfile b/lib/lib_rf/RF24/examples/pingpair_multi_dyn/Jamfile
old mode 100755
new mode 100644
similarity index 100%
rename from lib/RF24/examples/pingpair_multi_dyn/Jamfile
rename to lib/lib_rf/RF24/examples/pingpair_multi_dyn/Jamfile
diff --git a/lib/RF24/examples/pingpair_multi_dyn/pingpair_multi_dyn.ino b/lib/lib_rf/RF24/examples/pingpair_multi_dyn/pingpair_multi_dyn.ino
similarity index 100%
rename from lib/RF24/examples/pingpair_multi_dyn/pingpair_multi_dyn.ino
rename to lib/lib_rf/RF24/examples/pingpair_multi_dyn/pingpair_multi_dyn.ino
diff --git a/lib/RF24/examples/pingpair_sleepy/pingpair_sleepy.ino b/lib/lib_rf/RF24/examples/pingpair_sleepy/pingpair_sleepy.ino
similarity index 100%
rename from lib/RF24/examples/pingpair_sleepy/pingpair_sleepy.ino
rename to lib/lib_rf/RF24/examples/pingpair_sleepy/pingpair_sleepy.ino
diff --git a/lib/RF24/examples/rf24_ATTiny/rf24ping85/rf24ping85.ino b/lib/lib_rf/RF24/examples/rf24_ATTiny/rf24ping85/rf24ping85.ino
similarity index 100%
rename from lib/RF24/examples/rf24_ATTiny/rf24ping85/rf24ping85.ino
rename to lib/lib_rf/RF24/examples/rf24_ATTiny/rf24ping85/rf24ping85.ino
diff --git a/lib/RF24/examples/rf24_ATTiny/timingSearch3pin/timingSearch3pin.ino b/lib/lib_rf/RF24/examples/rf24_ATTiny/timingSearch3pin/timingSearch3pin.ino
similarity index 100%
rename from lib/RF24/examples/rf24_ATTiny/timingSearch3pin/timingSearch3pin.ino
rename to lib/lib_rf/RF24/examples/rf24_ATTiny/timingSearch3pin/timingSearch3pin.ino
diff --git a/lib/RF24/examples/scanner/Jamfile b/lib/lib_rf/RF24/examples/scanner/Jamfile
similarity index 100%
rename from lib/RF24/examples/scanner/Jamfile
rename to lib/lib_rf/RF24/examples/scanner/Jamfile
diff --git a/lib/RF24/examples/scanner/scanner.ino b/lib/lib_rf/RF24/examples/scanner/scanner.ino
similarity index 100%
rename from lib/RF24/examples/scanner/scanner.ino
rename to lib/lib_rf/RF24/examples/scanner/scanner.ino
diff --git a/lib/RF24/examples/starping/Jamfile b/lib/lib_rf/RF24/examples/starping/Jamfile
similarity index 100%
rename from lib/RF24/examples/starping/Jamfile
rename to lib/lib_rf/RF24/examples/starping/Jamfile
diff --git a/lib/RF24/examples/starping/starping.pde b/lib/lib_rf/RF24/examples/starping/starping.pde
similarity index 100%
rename from lib/RF24/examples/starping/starping.pde
rename to lib/lib_rf/RF24/examples/starping/starping.pde
diff --git a/lib/RF24/examples_linux/Makefile.examples b/lib/lib_rf/RF24/examples_linux/Makefile.examples
similarity index 100%
rename from lib/RF24/examples_linux/Makefile.examples
rename to lib/lib_rf/RF24/examples_linux/Makefile.examples
diff --git a/lib/RF24/examples_linux/extra/Makefile b/lib/lib_rf/RF24/examples_linux/extra/Makefile
similarity index 100%
rename from lib/RF24/examples_linux/extra/Makefile
rename to lib/lib_rf/RF24/examples_linux/extra/Makefile
diff --git a/lib/RF24/examples_linux/extra/rpi-hub.cpp b/lib/lib_rf/RF24/examples_linux/extra/rpi-hub.cpp
similarity index 100%
rename from lib/RF24/examples_linux/extra/rpi-hub.cpp
rename to lib/lib_rf/RF24/examples_linux/extra/rpi-hub.cpp
diff --git a/lib/RF24/examples_linux/extra/scanner.cpp b/lib/lib_rf/RF24/examples_linux/extra/scanner.cpp
similarity index 100%
rename from lib/RF24/examples_linux/extra/scanner.cpp
rename to lib/lib_rf/RF24/examples_linux/extra/scanner.cpp
diff --git a/lib/RF24/examples_linux/gettingstarted.cpp b/lib/lib_rf/RF24/examples_linux/gettingstarted.cpp
similarity index 100%
rename from lib/RF24/examples_linux/gettingstarted.cpp
rename to lib/lib_rf/RF24/examples_linux/gettingstarted.cpp
diff --git a/lib/RF24/examples_linux/gettingstarted_call_response.cpp b/lib/lib_rf/RF24/examples_linux/gettingstarted_call_response.cpp
similarity index 100%
rename from lib/RF24/examples_linux/gettingstarted_call_response.cpp
rename to lib/lib_rf/RF24/examples_linux/gettingstarted_call_response.cpp
diff --git a/lib/RF24/examples_linux/interrupts/Makefile b/lib/lib_rf/RF24/examples_linux/interrupts/Makefile
similarity index 100%
rename from lib/RF24/examples_linux/interrupts/Makefile
rename to lib/lib_rf/RF24/examples_linux/interrupts/Makefile
diff --git a/lib/RF24/examples_linux/interrupts/gettingstarted_call_response_int.cpp b/lib/lib_rf/RF24/examples_linux/interrupts/gettingstarted_call_response_int.cpp
similarity index 100%
rename from lib/RF24/examples_linux/interrupts/gettingstarted_call_response_int.cpp
rename to lib/lib_rf/RF24/examples_linux/interrupts/gettingstarted_call_response_int.cpp
diff --git a/lib/RF24/examples_linux/interrupts/gettingstarted_call_response_int2.cpp b/lib/lib_rf/RF24/examples_linux/interrupts/gettingstarted_call_response_int2.cpp
similarity index 100%
rename from lib/RF24/examples_linux/interrupts/gettingstarted_call_response_int2.cpp
rename to lib/lib_rf/RF24/examples_linux/interrupts/gettingstarted_call_response_int2.cpp
diff --git a/lib/RF24/examples_linux/interrupts/pingpair_dyn_int.cpp b/lib/lib_rf/RF24/examples_linux/interrupts/pingpair_dyn_int.cpp
similarity index 100%
rename from lib/RF24/examples_linux/interrupts/pingpair_dyn_int.cpp
rename to lib/lib_rf/RF24/examples_linux/interrupts/pingpair_dyn_int.cpp
diff --git a/lib/RF24/examples_linux/interrupts/transfer_interrupt.cpp b/lib/lib_rf/RF24/examples_linux/interrupts/transfer_interrupt.cpp
similarity index 100%
rename from lib/RF24/examples_linux/interrupts/transfer_interrupt.cpp
rename to lib/lib_rf/RF24/examples_linux/interrupts/transfer_interrupt.cpp
diff --git a/lib/RF24/examples_linux/pingpair_dyn.cpp b/lib/lib_rf/RF24/examples_linux/pingpair_dyn.cpp
similarity index 100%
rename from lib/RF24/examples_linux/pingpair_dyn.cpp
rename to lib/lib_rf/RF24/examples_linux/pingpair_dyn.cpp
diff --git a/lib/RF24/examples_linux/pingpair_dyn.py b/lib/lib_rf/RF24/examples_linux/pingpair_dyn.py
old mode 100755
new mode 100644
similarity index 100%
rename from lib/RF24/examples_linux/pingpair_dyn.py
rename to lib/lib_rf/RF24/examples_linux/pingpair_dyn.py
diff --git a/lib/RF24/examples_linux/readme.md b/lib/lib_rf/RF24/examples_linux/readme.md
similarity index 100%
rename from lib/RF24/examples_linux/readme.md
rename to lib/lib_rf/RF24/examples_linux/readme.md
diff --git a/lib/RF24/examples_linux/transfer.cpp b/lib/lib_rf/RF24/examples_linux/transfer.cpp
similarity index 100%
rename from lib/RF24/examples_linux/transfer.cpp
rename to lib/lib_rf/RF24/examples_linux/transfer.cpp
diff --git a/lib/RF24/keywords.txt b/lib/lib_rf/RF24/keywords.txt
similarity index 100%
rename from lib/RF24/keywords.txt
rename to lib/lib_rf/RF24/keywords.txt
diff --git a/lib/RF24/library.json b/lib/lib_rf/RF24/library.json
similarity index 100%
rename from lib/RF24/library.json
rename to lib/lib_rf/RF24/library.json
diff --git a/lib/RF24/library.properties b/lib/lib_rf/RF24/library.properties
similarity index 100%
rename from lib/RF24/library.properties
rename to lib/lib_rf/RF24/library.properties
diff --git a/lib/RF24/nRF24L01.h b/lib/lib_rf/RF24/nRF24L01.h
similarity index 100%
rename from lib/RF24/nRF24L01.h
rename to lib/lib_rf/RF24/nRF24L01.h
diff --git a/lib/RF24/printf.h b/lib/lib_rf/RF24/printf.h
similarity index 100%
rename from lib/RF24/printf.h
rename to lib/lib_rf/RF24/printf.h
diff --git a/lib/RF24/pyRF24/crossunixccompiler.py b/lib/lib_rf/RF24/pyRF24/crossunixccompiler.py
similarity index 100%
rename from lib/RF24/pyRF24/crossunixccompiler.py
rename to lib/lib_rf/RF24/pyRF24/crossunixccompiler.py
diff --git a/lib/RF24/pyRF24/pyRF24.cpp b/lib/lib_rf/RF24/pyRF24/pyRF24.cpp
similarity index 100%
rename from lib/RF24/pyRF24/pyRF24.cpp
rename to lib/lib_rf/RF24/pyRF24/pyRF24.cpp
diff --git a/lib/RF24/pyRF24/pyRF24/crossunixccompiler.py b/lib/lib_rf/RF24/pyRF24/pyRF24/crossunixccompiler.py
similarity index 100%
rename from lib/RF24/pyRF24/pyRF24/crossunixccompiler.py
rename to lib/lib_rf/RF24/pyRF24/pyRF24/crossunixccompiler.py
diff --git a/lib/RF24/pyRF24/pyRF24/pyRF24.cpp b/lib/lib_rf/RF24/pyRF24/pyRF24/pyRF24.cpp
similarity index 100%
rename from lib/RF24/pyRF24/pyRF24/pyRF24.cpp
rename to lib/lib_rf/RF24/pyRF24/pyRF24/pyRF24.cpp
diff --git a/lib/RF24/pyRF24/pyRF24/readme.md b/lib/lib_rf/RF24/pyRF24/pyRF24/readme.md
similarity index 100%
rename from lib/RF24/pyRF24/pyRF24/readme.md
rename to lib/lib_rf/RF24/pyRF24/pyRF24/readme.md
diff --git a/lib/RF24/pyRF24/pyRF24/setup.py b/lib/lib_rf/RF24/pyRF24/pyRF24/setup.py
similarity index 100%
rename from lib/RF24/pyRF24/pyRF24/setup.py
rename to lib/lib_rf/RF24/pyRF24/pyRF24/setup.py
diff --git a/lib/RF24/pyRF24/pyRF24Mesh/example_master.py b/lib/lib_rf/RF24/pyRF24/pyRF24Mesh/example_master.py
similarity index 100%
rename from lib/RF24/pyRF24/pyRF24Mesh/example_master.py
rename to lib/lib_rf/RF24/pyRF24/pyRF24Mesh/example_master.py
diff --git a/lib/RF24/pyRF24/pyRF24Mesh/pyRF24Mesh.cpp b/lib/lib_rf/RF24/pyRF24/pyRF24Mesh/pyRF24Mesh.cpp
similarity index 100%
rename from lib/RF24/pyRF24/pyRF24Mesh/pyRF24Mesh.cpp
rename to lib/lib_rf/RF24/pyRF24/pyRF24Mesh/pyRF24Mesh.cpp
diff --git a/lib/RF24/pyRF24/pyRF24Mesh/setup.py b/lib/lib_rf/RF24/pyRF24/pyRF24Mesh/setup.py
similarity index 100%
rename from lib/RF24/pyRF24/pyRF24Mesh/setup.py
rename to lib/lib_rf/RF24/pyRF24/pyRF24Mesh/setup.py
diff --git a/lib/RF24/pyRF24/pyRF24Network/examples/helloworld_rx.py b/lib/lib_rf/RF24/pyRF24/pyRF24Network/examples/helloworld_rx.py
similarity index 100%
rename from lib/RF24/pyRF24/pyRF24Network/examples/helloworld_rx.py
rename to lib/lib_rf/RF24/pyRF24/pyRF24Network/examples/helloworld_rx.py
diff --git a/lib/RF24/pyRF24/pyRF24Network/examples/helloworld_tx.py b/lib/lib_rf/RF24/pyRF24/pyRF24Network/examples/helloworld_tx.py
similarity index 100%
rename from lib/RF24/pyRF24/pyRF24Network/examples/helloworld_tx.py
rename to lib/lib_rf/RF24/pyRF24/pyRF24Network/examples/helloworld_tx.py
diff --git a/lib/RF24/pyRF24/pyRF24Network/pyRF24Network.cpp b/lib/lib_rf/RF24/pyRF24/pyRF24Network/pyRF24Network.cpp
similarity index 100%
rename from lib/RF24/pyRF24/pyRF24Network/pyRF24Network.cpp
rename to lib/lib_rf/RF24/pyRF24/pyRF24Network/pyRF24Network.cpp
diff --git a/lib/RF24/pyRF24/pyRF24Network/setup.py b/lib/lib_rf/RF24/pyRF24/pyRF24Network/setup.py
similarity index 100%
rename from lib/RF24/pyRF24/pyRF24Network/setup.py
rename to lib/lib_rf/RF24/pyRF24/pyRF24Network/setup.py
diff --git a/lib/RF24/pyRF24/readme.md b/lib/lib_rf/RF24/pyRF24/readme.md
similarity index 100%
rename from lib/RF24/pyRF24/readme.md
rename to lib/lib_rf/RF24/pyRF24/readme.md
diff --git a/lib/RF24/pyRF24/setup.py b/lib/lib_rf/RF24/pyRF24/setup.py
similarity index 100%
rename from lib/RF24/pyRF24/setup.py
rename to lib/lib_rf/RF24/pyRF24/setup.py
diff --git a/lib/RF24/tests/README b/lib/lib_rf/RF24/tests/README
similarity index 100%
rename from lib/RF24/tests/README
rename to lib/lib_rf/RF24/tests/README
diff --git a/lib/RF24/tests/native/Jamfile b/lib/lib_rf/RF24/tests/native/Jamfile
similarity index 100%
rename from lib/RF24/tests/native/Jamfile
rename to lib/lib_rf/RF24/tests/native/Jamfile
diff --git a/lib/RF24/tests/native/pingpair_irq.pde b/lib/lib_rf/RF24/tests/native/pingpair_irq.pde
similarity index 100%
rename from lib/RF24/tests/native/pingpair_irq.pde
rename to lib/lib_rf/RF24/tests/native/pingpair_irq.pde
diff --git a/lib/RF24/tests/native/printf.h b/lib/lib_rf/RF24/tests/native/printf.h
similarity index 100%
rename from lib/RF24/tests/native/printf.h
rename to lib/lib_rf/RF24/tests/native/printf.h
diff --git a/lib/RF24/tests/pingpair_blocking/Jamfile b/lib/lib_rf/RF24/tests/pingpair_blocking/Jamfile
similarity index 100%
rename from lib/RF24/tests/pingpair_blocking/Jamfile
rename to lib/lib_rf/RF24/tests/pingpair_blocking/Jamfile
diff --git a/lib/RF24/tests/pingpair_blocking/pingpair_blocking.pde b/lib/lib_rf/RF24/tests/pingpair_blocking/pingpair_blocking.pde
similarity index 100%
rename from lib/RF24/tests/pingpair_blocking/pingpair_blocking.pde
rename to lib/lib_rf/RF24/tests/pingpair_blocking/pingpair_blocking.pde
diff --git a/lib/RF24/tests/pingpair_blocking/printf.h b/lib/lib_rf/RF24/tests/pingpair_blocking/printf.h
similarity index 100%
rename from lib/RF24/tests/pingpair_blocking/printf.h
rename to lib/lib_rf/RF24/tests/pingpair_blocking/printf.h
diff --git a/lib/RF24/tests/pingpair_blocking/runtest.py b/lib/lib_rf/RF24/tests/pingpair_blocking/runtest.py
old mode 100755
new mode 100644
similarity index 100%
rename from lib/RF24/tests/pingpair_blocking/runtest.py
rename to lib/lib_rf/RF24/tests/pingpair_blocking/runtest.py
diff --git a/lib/RF24/tests/pingpair_blocking/runtests.sh b/lib/lib_rf/RF24/tests/pingpair_blocking/runtests.sh
old mode 100755
new mode 100644
similarity index 100%
rename from lib/RF24/tests/pingpair_blocking/runtests.sh
rename to lib/lib_rf/RF24/tests/pingpair_blocking/runtests.sh
diff --git a/lib/RF24/tests/pingpair_blocking/test.ex b/lib/lib_rf/RF24/tests/pingpair_blocking/test.ex
old mode 100755
new mode 100644
similarity index 100%
rename from lib/RF24/tests/pingpair_blocking/test.ex
rename to lib/lib_rf/RF24/tests/pingpair_blocking/test.ex
diff --git a/lib/RF24/tests/pingpair_test/Jamfile b/lib/lib_rf/RF24/tests/pingpair_test/Jamfile
similarity index 100%
rename from lib/RF24/tests/pingpair_test/Jamfile
rename to lib/lib_rf/RF24/tests/pingpair_test/Jamfile
diff --git a/lib/RF24/tests/pingpair_test/pingpair_test.pde b/lib/lib_rf/RF24/tests/pingpair_test/pingpair_test.pde
similarity index 100%
rename from lib/RF24/tests/pingpair_test/pingpair_test.pde
rename to lib/lib_rf/RF24/tests/pingpair_test/pingpair_test.pde
diff --git a/lib/RF24/tests/pingpair_test/printf.h b/lib/lib_rf/RF24/tests/pingpair_test/printf.h
similarity index 100%
rename from lib/RF24/tests/pingpair_test/printf.h
rename to lib/lib_rf/RF24/tests/pingpair_test/printf.h
diff --git a/lib/RF24/tests/pingpair_test/runtest.py b/lib/lib_rf/RF24/tests/pingpair_test/runtest.py
old mode 100755
new mode 100644
similarity index 100%
rename from lib/RF24/tests/pingpair_test/runtest.py
rename to lib/lib_rf/RF24/tests/pingpair_test/runtest.py
diff --git a/lib/RF24/tests/pingpair_test/runtests.sh b/lib/lib_rf/RF24/tests/pingpair_test/runtests.sh
old mode 100755
new mode 100644
similarity index 100%
rename from lib/RF24/tests/pingpair_test/runtests.sh
rename to lib/lib_rf/RF24/tests/pingpair_test/runtests.sh
diff --git a/lib/RF24/tests/pingpair_test/test.ex b/lib/lib_rf/RF24/tests/pingpair_test/test.ex
old mode 100755
new mode 100644
similarity index 100%
rename from lib/RF24/tests/pingpair_test/test.ex
rename to lib/lib_rf/RF24/tests/pingpair_test/test.ex
diff --git a/lib/RF24/utility/ATTiny/RF24_arch_config.h b/lib/lib_rf/RF24/utility/ATTiny/RF24_arch_config.h
similarity index 100%
rename from lib/RF24/utility/ATTiny/RF24_arch_config.h
rename to lib/lib_rf/RF24/utility/ATTiny/RF24_arch_config.h
diff --git a/lib/RF24/utility/ATTiny/spi.h b/lib/lib_rf/RF24/utility/ATTiny/spi.h
similarity index 100%
rename from lib/RF24/utility/ATTiny/spi.h
rename to lib/lib_rf/RF24/utility/ATTiny/spi.h
diff --git a/lib/RF24/utility/ATXMegaD3/README.md b/lib/lib_rf/RF24/utility/ATXMegaD3/README.md
similarity index 100%
rename from lib/RF24/utility/ATXMegaD3/README.md
rename to lib/lib_rf/RF24/utility/ATXMegaD3/README.md
diff --git a/lib/RF24/utility/ATXMegaD3/RF24_arch_config.h b/lib/lib_rf/RF24/utility/ATXMegaD3/RF24_arch_config.h
similarity index 100%
rename from lib/RF24/utility/ATXMegaD3/RF24_arch_config.h
rename to lib/lib_rf/RF24/utility/ATXMegaD3/RF24_arch_config.h
diff --git a/lib/RF24/utility/ATXMegaD3/compatibility.c b/lib/lib_rf/RF24/utility/ATXMegaD3/compatibility.c
similarity index 100%
rename from lib/RF24/utility/ATXMegaD3/compatibility.c
rename to lib/lib_rf/RF24/utility/ATXMegaD3/compatibility.c
diff --git a/lib/RF24/utility/ATXMegaD3/compatibility.h b/lib/lib_rf/RF24/utility/ATXMegaD3/compatibility.h
similarity index 100%
rename from lib/RF24/utility/ATXMegaD3/compatibility.h
rename to lib/lib_rf/RF24/utility/ATXMegaD3/compatibility.h
diff --git a/lib/RF24/utility/ATXMegaD3/gpio.cpp b/lib/lib_rf/RF24/utility/ATXMegaD3/gpio.cpp
similarity index 100%
rename from lib/RF24/utility/ATXMegaD3/gpio.cpp
rename to lib/lib_rf/RF24/utility/ATXMegaD3/gpio.cpp
diff --git a/lib/RF24/utility/ATXMegaD3/gpio.h b/lib/lib_rf/RF24/utility/ATXMegaD3/gpio.h
similarity index 100%
rename from lib/RF24/utility/ATXMegaD3/gpio.h
rename to lib/lib_rf/RF24/utility/ATXMegaD3/gpio.h
diff --git a/lib/RF24/utility/ATXMegaD3/gpio_helper.c b/lib/lib_rf/RF24/utility/ATXMegaD3/gpio_helper.c
similarity index 100%
rename from lib/RF24/utility/ATXMegaD3/gpio_helper.c
rename to lib/lib_rf/RF24/utility/ATXMegaD3/gpio_helper.c
diff --git a/lib/RF24/utility/ATXMegaD3/gpio_helper.h b/lib/lib_rf/RF24/utility/ATXMegaD3/gpio_helper.h
similarity index 100%
rename from lib/RF24/utility/ATXMegaD3/gpio_helper.h
rename to lib/lib_rf/RF24/utility/ATXMegaD3/gpio_helper.h
diff --git a/lib/RF24/utility/ATXMegaD3/includes.h b/lib/lib_rf/RF24/utility/ATXMegaD3/includes.h
similarity index 100%
rename from lib/RF24/utility/ATXMegaD3/includes.h
rename to lib/lib_rf/RF24/utility/ATXMegaD3/includes.h
diff --git a/lib/RF24/utility/ATXMegaD3/spi.cpp b/lib/lib_rf/RF24/utility/ATXMegaD3/spi.cpp
similarity index 100%
rename from lib/RF24/utility/ATXMegaD3/spi.cpp
rename to lib/lib_rf/RF24/utility/ATXMegaD3/spi.cpp
diff --git a/lib/RF24/utility/ATXMegaD3/spi.h b/lib/lib_rf/RF24/utility/ATXMegaD3/spi.h
similarity index 100%
rename from lib/RF24/utility/ATXMegaD3/spi.h
rename to lib/lib_rf/RF24/utility/ATXMegaD3/spi.h
diff --git a/lib/RF24/utility/Due/RF24_arch_config.h b/lib/lib_rf/RF24/utility/Due/RF24_arch_config.h
similarity index 100%
rename from lib/RF24/utility/Due/RF24_arch_config.h
rename to lib/lib_rf/RF24/utility/Due/RF24_arch_config.h
diff --git a/lib/RF24/utility/LittleWire/RF24_arch_config.h b/lib/lib_rf/RF24/utility/LittleWire/RF24_arch_config.h
similarity index 100%
rename from lib/RF24/utility/LittleWire/RF24_arch_config.h
rename to lib/lib_rf/RF24/utility/LittleWire/RF24_arch_config.h
diff --git a/lib/RF24/utility/LittleWire/includes.h b/lib/lib_rf/RF24/utility/LittleWire/includes.h
similarity index 100%
rename from lib/RF24/utility/LittleWire/includes.h
rename to lib/lib_rf/RF24/utility/LittleWire/includes.h
diff --git a/lib/RF24/utility/MRAA/RF24_arch_config.h b/lib/lib_rf/RF24/utility/MRAA/RF24_arch_config.h
similarity index 100%
rename from lib/RF24/utility/MRAA/RF24_arch_config.h
rename to lib/lib_rf/RF24/utility/MRAA/RF24_arch_config.h
diff --git a/lib/RF24/utility/MRAA/compatibility.c b/lib/lib_rf/RF24/utility/MRAA/compatibility.c
similarity index 100%
rename from lib/RF24/utility/MRAA/compatibility.c
rename to lib/lib_rf/RF24/utility/MRAA/compatibility.c
diff --git a/lib/RF24/utility/MRAA/compatibility.h b/lib/lib_rf/RF24/utility/MRAA/compatibility.h
similarity index 100%
rename from lib/RF24/utility/MRAA/compatibility.h
rename to lib/lib_rf/RF24/utility/MRAA/compatibility.h
diff --git a/lib/RF24/utility/MRAA/gpio.cpp b/lib/lib_rf/RF24/utility/MRAA/gpio.cpp
similarity index 100%
rename from lib/RF24/utility/MRAA/gpio.cpp
rename to lib/lib_rf/RF24/utility/MRAA/gpio.cpp
diff --git a/lib/RF24/utility/MRAA/gpio.h b/lib/lib_rf/RF24/utility/MRAA/gpio.h
similarity index 100%
rename from lib/RF24/utility/MRAA/gpio.h
rename to lib/lib_rf/RF24/utility/MRAA/gpio.h
diff --git a/lib/RF24/utility/MRAA/includes.h b/lib/lib_rf/RF24/utility/MRAA/includes.h
similarity index 100%
rename from lib/RF24/utility/MRAA/includes.h
rename to lib/lib_rf/RF24/utility/MRAA/includes.h
diff --git a/lib/RF24/utility/MRAA/spi.cpp b/lib/lib_rf/RF24/utility/MRAA/spi.cpp
similarity index 100%
rename from lib/RF24/utility/MRAA/spi.cpp
rename to lib/lib_rf/RF24/utility/MRAA/spi.cpp
diff --git a/lib/RF24/utility/MRAA/spi.h b/lib/lib_rf/RF24/utility/MRAA/spi.h
similarity index 100%
rename from lib/RF24/utility/MRAA/spi.h
rename to lib/lib_rf/RF24/utility/MRAA/spi.h
diff --git a/lib/RF24/utility/RPi/RF24_arch_config.h b/lib/lib_rf/RF24/utility/RPi/RF24_arch_config.h
similarity index 100%
rename from lib/RF24/utility/RPi/RF24_arch_config.h
rename to lib/lib_rf/RF24/utility/RPi/RF24_arch_config.h
diff --git a/lib/RF24/utility/RPi/bcm2835.c b/lib/lib_rf/RF24/utility/RPi/bcm2835.c
similarity index 100%
rename from lib/RF24/utility/RPi/bcm2835.c
rename to lib/lib_rf/RF24/utility/RPi/bcm2835.c
diff --git a/lib/RF24/utility/RPi/bcm2835.h b/lib/lib_rf/RF24/utility/RPi/bcm2835.h
similarity index 100%
rename from lib/RF24/utility/RPi/bcm2835.h
rename to lib/lib_rf/RF24/utility/RPi/bcm2835.h
diff --git a/lib/RF24/utility/RPi/includes.h b/lib/lib_rf/RF24/utility/RPi/includes.h
similarity index 100%
rename from lib/RF24/utility/RPi/includes.h
rename to lib/lib_rf/RF24/utility/RPi/includes.h
diff --git a/lib/RF24/utility/RPi/interrupt.c b/lib/lib_rf/RF24/utility/RPi/interrupt.c
similarity index 100%
rename from lib/RF24/utility/RPi/interrupt.c
rename to lib/lib_rf/RF24/utility/RPi/interrupt.c
diff --git a/lib/RF24/utility/RPi/interrupt.h b/lib/lib_rf/RF24/utility/RPi/interrupt.h
similarity index 100%
rename from lib/RF24/utility/RPi/interrupt.h
rename to lib/lib_rf/RF24/utility/RPi/interrupt.h
diff --git a/lib/RF24/utility/RPi/spi.cpp b/lib/lib_rf/RF24/utility/RPi/spi.cpp
similarity index 100%
rename from lib/RF24/utility/RPi/spi.cpp
rename to lib/lib_rf/RF24/utility/RPi/spi.cpp
diff --git a/lib/RF24/utility/RPi/spi.h b/lib/lib_rf/RF24/utility/RPi/spi.h
similarity index 100%
rename from lib/RF24/utility/RPi/spi.h
rename to lib/lib_rf/RF24/utility/RPi/spi.h
diff --git a/lib/RF24/utility/SPIDEV/RF24_arch_config.h b/lib/lib_rf/RF24/utility/SPIDEV/RF24_arch_config.h
similarity index 100%
rename from lib/RF24/utility/SPIDEV/RF24_arch_config.h
rename to lib/lib_rf/RF24/utility/SPIDEV/RF24_arch_config.h
diff --git a/lib/RF24/utility/SPIDEV/compatibility.c b/lib/lib_rf/RF24/utility/SPIDEV/compatibility.c
similarity index 100%
rename from lib/RF24/utility/SPIDEV/compatibility.c
rename to lib/lib_rf/RF24/utility/SPIDEV/compatibility.c
diff --git a/lib/RF24/utility/SPIDEV/compatibility.h b/lib/lib_rf/RF24/utility/SPIDEV/compatibility.h
similarity index 100%
rename from lib/RF24/utility/SPIDEV/compatibility.h
rename to lib/lib_rf/RF24/utility/SPIDEV/compatibility.h
diff --git a/lib/RF24/utility/SPIDEV/gpio.cpp b/lib/lib_rf/RF24/utility/SPIDEV/gpio.cpp
similarity index 100%
rename from lib/RF24/utility/SPIDEV/gpio.cpp
rename to lib/lib_rf/RF24/utility/SPIDEV/gpio.cpp
diff --git a/lib/RF24/utility/SPIDEV/gpio.h b/lib/lib_rf/RF24/utility/SPIDEV/gpio.h
similarity index 100%
rename from lib/RF24/utility/SPIDEV/gpio.h
rename to lib/lib_rf/RF24/utility/SPIDEV/gpio.h
diff --git a/lib/RF24/utility/SPIDEV/includes.h b/lib/lib_rf/RF24/utility/SPIDEV/includes.h
similarity index 100%
rename from lib/RF24/utility/SPIDEV/includes.h
rename to lib/lib_rf/RF24/utility/SPIDEV/includes.h
diff --git a/lib/RF24/utility/SPIDEV/interrupt.c b/lib/lib_rf/RF24/utility/SPIDEV/interrupt.c
similarity index 100%
rename from lib/RF24/utility/SPIDEV/interrupt.c
rename to lib/lib_rf/RF24/utility/SPIDEV/interrupt.c
diff --git a/lib/RF24/utility/SPIDEV/interrupt.h b/lib/lib_rf/RF24/utility/SPIDEV/interrupt.h
similarity index 100%
rename from lib/RF24/utility/SPIDEV/interrupt.h
rename to lib/lib_rf/RF24/utility/SPIDEV/interrupt.h
diff --git a/lib/RF24/utility/SPIDEV/spi.cpp b/lib/lib_rf/RF24/utility/SPIDEV/spi.cpp
similarity index 100%
rename from lib/RF24/utility/SPIDEV/spi.cpp
rename to lib/lib_rf/RF24/utility/SPIDEV/spi.cpp
diff --git a/lib/RF24/utility/SPIDEV/spi.h b/lib/lib_rf/RF24/utility/SPIDEV/spi.h
similarity index 100%
rename from lib/RF24/utility/SPIDEV/spi.h
rename to lib/lib_rf/RF24/utility/SPIDEV/spi.h
diff --git a/lib/RF24/utility/Teensy/RF24_arch_config.h b/lib/lib_rf/RF24/utility/Teensy/RF24_arch_config.h
similarity index 100%
rename from lib/RF24/utility/Teensy/RF24_arch_config.h
rename to lib/lib_rf/RF24/utility/Teensy/RF24_arch_config.h
diff --git a/lib/RF24/utility/Template/RF24_arch_config.h b/lib/lib_rf/RF24/utility/Template/RF24_arch_config.h
similarity index 100%
rename from lib/RF24/utility/Template/RF24_arch_config.h
rename to lib/lib_rf/RF24/utility/Template/RF24_arch_config.h
diff --git a/lib/RF24/utility/Template/compatibility.h b/lib/lib_rf/RF24/utility/Template/compatibility.h
similarity index 100%
rename from lib/RF24/utility/Template/compatibility.h
rename to lib/lib_rf/RF24/utility/Template/compatibility.h
diff --git a/lib/RF24/utility/Template/gpio.h b/lib/lib_rf/RF24/utility/Template/gpio.h
similarity index 100%
rename from lib/RF24/utility/Template/gpio.h
rename to lib/lib_rf/RF24/utility/Template/gpio.h
diff --git a/lib/RF24/utility/Template/includes.h b/lib/lib_rf/RF24/utility/Template/includes.h
similarity index 100%
rename from lib/RF24/utility/Template/includes.h
rename to lib/lib_rf/RF24/utility/Template/includes.h
diff --git a/lib/RF24/utility/Template/spi.h b/lib/lib_rf/RF24/utility/Template/spi.h
similarity index 100%
rename from lib/RF24/utility/Template/spi.h
rename to lib/lib_rf/RF24/utility/Template/spi.h
diff --git a/lib/RF24/utility/wiringPi/RF24_arch_config.h b/lib/lib_rf/RF24/utility/wiringPi/RF24_arch_config.h
similarity index 100%
rename from lib/RF24/utility/wiringPi/RF24_arch_config.h
rename to lib/lib_rf/RF24/utility/wiringPi/RF24_arch_config.h
diff --git a/lib/RF24/utility/wiringPi/includes.h b/lib/lib_rf/RF24/utility/wiringPi/includes.h
similarity index 100%
rename from lib/RF24/utility/wiringPi/includes.h
rename to lib/lib_rf/RF24/utility/wiringPi/includes.h
diff --git a/lib/RF24/utility/wiringPi/spi.cpp b/lib/lib_rf/RF24/utility/wiringPi/spi.cpp
similarity index 100%
rename from lib/RF24/utility/wiringPi/spi.cpp
rename to lib/lib_rf/RF24/utility/wiringPi/spi.cpp
diff --git a/lib/RF24/utility/wiringPi/spi.h b/lib/lib_rf/RF24/utility/wiringPi/spi.h
similarity index 100%
rename from lib/RF24/utility/wiringPi/spi.h
rename to lib/lib_rf/RF24/utility/wiringPi/spi.h
diff --git a/lib/RF24/wikidoc.xslt b/lib/lib_rf/RF24/wikidoc.xslt
similarity index 100%
rename from lib/RF24/wikidoc.xslt
rename to lib/lib_rf/RF24/wikidoc.xslt
diff --git a/lib/cc1101/README.md b/lib/lib_rf/cc1101/README.md
similarity index 100%
rename from lib/cc1101/README.md
rename to lib/lib_rf/cc1101/README.md
diff --git a/lib/cc1101/cc1101.cpp b/lib/lib_rf/cc1101/cc1101.cpp
similarity index 100%
rename from lib/cc1101/cc1101.cpp
rename to lib/lib_rf/cc1101/cc1101.cpp
diff --git a/lib/cc1101/cc1101.h b/lib/lib_rf/cc1101/cc1101.h
similarity index 100%
rename from lib/cc1101/cc1101.h
rename to lib/lib_rf/cc1101/cc1101.h
diff --git a/lib/cc1101/cc1101.h.txt b/lib/lib_rf/cc1101/cc1101.h.txt
similarity index 100%
rename from lib/cc1101/cc1101.h.txt
rename to lib/lib_rf/cc1101/cc1101.h.txt
diff --git a/lib/cc1101/ccpacket.h b/lib/lib_rf/cc1101/ccpacket.h
similarity index 100%
rename from lib/cc1101/ccpacket.h
rename to lib/lib_rf/cc1101/ccpacket.h
diff --git a/lib/cc1101/library.properties b/lib/lib_rf/cc1101/library.properties
similarity index 100%
rename from lib/cc1101/library.properties
rename to lib/lib_rf/cc1101/library.properties
diff --git a/lib/rc-switch/.gitignore b/lib/lib_rf/rc-switch/.gitignore
similarity index 100%
rename from lib/rc-switch/.gitignore
rename to lib/lib_rf/rc-switch/.gitignore
diff --git a/lib/rc-switch/README.md b/lib/lib_rf/rc-switch/README.md
similarity index 100%
rename from lib/rc-switch/README.md
rename to lib/lib_rf/rc-switch/README.md
diff --git a/lib/rc-switch/examples/ReceiveDemo_Advanced/ReceiveDemo_Advanced.ino b/lib/lib_rf/rc-switch/examples/ReceiveDemo_Advanced/ReceiveDemo_Advanced.ino
similarity index 100%
rename from lib/rc-switch/examples/ReceiveDemo_Advanced/ReceiveDemo_Advanced.ino
rename to lib/lib_rf/rc-switch/examples/ReceiveDemo_Advanced/ReceiveDemo_Advanced.ino
diff --git a/lib/rc-switch/examples/ReceiveDemo_Advanced/output.ino b/lib/lib_rf/rc-switch/examples/ReceiveDemo_Advanced/output.ino
similarity index 100%
rename from lib/rc-switch/examples/ReceiveDemo_Advanced/output.ino
rename to lib/lib_rf/rc-switch/examples/ReceiveDemo_Advanced/output.ino
diff --git a/lib/rc-switch/examples/ReceiveDemo_Simple/ReceiveDemo_Simple.ino b/lib/lib_rf/rc-switch/examples/ReceiveDemo_Simple/ReceiveDemo_Simple.ino
similarity index 100%
rename from lib/rc-switch/examples/ReceiveDemo_Simple/ReceiveDemo_Simple.ino
rename to lib/lib_rf/rc-switch/examples/ReceiveDemo_Simple/ReceiveDemo_Simple.ino
diff --git a/lib/rc-switch/examples/SendDemo/SendDemo.ino b/lib/lib_rf/rc-switch/examples/SendDemo/SendDemo.ino
similarity index 100%
rename from lib/rc-switch/examples/SendDemo/SendDemo.ino
rename to lib/lib_rf/rc-switch/examples/SendDemo/SendDemo.ino
diff --git a/lib/rc-switch/examples/TypeA_WithDIPSwitches/TypeA_WithDIPSwitches.ino b/lib/lib_rf/rc-switch/examples/TypeA_WithDIPSwitches/TypeA_WithDIPSwitches.ino
similarity index 100%
rename from lib/rc-switch/examples/TypeA_WithDIPSwitches/TypeA_WithDIPSwitches.ino
rename to lib/lib_rf/rc-switch/examples/TypeA_WithDIPSwitches/TypeA_WithDIPSwitches.ino
diff --git a/lib/rc-switch/examples/TypeA_WithDIPSwitches_Lightweight/TypeA_WithDIPSwitches_Lightweight.ino b/lib/lib_rf/rc-switch/examples/TypeA_WithDIPSwitches_Lightweight/TypeA_WithDIPSwitches_Lightweight.ino
similarity index 100%
rename from lib/rc-switch/examples/TypeA_WithDIPSwitches_Lightweight/TypeA_WithDIPSwitches_Lightweight.ino
rename to lib/lib_rf/rc-switch/examples/TypeA_WithDIPSwitches_Lightweight/TypeA_WithDIPSwitches_Lightweight.ino
diff --git a/lib/rc-switch/examples/TypeB_WithRotaryOrSlidingSwitches/TypeB_WithRotaryOrSlidingSwitches.ino b/lib/lib_rf/rc-switch/examples/TypeB_WithRotaryOrSlidingSwitches/TypeB_WithRotaryOrSlidingSwitches.ino
similarity index 100%
rename from lib/rc-switch/examples/TypeB_WithRotaryOrSlidingSwitches/TypeB_WithRotaryOrSlidingSwitches.ino
rename to lib/lib_rf/rc-switch/examples/TypeB_WithRotaryOrSlidingSwitches/TypeB_WithRotaryOrSlidingSwitches.ino
diff --git a/lib/rc-switch/examples/TypeC_Intertechno/TypeC_Intertechno.ino b/lib/lib_rf/rc-switch/examples/TypeC_Intertechno/TypeC_Intertechno.ino
similarity index 100%
rename from lib/rc-switch/examples/TypeC_Intertechno/TypeC_Intertechno.ino
rename to lib/lib_rf/rc-switch/examples/TypeC_Intertechno/TypeC_Intertechno.ino
diff --git a/lib/rc-switch/examples/TypeD_REV/TypeD_REV.ino b/lib/lib_rf/rc-switch/examples/TypeD_REV/TypeD_REV.ino
similarity index 100%
rename from lib/rc-switch/examples/TypeD_REV/TypeD_REV.ino
rename to lib/lib_rf/rc-switch/examples/TypeD_REV/TypeD_REV.ino
diff --git a/lib/rc-switch/examples/Webserver/Webserver.ino b/lib/lib_rf/rc-switch/examples/Webserver/Webserver.ino
similarity index 100%
rename from lib/rc-switch/examples/Webserver/Webserver.ino
rename to lib/lib_rf/rc-switch/examples/Webserver/Webserver.ino
diff --git a/lib/rc-switch/keywords.txt b/lib/lib_rf/rc-switch/keywords.txt
similarity index 100%
rename from lib/rc-switch/keywords.txt
rename to lib/lib_rf/rc-switch/keywords.txt
diff --git a/lib/rc-switch/library.json b/lib/lib_rf/rc-switch/library.json
similarity index 100%
rename from lib/rc-switch/library.json
rename to lib/lib_rf/rc-switch/library.json
diff --git a/lib/rc-switch/library.properties b/lib/lib_rf/rc-switch/library.properties
similarity index 100%
rename from lib/rc-switch/library.properties
rename to lib/lib_rf/rc-switch/library.properties
diff --git a/lib/rc-switch/platformio.ini b/lib/lib_rf/rc-switch/platformio.ini
similarity index 100%
rename from lib/rc-switch/platformio.ini
rename to lib/lib_rf/rc-switch/platformio.ini
diff --git a/lib/rc-switch/src/RCSwitch.cpp b/lib/lib_rf/rc-switch/src/RCSwitch.cpp
similarity index 100%
rename from lib/rc-switch/src/RCSwitch.cpp
rename to lib/lib_rf/rc-switch/src/RCSwitch.cpp
diff --git a/lib/rc-switch/src/RCSwitch.h b/lib/lib_rf/rc-switch/src/RCSwitch.h
similarity index 100%
rename from lib/rc-switch/src/RCSwitch.h
rename to lib/lib_rf/rc-switch/src/RCSwitch.h
diff --git a/lib/base64-1.1.1/LICENSE b/lib/lib_ssl/base64-1.1.1/LICENSE
similarity index 100%
rename from lib/base64-1.1.1/LICENSE
rename to lib/lib_ssl/base64-1.1.1/LICENSE
diff --git a/lib/base64-1.1.1/Makefile b/lib/lib_ssl/base64-1.1.1/Makefile
similarity index 100%
rename from lib/base64-1.1.1/Makefile
rename to lib/lib_ssl/base64-1.1.1/Makefile
diff --git a/lib/base64-1.1.1/README.md b/lib/lib_ssl/base64-1.1.1/README.md
similarity index 100%
rename from lib/base64-1.1.1/README.md
rename to lib/lib_ssl/base64-1.1.1/README.md
diff --git a/lib/base64-1.1.1/catch.cpp b/lib/lib_ssl/base64-1.1.1/catch.cpp
similarity index 100%
rename from lib/base64-1.1.1/catch.cpp
rename to lib/lib_ssl/base64-1.1.1/catch.cpp
diff --git a/lib/base64-1.1.1/catch.hpp b/lib/lib_ssl/base64-1.1.1/catch.hpp
similarity index 100%
rename from lib/base64-1.1.1/catch.hpp
rename to lib/lib_ssl/base64-1.1.1/catch.hpp
diff --git a/lib/base64-1.1.1/library.properties b/lib/lib_ssl/base64-1.1.1/library.properties
similarity index 100%
rename from lib/base64-1.1.1/library.properties
rename to lib/lib_ssl/base64-1.1.1/library.properties
diff --git a/lib/base64-1.1.1/src/base64.hpp b/lib/lib_ssl/base64-1.1.1/src/base64.hpp
similarity index 100%
rename from lib/base64-1.1.1/src/base64.hpp
rename to lib/lib_ssl/base64-1.1.1/src/base64.hpp
diff --git a/lib/bearssl-esp8266/bearssl_esp8266-customized.txt b/lib/lib_ssl/bearssl-esp8266/bearssl_esp8266-customized.txt
similarity index 100%
rename from lib/bearssl-esp8266/bearssl_esp8266-customized.txt
rename to lib/lib_ssl/bearssl-esp8266/bearssl_esp8266-customized.txt
diff --git a/lib/bearssl-esp8266/conf/esp8266.mk b/lib/lib_ssl/bearssl-esp8266/conf/esp8266.mk
similarity index 100%
rename from lib/bearssl-esp8266/conf/esp8266.mk
rename to lib/lib_ssl/bearssl-esp8266/conf/esp8266.mk
diff --git a/lib/bearssl-esp8266/library.properties b/lib/lib_ssl/bearssl-esp8266/library.properties
similarity index 100%
rename from lib/bearssl-esp8266/library.properties
rename to lib/lib_ssl/bearssl-esp8266/library.properties
diff --git a/lib/bearssl-esp8266/src/aead/ccm.c b/lib/lib_ssl/bearssl-esp8266/src/aead/ccm.c
similarity index 100%
rename from lib/bearssl-esp8266/src/aead/ccm.c
rename to lib/lib_ssl/bearssl-esp8266/src/aead/ccm.c
diff --git a/lib/bearssl-esp8266/src/aead/eax.c b/lib/lib_ssl/bearssl-esp8266/src/aead/eax.c
similarity index 100%
rename from lib/bearssl-esp8266/src/aead/eax.c
rename to lib/lib_ssl/bearssl-esp8266/src/aead/eax.c
diff --git a/lib/bearssl-esp8266/src/aead/gcm.c b/lib/lib_ssl/bearssl-esp8266/src/aead/gcm.c
similarity index 100%
rename from lib/bearssl-esp8266/src/aead/gcm.c
rename to lib/lib_ssl/bearssl-esp8266/src/aead/gcm.c
diff --git a/lib/bearssl-esp8266/src/codec/ccopy.c b/lib/lib_ssl/bearssl-esp8266/src/codec/ccopy.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/ccopy.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/ccopy.c
diff --git a/lib/bearssl-esp8266/src/codec/dec16be.c b/lib/lib_ssl/bearssl-esp8266/src/codec/dec16be.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/dec16be.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/dec16be.c
diff --git a/lib/bearssl-esp8266/src/codec/dec16le.c b/lib/lib_ssl/bearssl-esp8266/src/codec/dec16le.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/dec16le.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/dec16le.c
diff --git a/lib/bearssl-esp8266/src/codec/dec32be.c b/lib/lib_ssl/bearssl-esp8266/src/codec/dec32be.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/dec32be.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/dec32be.c
diff --git a/lib/bearssl-esp8266/src/codec/dec32le.c b/lib/lib_ssl/bearssl-esp8266/src/codec/dec32le.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/dec32le.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/dec32le.c
diff --git a/lib/bearssl-esp8266/src/codec/dec64be.c b/lib/lib_ssl/bearssl-esp8266/src/codec/dec64be.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/dec64be.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/dec64be.c
diff --git a/lib/bearssl-esp8266/src/codec/dec64le.c b/lib/lib_ssl/bearssl-esp8266/src/codec/dec64le.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/dec64le.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/dec64le.c
diff --git a/lib/bearssl-esp8266/src/codec/enc16be.c b/lib/lib_ssl/bearssl-esp8266/src/codec/enc16be.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/enc16be.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/enc16be.c
diff --git a/lib/bearssl-esp8266/src/codec/enc16le.c b/lib/lib_ssl/bearssl-esp8266/src/codec/enc16le.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/enc16le.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/enc16le.c
diff --git a/lib/bearssl-esp8266/src/codec/enc32be.c b/lib/lib_ssl/bearssl-esp8266/src/codec/enc32be.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/enc32be.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/enc32be.c
diff --git a/lib/bearssl-esp8266/src/codec/enc32le.c b/lib/lib_ssl/bearssl-esp8266/src/codec/enc32le.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/enc32le.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/enc32le.c
diff --git a/lib/bearssl-esp8266/src/codec/enc64be.c b/lib/lib_ssl/bearssl-esp8266/src/codec/enc64be.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/enc64be.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/enc64be.c
diff --git a/lib/bearssl-esp8266/src/codec/enc64le.c b/lib/lib_ssl/bearssl-esp8266/src/codec/enc64le.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/enc64le.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/enc64le.c
diff --git a/lib/bearssl-esp8266/src/codec/pemdec.c b/lib/lib_ssl/bearssl-esp8266/src/codec/pemdec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/pemdec.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/pemdec.c
diff --git a/lib/bearssl-esp8266/src/codec/pemenc.c b/lib/lib_ssl/bearssl-esp8266/src/codec/pemenc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/codec/pemenc.c
rename to lib/lib_ssl/bearssl-esp8266/src/codec/pemenc.c
diff --git a/lib/bearssl-esp8266/src/ec/ec_all_m15.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_all_m15.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ec_all_m15.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ec_all_m15.c
diff --git a/lib/bearssl-esp8266/src/ec/ec_c25519_i15.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_c25519_i15.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ec_c25519_i15.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ec_c25519_i15.c
diff --git a/lib/bearssl-esp8266/src/ec/ec_curve25519.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_curve25519.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ec_curve25519.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ec_curve25519.c
diff --git a/lib/bearssl-esp8266/src/ec/ec_default.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_default.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ec_default.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ec_default.c
diff --git a/lib/bearssl-esp8266/src/ec/ec_keygen.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_keygen.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ec_keygen.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ec_keygen.c
diff --git a/lib/bearssl-esp8266/src/ec/ec_p256_m15.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_p256_m15.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ec_p256_m15.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ec_p256_m15.c
diff --git a/lib/bearssl-esp8266/src/ec/ec_prime_i15.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_prime_i15.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ec_prime_i15.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ec_prime_i15.c
diff --git a/lib/bearssl-esp8266/src/ec/ec_pubkey.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_pubkey.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ec_pubkey.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ec_pubkey.c
diff --git a/lib/bearssl-esp8266/src/ec/ec_secp256r1.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_secp256r1.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ec_secp256r1.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ec_secp256r1.c
diff --git a/lib/bearssl-esp8266/src/ec/ec_secp384r1.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_secp384r1.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ec_secp384r1.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ec_secp384r1.c
diff --git a/lib/bearssl-esp8266/src/ec/ec_secp521r1.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_secp521r1.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ec_secp521r1.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ec_secp521r1.c
diff --git a/lib/bearssl-esp8266/src/ec/ecdsa_atr.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_atr.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ecdsa_atr.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_atr.c
diff --git a/lib/bearssl-esp8266/src/ec/ecdsa_default_sign_asn1.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_default_sign_asn1.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ecdsa_default_sign_asn1.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_default_sign_asn1.c
diff --git a/lib/bearssl-esp8266/src/ec/ecdsa_default_sign_raw.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_default_sign_raw.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ecdsa_default_sign_raw.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_default_sign_raw.c
diff --git a/lib/bearssl-esp8266/src/ec/ecdsa_default_vrfy_asn1.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_default_vrfy_asn1.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ecdsa_default_vrfy_asn1.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_default_vrfy_asn1.c
diff --git a/lib/bearssl-esp8266/src/ec/ecdsa_default_vrfy_raw.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_default_vrfy_raw.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ecdsa_default_vrfy_raw.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_default_vrfy_raw.c
diff --git a/lib/bearssl-esp8266/src/ec/ecdsa_i15_bits.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_i15_bits.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ecdsa_i15_bits.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_i15_bits.c
diff --git a/lib/bearssl-esp8266/src/ec/ecdsa_i15_sign_asn1.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_i15_sign_asn1.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ecdsa_i15_sign_asn1.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_i15_sign_asn1.c
diff --git a/lib/bearssl-esp8266/src/ec/ecdsa_i15_sign_raw.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_i15_sign_raw.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ecdsa_i15_sign_raw.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_i15_sign_raw.c
diff --git a/lib/bearssl-esp8266/src/ec/ecdsa_i15_vrfy_asn1.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_i15_vrfy_asn1.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ecdsa_i15_vrfy_asn1.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_i15_vrfy_asn1.c
diff --git a/lib/bearssl-esp8266/src/ec/ecdsa_i15_vrfy_raw.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_i15_vrfy_raw.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ecdsa_i15_vrfy_raw.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_i15_vrfy_raw.c
diff --git a/lib/bearssl-esp8266/src/ec/ecdsa_rta.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_rta.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ec/ecdsa_rta.c
rename to lib/lib_ssl/bearssl-esp8266/src/ec/ecdsa_rta.c
diff --git a/lib/bearssl-esp8266/src/hash/dig_oid.c b/lib/lib_ssl/bearssl-esp8266/src/hash/dig_oid.c
similarity index 100%
rename from lib/bearssl-esp8266/src/hash/dig_oid.c
rename to lib/lib_ssl/bearssl-esp8266/src/hash/dig_oid.c
diff --git a/lib/bearssl-esp8266/src/hash/dig_size.c b/lib/lib_ssl/bearssl-esp8266/src/hash/dig_size.c
similarity index 100%
rename from lib/bearssl-esp8266/src/hash/dig_size.c
rename to lib/lib_ssl/bearssl-esp8266/src/hash/dig_size.c
diff --git a/lib/bearssl-esp8266/src/hash/ghash_ctmul.c b/lib/lib_ssl/bearssl-esp8266/src/hash/ghash_ctmul.c
similarity index 100%
rename from lib/bearssl-esp8266/src/hash/ghash_ctmul.c
rename to lib/lib_ssl/bearssl-esp8266/src/hash/ghash_ctmul.c
diff --git a/lib/bearssl-esp8266/src/hash/ghash_ctmul32.c b/lib/lib_ssl/bearssl-esp8266/src/hash/ghash_ctmul32.c
similarity index 100%
rename from lib/bearssl-esp8266/src/hash/ghash_ctmul32.c
rename to lib/lib_ssl/bearssl-esp8266/src/hash/ghash_ctmul32.c
diff --git a/lib/bearssl-esp8266/src/hash/ghash_ctmul64.c b/lib/lib_ssl/bearssl-esp8266/src/hash/ghash_ctmul64.c
similarity index 100%
rename from lib/bearssl-esp8266/src/hash/ghash_ctmul64.c
rename to lib/lib_ssl/bearssl-esp8266/src/hash/ghash_ctmul64.c
diff --git a/lib/bearssl-esp8266/src/hash/ghash_pclmul.c b/lib/lib_ssl/bearssl-esp8266/src/hash/ghash_pclmul.c
similarity index 100%
rename from lib/bearssl-esp8266/src/hash/ghash_pclmul.c
rename to lib/lib_ssl/bearssl-esp8266/src/hash/ghash_pclmul.c
diff --git a/lib/bearssl-esp8266/src/hash/md5.c b/lib/lib_ssl/bearssl-esp8266/src/hash/md5.c
similarity index 100%
rename from lib/bearssl-esp8266/src/hash/md5.c
rename to lib/lib_ssl/bearssl-esp8266/src/hash/md5.c
diff --git a/lib/bearssl-esp8266/src/hash/md5sha1.c b/lib/lib_ssl/bearssl-esp8266/src/hash/md5sha1.c
similarity index 100%
rename from lib/bearssl-esp8266/src/hash/md5sha1.c
rename to lib/lib_ssl/bearssl-esp8266/src/hash/md5sha1.c
diff --git a/lib/bearssl-esp8266/src/hash/mgf1.c b/lib/lib_ssl/bearssl-esp8266/src/hash/mgf1.c
similarity index 100%
rename from lib/bearssl-esp8266/src/hash/mgf1.c
rename to lib/lib_ssl/bearssl-esp8266/src/hash/mgf1.c
diff --git a/lib/bearssl-esp8266/src/hash/multihash.c b/lib/lib_ssl/bearssl-esp8266/src/hash/multihash.c
similarity index 100%
rename from lib/bearssl-esp8266/src/hash/multihash.c
rename to lib/lib_ssl/bearssl-esp8266/src/hash/multihash.c
diff --git a/lib/bearssl-esp8266/src/hash/sha1.c b/lib/lib_ssl/bearssl-esp8266/src/hash/sha1.c
similarity index 100%
rename from lib/bearssl-esp8266/src/hash/sha1.c
rename to lib/lib_ssl/bearssl-esp8266/src/hash/sha1.c
diff --git a/lib/bearssl-esp8266/src/hash/sha2big.c b/lib/lib_ssl/bearssl-esp8266/src/hash/sha2big.c
similarity index 100%
rename from lib/bearssl-esp8266/src/hash/sha2big.c
rename to lib/lib_ssl/bearssl-esp8266/src/hash/sha2big.c
diff --git a/lib/bearssl-esp8266/src/hash/sha2small.c b/lib/lib_ssl/bearssl-esp8266/src/hash/sha2small.c
similarity index 100%
rename from lib/bearssl-esp8266/src/hash/sha2small.c
rename to lib/lib_ssl/bearssl-esp8266/src/hash/sha2small.c
diff --git a/lib/bearssl-esp8266/src/int/i15_add.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_add.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_add.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_add.c
diff --git a/lib/bearssl-esp8266/src/int/i15_bitlen.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_bitlen.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_bitlen.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_bitlen.c
diff --git a/lib/bearssl-esp8266/src/int/i15_decmod.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_decmod.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_decmod.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_decmod.c
diff --git a/lib/bearssl-esp8266/src/int/i15_decode.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_decode.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_decode.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_decode.c
diff --git a/lib/bearssl-esp8266/src/int/i15_decred.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_decred.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_decred.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_decred.c
diff --git a/lib/bearssl-esp8266/src/int/i15_encode.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_encode.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_encode.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_encode.c
diff --git a/lib/bearssl-esp8266/src/int/i15_fmont.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_fmont.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_fmont.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_fmont.c
diff --git a/lib/bearssl-esp8266/src/int/i15_iszero.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_iszero.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_iszero.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_iszero.c
diff --git a/lib/bearssl-esp8266/src/int/i15_moddiv.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_moddiv.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_moddiv.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_moddiv.c
diff --git a/lib/bearssl-esp8266/src/int/i15_modpow.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_modpow.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_modpow.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_modpow.c
diff --git a/lib/bearssl-esp8266/src/int/i15_modpow2.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_modpow2.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_modpow2.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_modpow2.c
diff --git a/lib/bearssl-esp8266/src/int/i15_montmul.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_montmul.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_montmul.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_montmul.c
diff --git a/lib/bearssl-esp8266/src/int/i15_mulacc.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_mulacc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_mulacc.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_mulacc.c
diff --git a/lib/bearssl-esp8266/src/int/i15_muladd.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_muladd.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_muladd.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_muladd.c
diff --git a/lib/bearssl-esp8266/src/int/i15_ninv15.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_ninv15.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_ninv15.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_ninv15.c
diff --git a/lib/bearssl-esp8266/src/int/i15_reduce.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_reduce.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_reduce.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_reduce.c
diff --git a/lib/bearssl-esp8266/src/int/i15_rshift.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_rshift.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_rshift.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_rshift.c
diff --git a/lib/bearssl-esp8266/src/int/i15_sub.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_sub.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_sub.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_sub.c
diff --git a/lib/bearssl-esp8266/src/int/i15_tmont.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_tmont.c
similarity index 100%
rename from lib/bearssl-esp8266/src/int/i15_tmont.c
rename to lib/lib_ssl/bearssl-esp8266/src/int/i15_tmont.c
diff --git a/lib/bearssl-esp8266/src/kdf/hkdf.c b/lib/lib_ssl/bearssl-esp8266/src/kdf/hkdf.c
similarity index 100%
rename from lib/bearssl-esp8266/src/kdf/hkdf.c
rename to lib/lib_ssl/bearssl-esp8266/src/kdf/hkdf.c
diff --git a/lib/bearssl-esp8266/src/kdf/shake.c b/lib/lib_ssl/bearssl-esp8266/src/kdf/shake.c
similarity index 100%
rename from lib/bearssl-esp8266/src/kdf/shake.c
rename to lib/lib_ssl/bearssl-esp8266/src/kdf/shake.c
diff --git a/lib/bearssl-esp8266/src/mac/hmac.c b/lib/lib_ssl/bearssl-esp8266/src/mac/hmac.c
similarity index 100%
rename from lib/bearssl-esp8266/src/mac/hmac.c
rename to lib/lib_ssl/bearssl-esp8266/src/mac/hmac.c
diff --git a/lib/bearssl-esp8266/src/mac/hmac_ct.c b/lib/lib_ssl/bearssl-esp8266/src/mac/hmac_ct.c
similarity index 100%
rename from lib/bearssl-esp8266/src/mac/hmac_ct.c
rename to lib/lib_ssl/bearssl-esp8266/src/mac/hmac_ct.c
diff --git a/lib/bearssl-esp8266/src/pgmspace_bearssl.h b/lib/lib_ssl/bearssl-esp8266/src/pgmspace_bearssl.h
similarity index 100%
rename from lib/bearssl-esp8266/src/pgmspace_bearssl.h
rename to lib/lib_ssl/bearssl-esp8266/src/pgmspace_bearssl.h
diff --git a/lib/bearssl-esp8266/src/rand/aesctr_drbg.c b/lib/lib_ssl/bearssl-esp8266/src/rand/aesctr_drbg.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rand/aesctr_drbg.c
rename to lib/lib_ssl/bearssl-esp8266/src/rand/aesctr_drbg.c
diff --git a/lib/bearssl-esp8266/src/rand/hmac_drbg.c b/lib/lib_ssl/bearssl-esp8266/src/rand/hmac_drbg.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rand/hmac_drbg.c
rename to lib/lib_ssl/bearssl-esp8266/src/rand/hmac_drbg.c
diff --git a/lib/bearssl-esp8266/src/rand/sysrng.c b/lib/lib_ssl/bearssl-esp8266/src/rand/sysrng.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rand/sysrng.c
rename to lib/lib_ssl/bearssl-esp8266/src/rand/sysrng.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_default_keygen.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_keygen.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_default_keygen.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_keygen.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_default_modulus.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_modulus.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_default_modulus.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_modulus.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_default_oaep_decrypt.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_oaep_decrypt.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_default_oaep_decrypt.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_oaep_decrypt.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_default_oaep_encrypt.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_oaep_encrypt.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_default_oaep_encrypt.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_oaep_encrypt.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_default_pkcs1_sign.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_pkcs1_sign.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_default_pkcs1_sign.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_pkcs1_sign.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_default_pkcs1_vrfy.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_pkcs1_vrfy.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_default_pkcs1_vrfy.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_pkcs1_vrfy.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_default_priv.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_priv.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_default_priv.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_priv.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_default_privexp.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_privexp.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_default_privexp.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_privexp.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_default_pss_sign.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_pss_sign.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_default_pss_sign.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_pss_sign.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_default_pss_vrfy.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_pss_vrfy.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_default_pss_vrfy.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_pss_vrfy.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_default_pub.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_pub.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_default_pub.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_pub.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_default_pubexp.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_pubexp.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_default_pubexp.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_default_pubexp.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_i15_keygen.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_keygen.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_i15_keygen.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_keygen.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_i15_modulus.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_modulus.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_i15_modulus.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_modulus.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_i15_oaep_decrypt.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_oaep_decrypt.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_i15_oaep_decrypt.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_oaep_decrypt.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_i15_oaep_encrypt.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_oaep_encrypt.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_i15_oaep_encrypt.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_oaep_encrypt.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_i15_pkcs1_sign.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pkcs1_sign.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_i15_pkcs1_sign.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pkcs1_sign.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_i15_pkcs1_vrfy.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pkcs1_vrfy.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_i15_pkcs1_vrfy.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pkcs1_vrfy.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_i15_priv.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_priv.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_i15_priv.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_priv.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_i15_privexp.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_privexp.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_i15_privexp.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_privexp.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_i15_pss_sign.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pss_sign.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_i15_pss_sign.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pss_sign.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_i15_pss_vrfy.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pss_vrfy.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_i15_pss_vrfy.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pss_vrfy.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_i15_pub.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pub.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_i15_pub.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pub.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_i15_pubexp.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pubexp.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_i15_pubexp.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pubexp.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_oaep_pad.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_oaep_pad.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_oaep_pad.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_oaep_pad.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_oaep_unpad.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_oaep_unpad.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_oaep_unpad.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_oaep_unpad.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_pkcs1_sig_pad.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_pkcs1_sig_pad.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_pkcs1_sig_pad.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_pkcs1_sig_pad.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_pkcs1_sig_unpad.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_pkcs1_sig_unpad.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_pkcs1_sig_unpad.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_pkcs1_sig_unpad.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_pss_sig_pad.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_pss_sig_pad.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_pss_sig_pad.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_pss_sig_pad.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_pss_sig_unpad.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_pss_sig_unpad.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_pss_sig_unpad.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_pss_sig_unpad.c
diff --git a/lib/bearssl-esp8266/src/rsa/rsa_ssl_decrypt.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_ssl_decrypt.c
similarity index 100%
rename from lib/bearssl-esp8266/src/rsa/rsa_ssl_decrypt.c
rename to lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_ssl_decrypt.c
diff --git a/lib/bearssl-esp8266/src/settings.c b/lib/lib_ssl/bearssl-esp8266/src/settings.c
similarity index 100%
rename from lib/bearssl-esp8266/src/settings.c
rename to lib/lib_ssl/bearssl-esp8266/src/settings.c
diff --git a/lib/bearssl-esp8266/src/ssl/prf.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/prf.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/prf.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/prf.c
diff --git a/lib/bearssl-esp8266/src/ssl/prf_md5sha1.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/prf_md5sha1.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/prf_md5sha1.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/prf_md5sha1.c
diff --git a/lib/bearssl-esp8266/src/ssl/prf_sha256.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/prf_sha256.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/prf_sha256.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/prf_sha256.c
diff --git a/lib/bearssl-esp8266/src/ssl/prf_sha384.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/prf_sha384.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/prf_sha384.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/prf_sha384.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_ccert_single_ec.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_ccert_single_ec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_ccert_single_ec.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_ccert_single_ec.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_ccert_single_rsa.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_ccert_single_rsa.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_ccert_single_rsa.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_ccert_single_rsa.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_client.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_client.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_client.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_client.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_client_default_rsapub.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_client_default_rsapub.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_client_default_rsapub.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_client_default_rsapub.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_client_full.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_client_full.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_client_full.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_client_full.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_engine.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_engine.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_engine_default_aescbc.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_aescbc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_engine_default_aescbc.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_aescbc.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_engine_default_aesccm.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_aesccm.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_engine_default_aesccm.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_aesccm.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_engine_default_aesgcm.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_aesgcm.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_engine_default_aesgcm.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_aesgcm.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_engine_default_chapol.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_chapol.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_engine_default_chapol.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_chapol.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_engine_default_descbc.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_descbc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_engine_default_descbc.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_descbc.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_engine_default_ec.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_ec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_engine_default_ec.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_ec.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_engine_default_ecdsa.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_ecdsa.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_engine_default_ecdsa.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_ecdsa.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_engine_default_rsavrfy.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_rsavrfy.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_engine_default_rsavrfy.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_engine_default_rsavrfy.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_hashes.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hashes.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_hashes.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hashes.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_hs_client.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_client.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_hs_client.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_client.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_hs_server.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_server.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_hs_server.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_server.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_io.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_io.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_io.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_io.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_keyexport.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_keyexport.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_keyexport.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_keyexport.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_lru.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_lru.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_lru.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_lru.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_rec_cbc.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_rec_cbc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_rec_cbc.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_rec_cbc.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_rec_ccm.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_rec_ccm.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_rec_ccm.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_rec_ccm.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_rec_chapol.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_rec_chapol.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_rec_chapol.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_rec_chapol.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_rec_gcm.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_rec_gcm.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_rec_gcm.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_rec_gcm.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_scert_single_ec.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_scert_single_ec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_scert_single_ec.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_scert_single_ec.c
diff --git a/lib/bearssl-esp8266/src/ssl/ssl_scert_single_rsa.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_scert_single_rsa.c
similarity index 100%
rename from lib/bearssl-esp8266/src/ssl/ssl_scert_single_rsa.c
rename to lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_scert_single_rsa.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_big_cbcdec.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_big_cbcdec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_big_cbcdec.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_big_cbcdec.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_big_cbcenc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_big_cbcenc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_big_cbcenc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_big_cbcenc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_big_ctr.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_big_ctr.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_big_ctr.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_big_ctr.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_big_ctrcbc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_big_ctrcbc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_big_ctrcbc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_big_ctrcbc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_big_dec.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_big_dec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_big_dec.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_big_dec.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_big_enc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_big_enc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_big_enc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_big_enc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_common.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_common.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_common.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_common.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct64.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct64.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct64_cbcdec.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64_cbcdec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct64_cbcdec.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64_cbcdec.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct64_cbcenc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64_cbcenc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct64_cbcenc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64_cbcenc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct64_ctr.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64_ctr.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct64_ctr.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64_ctr.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct64_ctrcbc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64_ctrcbc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct64_ctrcbc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64_ctrcbc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct64_dec.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64_dec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct64_dec.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64_dec.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct64_enc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64_enc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct64_enc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct64_enc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct_cbcdec.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct_cbcdec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct_cbcdec.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct_cbcdec.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct_cbcenc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct_cbcenc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct_cbcenc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct_cbcenc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct_ctr.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct_ctr.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct_ctr.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct_ctr.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct_ctrcbc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct_ctrcbc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct_ctrcbc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct_ctrcbc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct_dec.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct_dec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct_dec.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct_dec.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_ct_enc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct_enc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_ct_enc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_ct_enc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_small_cbcdec.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_small_cbcdec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_small_cbcdec.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_small_cbcdec.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_small_cbcenc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_small_cbcenc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_small_cbcenc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_small_cbcenc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_small_ctr.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_small_ctr.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_small_ctr.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_small_ctr.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_small_ctrcbc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_small_ctrcbc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_small_ctrcbc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_small_ctrcbc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_small_dec.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_small_dec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_small_dec.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_small_dec.c
diff --git a/lib/bearssl-esp8266/src/symcipher/aes_small_enc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_small_enc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/aes_small_enc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/aes_small_enc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/chacha20_ct.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/chacha20_ct.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/chacha20_ct.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/chacha20_ct.c
diff --git a/lib/bearssl-esp8266/src/symcipher/chacha20_sse2.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/chacha20_sse2.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/chacha20_sse2.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/chacha20_sse2.c
diff --git a/lib/bearssl-esp8266/src/symcipher/des_ct.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/des_ct.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/des_ct.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/des_ct.c
diff --git a/lib/bearssl-esp8266/src/symcipher/des_ct_cbcdec.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/des_ct_cbcdec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/des_ct_cbcdec.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/des_ct_cbcdec.c
diff --git a/lib/bearssl-esp8266/src/symcipher/des_ct_cbcenc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/des_ct_cbcenc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/des_ct_cbcenc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/des_ct_cbcenc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/des_support.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/des_support.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/des_support.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/des_support.c
diff --git a/lib/bearssl-esp8266/src/symcipher/des_tab.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/des_tab.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/des_tab.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/des_tab.c
diff --git a/lib/bearssl-esp8266/src/symcipher/des_tab_cbcdec.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/des_tab_cbcdec.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/des_tab_cbcdec.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/des_tab_cbcdec.c
diff --git a/lib/bearssl-esp8266/src/symcipher/des_tab_cbcenc.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/des_tab_cbcenc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/des_tab_cbcenc.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/des_tab_cbcenc.c
diff --git a/lib/bearssl-esp8266/src/symcipher/poly1305_ctmul.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/poly1305_ctmul.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/poly1305_ctmul.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/poly1305_ctmul.c
diff --git a/lib/bearssl-esp8266/src/symcipher/poly1305_ctmul32.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/poly1305_ctmul32.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/poly1305_ctmul32.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/poly1305_ctmul32.c
diff --git a/lib/bearssl-esp8266/src/symcipher/poly1305_ctmulq.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/poly1305_ctmulq.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/poly1305_ctmulq.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/poly1305_ctmulq.c
diff --git a/lib/bearssl-esp8266/src/symcipher/poly1305_i15.c b/lib/lib_ssl/bearssl-esp8266/src/symcipher/poly1305_i15.c
similarity index 100%
rename from lib/bearssl-esp8266/src/symcipher/poly1305_i15.c
rename to lib/lib_ssl/bearssl-esp8266/src/symcipher/poly1305_i15.c
diff --git a/lib/bearssl-esp8266/src/t_bearssl.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl.h
diff --git a/lib/bearssl-esp8266/src/t_bearssl_aead.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_aead.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl_aead.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl_aead.h
diff --git a/lib/bearssl-esp8266/src/t_bearssl_block.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_block.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl_block.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl_block.h
diff --git a/lib/bearssl-esp8266/src/t_bearssl_ec.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_ec.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl_ec.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl_ec.h
diff --git a/lib/bearssl-esp8266/src/t_bearssl_hash.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_hash.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl_hash.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl_hash.h
diff --git a/lib/bearssl-esp8266/src/t_bearssl_hmac.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_hmac.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl_hmac.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl_hmac.h
diff --git a/lib/bearssl-esp8266/src/t_bearssl_kdf.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_kdf.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl_kdf.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl_kdf.h
diff --git a/lib/bearssl-esp8266/src/t_bearssl_pem.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_pem.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl_pem.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl_pem.h
diff --git a/lib/bearssl-esp8266/src/t_bearssl_prf.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_prf.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl_prf.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl_prf.h
diff --git a/lib/bearssl-esp8266/src/t_bearssl_rand.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_rand.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl_rand.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl_rand.h
diff --git a/lib/bearssl-esp8266/src/t_bearssl_rsa.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_rsa.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl_rsa.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl_rsa.h
diff --git a/lib/bearssl-esp8266/src/t_bearssl_ssl.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_ssl.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl_ssl.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl_ssl.h
diff --git a/lib/bearssl-esp8266/src/t_bearssl_tasmota_config.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_tasmota_config.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl_tasmota_config.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl_tasmota_config.h
diff --git a/lib/bearssl-esp8266/src/t_bearssl_x509.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_x509.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_bearssl_x509.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_bearssl_x509.h
diff --git a/lib/bearssl-esp8266/src/t_config.h b/lib/lib_ssl/bearssl-esp8266/src/t_config.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_config.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_config.h
diff --git a/lib/bearssl-esp8266/src/t_inner.h b/lib/lib_ssl/bearssl-esp8266/src/t_inner.h
similarity index 100%
rename from lib/bearssl-esp8266/src/t_inner.h
rename to lib/lib_ssl/bearssl-esp8266/src/t_inner.h
diff --git a/lib/bearssl-esp8266/src/x509/asn1enc.c b/lib/lib_ssl/bearssl-esp8266/src/x509/asn1enc.c
similarity index 100%
rename from lib/bearssl-esp8266/src/x509/asn1enc.c
rename to lib/lib_ssl/bearssl-esp8266/src/x509/asn1enc.c
diff --git a/lib/bearssl-esp8266/src/x509/encode_ec_pk8der.c b/lib/lib_ssl/bearssl-esp8266/src/x509/encode_ec_pk8der.c
similarity index 100%
rename from lib/bearssl-esp8266/src/x509/encode_ec_pk8der.c
rename to lib/lib_ssl/bearssl-esp8266/src/x509/encode_ec_pk8der.c
diff --git a/lib/bearssl-esp8266/src/x509/encode_ec_rawder.c b/lib/lib_ssl/bearssl-esp8266/src/x509/encode_ec_rawder.c
similarity index 100%
rename from lib/bearssl-esp8266/src/x509/encode_ec_rawder.c
rename to lib/lib_ssl/bearssl-esp8266/src/x509/encode_ec_rawder.c
diff --git a/lib/bearssl-esp8266/src/x509/encode_rsa_pk8der.c b/lib/lib_ssl/bearssl-esp8266/src/x509/encode_rsa_pk8der.c
similarity index 100%
rename from lib/bearssl-esp8266/src/x509/encode_rsa_pk8der.c
rename to lib/lib_ssl/bearssl-esp8266/src/x509/encode_rsa_pk8der.c
diff --git a/lib/bearssl-esp8266/src/x509/encode_rsa_rawder.c b/lib/lib_ssl/bearssl-esp8266/src/x509/encode_rsa_rawder.c
similarity index 100%
rename from lib/bearssl-esp8266/src/x509/encode_rsa_rawder.c
rename to lib/lib_ssl/bearssl-esp8266/src/x509/encode_rsa_rawder.c
diff --git a/lib/bearssl-esp8266/src/x509/pkey_decoder.c b/lib/lib_ssl/bearssl-esp8266/src/x509/pkey_decoder.c
similarity index 100%
rename from lib/bearssl-esp8266/src/x509/pkey_decoder.c
rename to lib/lib_ssl/bearssl-esp8266/src/x509/pkey_decoder.c
diff --git a/lib/bearssl-esp8266/src/x509/skey_decoder.c b/lib/lib_ssl/bearssl-esp8266/src/x509/skey_decoder.c
similarity index 100%
rename from lib/bearssl-esp8266/src/x509/skey_decoder.c
rename to lib/lib_ssl/bearssl-esp8266/src/x509/skey_decoder.c
diff --git a/lib/bearssl-esp8266/src/x509/x509_decoder.c b/lib/lib_ssl/bearssl-esp8266/src/x509/x509_decoder.c
similarity index 100%
rename from lib/bearssl-esp8266/src/x509/x509_decoder.c
rename to lib/lib_ssl/bearssl-esp8266/src/x509/x509_decoder.c
diff --git a/lib/bearssl-esp8266/src/x509/x509_knownkey.c b/lib/lib_ssl/bearssl-esp8266/src/x509/x509_knownkey.c
similarity index 100%
rename from lib/bearssl-esp8266/src/x509/x509_knownkey.c
rename to lib/lib_ssl/bearssl-esp8266/src/x509/x509_knownkey.c
diff --git a/lib/bearssl-esp8266/src/x509/x509_minimal.c b/lib/lib_ssl/bearssl-esp8266/src/x509/x509_minimal.c
similarity index 100%
rename from lib/bearssl-esp8266/src/x509/x509_minimal.c
rename to lib/lib_ssl/bearssl-esp8266/src/x509/x509_minimal.c
diff --git a/lib/bearssl-esp8266/src/x509/x509_minimal_full.c b/lib/lib_ssl/bearssl-esp8266/src/x509/x509_minimal_full.c
similarity index 100%
rename from lib/bearssl-esp8266/src/x509/x509_minimal_full.c
rename to lib/lib_ssl/bearssl-esp8266/src/x509/x509_minimal_full.c
diff --git a/libesp32/ESP32-Ethernet/README.md b/lib/libesp32/ESP32-Ethernet/README.md
similarity index 100%
rename from libesp32/ESP32-Ethernet/README.md
rename to lib/libesp32/ESP32-Ethernet/README.md
diff --git a/libesp32/ESP32-Ethernet/examples/EthernetLAN_IP101/EthernetLAN_IP101.ino b/lib/libesp32/ESP32-Ethernet/examples/EthernetLAN_IP101/EthernetLAN_IP101.ino
similarity index 100%
rename from libesp32/ESP32-Ethernet/examples/EthernetLAN_IP101/EthernetLAN_IP101.ino
rename to lib/libesp32/ESP32-Ethernet/examples/EthernetLAN_IP101/EthernetLAN_IP101.ino
diff --git a/libesp32/ESP32-Ethernet/library.properties b/lib/libesp32/ESP32-Ethernet/library.properties
similarity index 100%
rename from libesp32/ESP32-Ethernet/library.properties
rename to lib/libesp32/ESP32-Ethernet/library.properties
diff --git a/libesp32/ESP32-Ethernet/src/ETH.cpp b/lib/libesp32/ESP32-Ethernet/src/ETH.cpp
similarity index 100%
rename from libesp32/ESP32-Ethernet/src/ETH.cpp
rename to lib/libesp32/ESP32-Ethernet/src/ETH.cpp
diff --git a/libesp32/ESP32-Ethernet/src/ETH.h b/lib/libesp32/ESP32-Ethernet/src/ETH.h
similarity index 100%
rename from libesp32/ESP32-Ethernet/src/ETH.h
rename to lib/libesp32/ESP32-Ethernet/src/ETH.h
diff --git a/libesp32/ESP32-Mail-Client/LICENSE b/lib/libesp32/ESP32-Mail-Client/LICENSE
similarity index 100%
rename from libesp32/ESP32-Mail-Client/LICENSE
rename to lib/libesp32/ESP32-Mail-Client/LICENSE
diff --git a/libesp32/ESP32-Mail-Client/README.md b/lib/libesp32/ESP32-Mail-Client/README.md
similarity index 100%
rename from libesp32/ESP32-Mail-Client/README.md
rename to lib/libesp32/ESP32-Mail-Client/README.md
diff --git a/libesp32/ESP32-Mail-Client/examples/Receive_email/Receive_email.ino b/lib/libesp32/ESP32-Mail-Client/examples/Receive_email/Receive_email.ino
similarity index 100%
rename from libesp32/ESP32-Mail-Client/examples/Receive_email/Receive_email.ino
rename to lib/libesp32/ESP32-Mail-Client/examples/Receive_email/Receive_email.ino
diff --git a/libesp32/ESP32-Mail-Client/examples/Send_email/Send_email.ino b/lib/libesp32/ESP32-Mail-Client/examples/Send_email/Send_email.ino
similarity index 100%
rename from libesp32/ESP32-Mail-Client/examples/Send_email/Send_email.ino
rename to lib/libesp32/ESP32-Mail-Client/examples/Send_email/Send_email.ino
diff --git a/libesp32/ESP32-Mail-Client/examples/Send_email/image.h b/lib/libesp32/ESP32-Mail-Client/examples/Send_email/image.h
similarity index 100%
rename from libesp32/ESP32-Mail-Client/examples/Send_email/image.h
rename to lib/libesp32/ESP32-Mail-Client/examples/Send_email/image.h
diff --git a/libesp32/ESP32-Mail-Client/examples/Set_flag/Set_flag.ino b/lib/libesp32/ESP32-Mail-Client/examples/Set_flag/Set_flag.ino
similarity index 100%
rename from libesp32/ESP32-Mail-Client/examples/Set_flag/Set_flag.ino
rename to lib/libesp32/ESP32-Mail-Client/examples/Set_flag/Set_flag.ino
diff --git a/libesp32/ESP32-Mail-Client/examples/Time/Time.ino b/lib/libesp32/ESP32-Mail-Client/examples/Time/Time.ino
similarity index 100%
rename from libesp32/ESP32-Mail-Client/examples/Time/Time.ino
rename to lib/libesp32/ESP32-Mail-Client/examples/Time/Time.ino
diff --git a/libesp32/ESP32-Mail-Client/keywords.txt b/lib/libesp32/ESP32-Mail-Client/keywords.txt
similarity index 100%
rename from libesp32/ESP32-Mail-Client/keywords.txt
rename to lib/libesp32/ESP32-Mail-Client/keywords.txt
diff --git a/libesp32/ESP32-Mail-Client/library.properties b/lib/libesp32/ESP32-Mail-Client/library.properties
similarity index 100%
rename from libesp32/ESP32-Mail-Client/library.properties
rename to lib/libesp32/ESP32-Mail-Client/library.properties
diff --git a/libesp32/ESP32-Mail-Client/media/images/esp32-mail.jpg b/lib/libesp32/ESP32-Mail-Client/media/images/esp32-mail.jpg
similarity index 100%
rename from libesp32/ESP32-Mail-Client/media/images/esp32-mail.jpg
rename to lib/libesp32/ESP32-Mail-Client/media/images/esp32-mail.jpg
diff --git a/libesp32/ESP32-Mail-Client/media/images/esp32-mail.png b/lib/libesp32/ESP32-Mail-Client/media/images/esp32-mail.png
similarity index 100%
rename from libesp32/ESP32-Mail-Client/media/images/esp32-mail.png
rename to lib/libesp32/ESP32-Mail-Client/media/images/esp32-mail.png
diff --git a/libesp32/ESP32-Mail-Client/src/ESP32MailHTTPClient.cpp b/lib/libesp32/ESP32-Mail-Client/src/ESP32MailHTTPClient.cpp
similarity index 100%
rename from libesp32/ESP32-Mail-Client/src/ESP32MailHTTPClient.cpp
rename to lib/libesp32/ESP32-Mail-Client/src/ESP32MailHTTPClient.cpp
diff --git a/libesp32/ESP32-Mail-Client/src/ESP32MailHTTPClient.h b/lib/libesp32/ESP32-Mail-Client/src/ESP32MailHTTPClient.h
similarity index 100%
rename from libesp32/ESP32-Mail-Client/src/ESP32MailHTTPClient.h
rename to lib/libesp32/ESP32-Mail-Client/src/ESP32MailHTTPClient.h
diff --git a/libesp32/ESP32-Mail-Client/src/ESP32TimeHelper.cpp b/lib/libesp32/ESP32-Mail-Client/src/ESP32TimeHelper.cpp
similarity index 100%
rename from libesp32/ESP32-Mail-Client/src/ESP32TimeHelper.cpp
rename to lib/libesp32/ESP32-Mail-Client/src/ESP32TimeHelper.cpp
diff --git a/libesp32/ESP32-Mail-Client/src/ESP32TimeHelper.h b/lib/libesp32/ESP32-Mail-Client/src/ESP32TimeHelper.h
similarity index 100%
rename from libesp32/ESP32-Mail-Client/src/ESP32TimeHelper.h
rename to lib/libesp32/ESP32-Mail-Client/src/ESP32TimeHelper.h
diff --git a/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.cpp b/lib/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.cpp
similarity index 100%
rename from libesp32/ESP32-Mail-Client/src/ESP32_MailClient.cpp
rename to lib/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.cpp
diff --git a/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.h b/lib/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.h
similarity index 100%
rename from libesp32/ESP32-Mail-Client/src/ESP32_MailClient.h
rename to lib/libesp32/ESP32-Mail-Client/src/ESP32_MailClient.h
diff --git a/libesp32/ESP32-Mail-Client/src/RFC2047.cpp b/lib/libesp32/ESP32-Mail-Client/src/RFC2047.cpp
similarity index 100%
rename from libesp32/ESP32-Mail-Client/src/RFC2047.cpp
rename to lib/libesp32/ESP32-Mail-Client/src/RFC2047.cpp
diff --git a/libesp32/ESP32-Mail-Client/src/RFC2047.h b/lib/libesp32/ESP32-Mail-Client/src/RFC2047.h
similarity index 100%
rename from libesp32/ESP32-Mail-Client/src/RFC2047.h
rename to lib/libesp32/ESP32-Mail-Client/src/RFC2047.h
diff --git a/libesp32/ESP32-Mail-Client/src/WiFiClientSecureESP32.cpp b/lib/libesp32/ESP32-Mail-Client/src/WiFiClientSecureESP32.cpp
similarity index 100%
rename from libesp32/ESP32-Mail-Client/src/WiFiClientSecureESP32.cpp
rename to lib/libesp32/ESP32-Mail-Client/src/WiFiClientSecureESP32.cpp
diff --git a/libesp32/ESP32-Mail-Client/src/WiFiClientSecureESP32.h b/lib/libesp32/ESP32-Mail-Client/src/WiFiClientSecureESP32.h
similarity index 100%
rename from libesp32/ESP32-Mail-Client/src/WiFiClientSecureESP32.h
rename to lib/libesp32/ESP32-Mail-Client/src/WiFiClientSecureESP32.h
diff --git a/libesp32/ESP32-Mail-Client/src/ssl_client32.cpp b/lib/libesp32/ESP32-Mail-Client/src/ssl_client32.cpp
similarity index 100%
rename from libesp32/ESP32-Mail-Client/src/ssl_client32.cpp
rename to lib/libesp32/ESP32-Mail-Client/src/ssl_client32.cpp
diff --git a/libesp32/ESP32-Mail-Client/src/ssl_client32.h b/lib/libesp32/ESP32-Mail-Client/src/ssl_client32.h
similarity index 100%
rename from libesp32/ESP32-Mail-Client/src/ssl_client32.h
rename to lib/libesp32/ESP32-Mail-Client/src/ssl_client32.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/README.adoc b/lib/libesp32/ESP32-to-ESP8266-compat/README.adoc
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/README.adoc
rename to lib/libesp32/ESP32-to-ESP8266-compat/README.adoc
diff --git a/libesp32/ESP32-to-ESP8266-compat/keywords.txt b/lib/libesp32/ESP32-to-ESP8266-compat/keywords.txt
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/keywords.txt
rename to lib/libesp32/ESP32-to-ESP8266-compat/keywords.txt
diff --git a/libesp32/ESP32-to-ESP8266-compat/library.properties b/lib/libesp32/ESP32-to-ESP8266-compat/library.properties
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/library.properties
rename to lib/libesp32/ESP32-to-ESP8266-compat/library.properties
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/AddrList.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/AddrList.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/AddrList.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/AddrList.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/ESP8266HTTPClient.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266HTTPClient.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/ESP8266HTTPClient.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266HTTPClient.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WebServer.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WebServer.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/ESP8266WebServer.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WebServer.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WiFi.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WiFi.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/ESP8266WiFi.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WiFi.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/ESP8266httpUpdate.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266httpUpdate.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/ESP8266httpUpdate.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266httpUpdate.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/ESP8266mDNS.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266mDNS.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/ESP8266mDNS.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266mDNS.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/c_types.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/c_types.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/c_types.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/c_types.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/eboot_command.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/eboot_command.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/eboot_command.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/eboot_command.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/ets_sys.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/ets_sys.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/ets_sys.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/ets_sys.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/gpio.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/gpio.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/gpio.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/gpio.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/os_type.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/os_type.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/os_type.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/os_type.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/osapi.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/osapi.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/osapi.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/osapi.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/sntp.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/sntp.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/sntp.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/sntp.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/spi_flash.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/spi_flash.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/spi_flash.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/spi_flash.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/twi.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/twi.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/twi.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/twi.h
diff --git a/libesp32/ESP32-to-ESP8266-compat/src/user_interface.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/user_interface.h
similarity index 100%
rename from libesp32/ESP32-to-ESP8266-compat/src/user_interface.h
rename to lib/libesp32/ESP32-to-ESP8266-compat/src/user_interface.h
diff --git a/libesp32/ESP32README.md b/lib/libesp32/ESP32README.md
similarity index 100%
rename from libesp32/ESP32README.md
rename to lib/libesp32/ESP32README.md
diff --git a/libesp32/NimBLE-Arduino/CHANGELOG.md b/lib/libesp32/NimBLE-Arduino/CHANGELOG.md
similarity index 100%
rename from libesp32/NimBLE-Arduino/CHANGELOG.md
rename to lib/libesp32/NimBLE-Arduino/CHANGELOG.md
diff --git a/libesp32/NimBLE-Arduino/LICENSE b/lib/libesp32/NimBLE-Arduino/LICENSE
similarity index 100%
rename from libesp32/NimBLE-Arduino/LICENSE
rename to lib/libesp32/NimBLE-Arduino/LICENSE
diff --git a/libesp32/NimBLE-Arduino/README.md b/lib/libesp32/NimBLE-Arduino/README.md
similarity index 100%
rename from libesp32/NimBLE-Arduino/README.md
rename to lib/libesp32/NimBLE-Arduino/README.md
diff --git a/libesp32/NimBLE-Arduino/docs/Improvements_and_updates.md b/lib/libesp32/NimBLE-Arduino/docs/Improvements_and_updates.md
similarity index 100%
rename from libesp32/NimBLE-Arduino/docs/Improvements_and_updates.md
rename to lib/libesp32/NimBLE-Arduino/docs/Improvements_and_updates.md
diff --git a/libesp32/NimBLE-Arduino/docs/Migration_guide.md b/lib/libesp32/NimBLE-Arduino/docs/Migration_guide.md
similarity index 100%
rename from libesp32/NimBLE-Arduino/docs/Migration_guide.md
rename to lib/libesp32/NimBLE-Arduino/docs/Migration_guide.md
diff --git a/libesp32/NimBLE-Arduino/docs/New_user_guide.md b/lib/libesp32/NimBLE-Arduino/docs/New_user_guide.md
similarity index 100%
rename from libesp32/NimBLE-Arduino/docs/New_user_guide.md
rename to lib/libesp32/NimBLE-Arduino/docs/New_user_guide.md
diff --git a/libesp32/NimBLE-Arduino/examples/BLE_Beacon_Scanner/BLE_Beacon_Scanner.ino b/lib/libesp32/NimBLE-Arduino/examples/BLE_Beacon_Scanner/BLE_Beacon_Scanner.ino
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/BLE_Beacon_Scanner/BLE_Beacon_Scanner.ino
rename to lib/libesp32/NimBLE-Arduino/examples/BLE_Beacon_Scanner/BLE_Beacon_Scanner.ino
diff --git a/libesp32/NimBLE-Arduino/examples/BLE_Beacon_Scanner/BLE_Beacon_Scanner.md b/lib/libesp32/NimBLE-Arduino/examples/BLE_Beacon_Scanner/BLE_Beacon_Scanner.md
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/BLE_Beacon_Scanner/BLE_Beacon_Scanner.md
rename to lib/libesp32/NimBLE-Arduino/examples/BLE_Beacon_Scanner/BLE_Beacon_Scanner.md
diff --git a/libesp32/NimBLE-Arduino/examples/BLE_EddystoneTLM_Beacon/BLE_EddystoneTLM_Beacon.ino b/lib/libesp32/NimBLE-Arduino/examples/BLE_EddystoneTLM_Beacon/BLE_EddystoneTLM_Beacon.ino
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/BLE_EddystoneTLM_Beacon/BLE_EddystoneTLM_Beacon.ino
rename to lib/libesp32/NimBLE-Arduino/examples/BLE_EddystoneTLM_Beacon/BLE_EddystoneTLM_Beacon.ino
diff --git a/libesp32/NimBLE-Arduino/examples/BLE_EddystoneTLM_Beacon/BLE_EddystoneTLM_Beacon.md b/lib/libesp32/NimBLE-Arduino/examples/BLE_EddystoneTLM_Beacon/BLE_EddystoneTLM_Beacon.md
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/BLE_EddystoneTLM_Beacon/BLE_EddystoneTLM_Beacon.md
rename to lib/libesp32/NimBLE-Arduino/examples/BLE_EddystoneTLM_Beacon/BLE_EddystoneTLM_Beacon.md
diff --git a/libesp32/NimBLE-Arduino/examples/BLE_EddystoneURL_Beacon/BLE_EddystoneURL_Beacon.ino b/lib/libesp32/NimBLE-Arduino/examples/BLE_EddystoneURL_Beacon/BLE_EddystoneURL_Beacon.ino
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/BLE_EddystoneURL_Beacon/BLE_EddystoneURL_Beacon.ino
rename to lib/libesp32/NimBLE-Arduino/examples/BLE_EddystoneURL_Beacon/BLE_EddystoneURL_Beacon.ino
diff --git a/libesp32/NimBLE-Arduino/examples/BLE_EddystoneURL_Beacon/BLE_EddystoneURL_Beacon.md b/lib/libesp32/NimBLE-Arduino/examples/BLE_EddystoneURL_Beacon/BLE_EddystoneURL_Beacon.md
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/BLE_EddystoneURL_Beacon/BLE_EddystoneURL_Beacon.md
rename to lib/libesp32/NimBLE-Arduino/examples/BLE_EddystoneURL_Beacon/BLE_EddystoneURL_Beacon.md
diff --git a/libesp32/NimBLE-Arduino/examples/NimBLE_Client/NimBLE_Client.ino b/lib/libesp32/NimBLE-Arduino/examples/NimBLE_Client/NimBLE_Client.ino
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/NimBLE_Client/NimBLE_Client.ino
rename to lib/libesp32/NimBLE-Arduino/examples/NimBLE_Client/NimBLE_Client.ino
diff --git a/libesp32/NimBLE-Arduino/examples/NimBLE_Server/NimBLE_Server.ino b/lib/libesp32/NimBLE-Arduino/examples/NimBLE_Server/NimBLE_Server.ino
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/NimBLE_Server/NimBLE_Server.ino
rename to lib/libesp32/NimBLE-Arduino/examples/NimBLE_Server/NimBLE_Server.ino
diff --git a/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_client/BLE_client.ino b/lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_client/BLE_client.ino
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_client/BLE_client.ino
rename to lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_client/BLE_client.ino
diff --git a/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_iBeacon/BLE_iBeacon.ino b/lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_iBeacon/BLE_iBeacon.ino
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_iBeacon/BLE_iBeacon.ino
rename to lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_iBeacon/BLE_iBeacon.ino
diff --git a/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_notify/BLE_notify.ino b/lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_notify/BLE_notify.ino
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_notify/BLE_notify.ino
rename to lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_notify/BLE_notify.ino
diff --git a/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_scan/BLE_scan.ino b/lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_scan/BLE_scan.ino
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_scan/BLE_scan.ino
rename to lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_scan/BLE_scan.ino
diff --git a/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_server/BLE_server.ino b/lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_server/BLE_server.ino
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_server/BLE_server.ino
rename to lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_server/BLE_server.ino
diff --git a/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_server_multiconnect/BLE_server_multiconnect.ino b/lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_server_multiconnect/BLE_server_multiconnect.ino
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_server_multiconnect/BLE_server_multiconnect.ino
rename to lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_server_multiconnect/BLE_server_multiconnect.ino
diff --git a/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_uart/BLE_uart.ino b/lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_uart/BLE_uart.ino
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_uart/BLE_uart.ino
rename to lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_uart/BLE_uart.ino
diff --git a/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_write/BLE_write.ino b/lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_write/BLE_write.ino
similarity index 100%
rename from libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_write/BLE_write.ino
rename to lib/libesp32/NimBLE-Arduino/examples/Refactored_original_examples/BLE_write/BLE_write.ino
diff --git a/libesp32/NimBLE-Arduino/library.properties b/lib/libesp32/NimBLE-Arduino/library.properties
similarity index 100%
rename from libesp32/NimBLE-Arduino/library.properties
rename to lib/libesp32/NimBLE-Arduino/library.properties
diff --git a/libesp32/NimBLE-Arduino/src/CODING_STANDARDS.md b/lib/libesp32/NimBLE-Arduino/src/CODING_STANDARDS.md
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/CODING_STANDARDS.md
rename to lib/libesp32/NimBLE-Arduino/src/CODING_STANDARDS.md
diff --git a/libesp32/NimBLE-Arduino/src/FreeRTOS.cpp b/lib/libesp32/NimBLE-Arduino/src/FreeRTOS.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/FreeRTOS.cpp
rename to lib/libesp32/NimBLE-Arduino/src/FreeRTOS.cpp
diff --git a/libesp32/NimBLE-Arduino/src/FreeRTOS.h b/lib/libesp32/NimBLE-Arduino/src/FreeRTOS.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/FreeRTOS.h
rename to lib/libesp32/NimBLE-Arduino/src/FreeRTOS.h
diff --git a/libesp32/NimBLE-Arduino/src/HIDKeyboardTypes.h b/lib/libesp32/NimBLE-Arduino/src/HIDKeyboardTypes.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/HIDKeyboardTypes.h
rename to lib/libesp32/NimBLE-Arduino/src/HIDKeyboardTypes.h
diff --git a/libesp32/NimBLE-Arduino/src/HIDTypes.h b/lib/libesp32/NimBLE-Arduino/src/HIDTypes.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/HIDTypes.h
rename to lib/libesp32/NimBLE-Arduino/src/HIDTypes.h
diff --git a/libesp32/NimBLE-Arduino/src/NOTICE b/lib/libesp32/NimBLE-Arduino/src/NOTICE
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NOTICE
rename to lib/libesp32/NimBLE-Arduino/src/NOTICE
diff --git a/libesp32/NimBLE-Arduino/src/NimBLE2904.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLE2904.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLE2904.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLE2904.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLE2904.h b/lib/libesp32/NimBLE-Arduino/src/NimBLE2904.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLE2904.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLE2904.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEAddress.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEAddress.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEAddress.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEAddress.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEAddress.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEAddress.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEAddress.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEAddress.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEAdvertisedDevice.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEAdvertisedDevice.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEAdvertisedDevice.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEAdvertisedDevice.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEAdvertisedDevice.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEAdvertisedDevice.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEAdvertisedDevice.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEAdvertisedDevice.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEAdvertising.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEAdvertising.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEAdvertising.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEAdvertising.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEAdvertising.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEAdvertising.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEAdvertising.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEAdvertising.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEBeacon.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEBeacon.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEBeacon.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEBeacon.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEBeacon.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEBeacon.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEBeacon.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEBeacon.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLECharacteristic.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLECharacteristic.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLECharacteristic.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLECharacteristic.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLECharacteristic.h b/lib/libesp32/NimBLE-Arduino/src/NimBLECharacteristic.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLECharacteristic.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLECharacteristic.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEClient.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEClient.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEClient.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEClient.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEClient.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEClient.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEClient.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEClient.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEDescriptor.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEDescriptor.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEDescriptor.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEDescriptor.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEDescriptor.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEDescriptor.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEDescriptor.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEDescriptor.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEDevice.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEDevice.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEDevice.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEDevice.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEDevice.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEDevice.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEDevice.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEDevice.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEEddystoneTLM.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEEddystoneTLM.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEEddystoneTLM.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEEddystoneTLM.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEEddystoneTLM.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEEddystoneTLM.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEEddystoneTLM.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEEddystoneTLM.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEEddystoneURL.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEEddystoneURL.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEEddystoneURL.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEEddystoneURL.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEEddystoneURL.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEEddystoneURL.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEEddystoneURL.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEEddystoneURL.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLELog.h b/lib/libesp32/NimBLE-Arduino/src/NimBLELog.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLELog.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLELog.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLERemoteCharacteristic.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLERemoteCharacteristic.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLERemoteCharacteristic.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLERemoteCharacteristic.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLERemoteCharacteristic.h b/lib/libesp32/NimBLE-Arduino/src/NimBLERemoteCharacteristic.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLERemoteCharacteristic.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLERemoteCharacteristic.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLERemoteDescriptor.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLERemoteDescriptor.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLERemoteDescriptor.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLERemoteDescriptor.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLERemoteDescriptor.h b/lib/libesp32/NimBLE-Arduino/src/NimBLERemoteDescriptor.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLERemoteDescriptor.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLERemoteDescriptor.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLERemoteService.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLERemoteService.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLERemoteService.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLERemoteService.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLERemoteService.h b/lib/libesp32/NimBLE-Arduino/src/NimBLERemoteService.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLERemoteService.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLERemoteService.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEScan.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEScan.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEScan.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEScan.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEScan.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEScan.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEScan.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEScan.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLESecurity.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLESecurity.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLESecurity.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLESecurity.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLESecurity.h b/lib/libesp32/NimBLE-Arduino/src/NimBLESecurity.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLESecurity.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLESecurity.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEServer.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEServer.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEServer.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEServer.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEServer.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEServer.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEServer.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEServer.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEService.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEService.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEService.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEService.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEService.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEService.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEService.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEService.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEUUID.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEUUID.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEUUID.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEUUID.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEUUID.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEUUID.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEUUID.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEUUID.h
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEUtils.cpp b/lib/libesp32/NimBLE-Arduino/src/NimBLEUtils.cpp
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEUtils.cpp
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEUtils.cpp
diff --git a/libesp32/NimBLE-Arduino/src/NimBLEUtils.h b/lib/libesp32/NimBLE-Arduino/src/NimBLEUtils.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/NimBLEUtils.h
rename to lib/libesp32/NimBLE-Arduino/src/NimBLEUtils.h
diff --git a/libesp32/NimBLE-Arduino/src/README.md b/lib/libesp32/NimBLE-Arduino/src/README.md
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/README.md
rename to lib/libesp32/NimBLE-Arduino/src/README.md
diff --git a/libesp32/NimBLE-Arduino/src/RELEASE_NOTES.md b/lib/libesp32/NimBLE-Arduino/src/RELEASE_NOTES.md
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/RELEASE_NOTES.md
rename to lib/libesp32/NimBLE-Arduino/src/RELEASE_NOTES.md
diff --git a/libesp32/NimBLE-Arduino/src/console/console.h b/lib/libesp32/NimBLE-Arduino/src/console/console.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/console/console.h
rename to lib/libesp32/NimBLE-Arduino/src/console/console.h
diff --git a/libesp32/NimBLE-Arduino/src/esp-hci/src/esp_nimble_hci.c b/lib/libesp32/NimBLE-Arduino/src/esp-hci/src/esp_nimble_hci.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/esp-hci/src/esp_nimble_hci.c
rename to lib/libesp32/NimBLE-Arduino/src/esp-hci/src/esp_nimble_hci.c
diff --git a/libesp32/NimBLE-Arduino/src/esp_compiler.h b/lib/libesp32/NimBLE-Arduino/src/esp_compiler.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/esp_compiler.h
rename to lib/libesp32/NimBLE-Arduino/src/esp_compiler.h
diff --git a/libesp32/NimBLE-Arduino/src/esp_nimble_cfg.h b/lib/libesp32/NimBLE-Arduino/src/esp_nimble_cfg.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/esp_nimble_cfg.h
rename to lib/libesp32/NimBLE-Arduino/src/esp_nimble_cfg.h
diff --git a/libesp32/NimBLE-Arduino/src/esp_nimble_hci.h b/lib/libesp32/NimBLE-Arduino/src/esp_nimble_hci.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/esp_nimble_hci.h
rename to lib/libesp32/NimBLE-Arduino/src/esp_nimble_hci.h
diff --git a/libesp32/NimBLE-Arduino/src/esp_nimble_mem.h b/lib/libesp32/NimBLE-Arduino/src/esp_nimble_mem.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/esp_nimble_mem.h
rename to lib/libesp32/NimBLE-Arduino/src/esp_nimble_mem.h
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/AUTHORS b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/AUTHORS
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/AUTHORS
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/AUTHORS
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/LICENSE b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/LICENSE
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/LICENSE
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/LICENSE
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/README b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/README
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/README
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/README
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/VERSION b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/VERSION
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/VERSION
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/VERSION
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/documentation/tinycrypt.rst b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/documentation/tinycrypt.rst
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/documentation/tinycrypt.rst
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/documentation/tinycrypt.rst
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/aes_decrypt.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/aes_decrypt.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/aes_decrypt.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/aes_decrypt.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/aes_encrypt.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/aes_encrypt.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/aes_encrypt.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/aes_encrypt.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/cbc_mode.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/cbc_mode.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/cbc_mode.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/cbc_mode.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ccm_mode.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ccm_mode.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ccm_mode.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ccm_mode.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/cmac_mode.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/cmac_mode.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/cmac_mode.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/cmac_mode.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_mode.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_mode.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_mode.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_mode.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_prng.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_prng.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_prng.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_prng.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dh.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dh.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dh.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dh.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dsa.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dsa.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dsa.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dsa.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_platform_specific.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_platform_specific.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_platform_specific.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_platform_specific.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/hmac.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/hmac.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/hmac.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/hmac.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/hmac_prng.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/hmac_prng.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/hmac_prng.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/hmac_prng.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/sha256.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/sha256.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/sha256.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/sha256.c
diff --git a/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/utils.c b/lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/utils.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/utils.c
rename to lib/libesp32/NimBLE-Arduino/src/ext/tinycrypt/src/utils.c
diff --git a/libesp32/NimBLE-Arduino/src/hal/hal_timer.h b/lib/libesp32/NimBLE-Arduino/src/hal/hal_timer.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/hal/hal_timer.h
rename to lib/libesp32/NimBLE-Arduino/src/hal/hal_timer.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_att.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_att.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_att.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_att.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_eddystone.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_eddystone.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_eddystone.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_eddystone.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_gap.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_gap.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_gap.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_gap.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_gatt.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_gatt.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_gatt.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_gatt.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_hs.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_hs.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_hs.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_hs.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_hs_adv.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_hs_adv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_hs_adv.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_hs_adv.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_hs_hci.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_hs_hci.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_hs_hci.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_hs_hci.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_hs_id.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_hs_id.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_hs_id.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_hs_id.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_hs_log.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_hs_log.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_hs_log.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_hs_log.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_hs_mbuf.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_hs_mbuf.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_hs_mbuf.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_hs_mbuf.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_hs_pvcy.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_hs_pvcy.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_hs_pvcy.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_hs_pvcy.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_hs_stop.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_hs_stop.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_hs_stop.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_hs_stop.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_ibeacon.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_ibeacon.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_ibeacon.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_ibeacon.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_l2cap.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_l2cap.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_l2cap.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_l2cap.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_monitor.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_monitor.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_monitor.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_monitor.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_sm.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_sm.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_sm.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_sm.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_store.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_store.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_store.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_store.h
diff --git a/libesp32/NimBLE-Arduino/src/host/ble_uuid.h b/lib/libesp32/NimBLE-Arduino/src/host/ble_uuid.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/ble_uuid.h
rename to lib/libesp32/NimBLE-Arduino/src/host/ble_uuid.h
diff --git a/libesp32/NimBLE-Arduino/src/host/util/util.h b/lib/libesp32/NimBLE-Arduino/src/host/util/util.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/host/util/util.h
rename to lib/libesp32/NimBLE-Arduino/src/host/util/util.h
diff --git a/libesp32/NimBLE-Arduino/src/log/log.h b/lib/libesp32/NimBLE-Arduino/src/log/log.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/log/log.h
rename to lib/libesp32/NimBLE-Arduino/src/log/log.h
diff --git a/libesp32/NimBLE-Arduino/src/mem/mem.h b/lib/libesp32/NimBLE-Arduino/src/mem/mem.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mem/mem.h
rename to lib/libesp32/NimBLE-Arduino/src/mem/mem.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/access.h b/lib/libesp32/NimBLE-Arduino/src/mesh/access.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/access.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/access.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/cfg_cli.h b/lib/libesp32/NimBLE-Arduino/src/mesh/cfg_cli.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/cfg_cli.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/cfg_cli.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/cfg_srv.h b/lib/libesp32/NimBLE-Arduino/src/mesh/cfg_srv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/cfg_srv.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/cfg_srv.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/glue.h b/lib/libesp32/NimBLE-Arduino/src/mesh/glue.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/glue.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/glue.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/health_cli.h b/lib/libesp32/NimBLE-Arduino/src/mesh/health_cli.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/health_cli.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/health_cli.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/health_srv.h b/lib/libesp32/NimBLE-Arduino/src/mesh/health_srv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/health_srv.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/health_srv.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/main.h b/lib/libesp32/NimBLE-Arduino/src/mesh/main.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/main.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/main.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/mesh.h b/lib/libesp32/NimBLE-Arduino/src/mesh/mesh.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/mesh.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/mesh.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/model_cli.h b/lib/libesp32/NimBLE-Arduino/src/mesh/model_cli.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/model_cli.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/model_cli.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/model_srv.h b/lib/libesp32/NimBLE-Arduino/src/mesh/model_srv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/model_srv.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/model_srv.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/porting.h b/lib/libesp32/NimBLE-Arduino/src/mesh/porting.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/porting.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/porting.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/proxy.h b/lib/libesp32/NimBLE-Arduino/src/mesh/proxy.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/proxy.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/proxy.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/slist.h b/lib/libesp32/NimBLE-Arduino/src/mesh/slist.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/slist.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/slist.h
diff --git a/libesp32/NimBLE-Arduino/src/mesh/testing.h b/lib/libesp32/NimBLE-Arduino/src/mesh/testing.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/mesh/testing.h
rename to lib/libesp32/NimBLE-Arduino/src/mesh/testing.h
diff --git a/libesp32/NimBLE-Arduino/src/modlog/modlog.h b/lib/libesp32/NimBLE-Arduino/src/modlog/modlog.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/modlog/modlog.h
rename to lib/libesp32/NimBLE-Arduino/src/modlog/modlog.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/ble.h b/lib/libesp32/NimBLE-Arduino/src/nimble/ble.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/ble.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/ble.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/ble_hci_trans.h b/lib/libesp32/NimBLE-Arduino/src/nimble/ble_hci_trans.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/ble_hci_trans.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/ble_hci_trans.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/hci_common.h b/lib/libesp32/NimBLE-Arduino/src/nimble/hci_common.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/hci_common.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/hci_common.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/access.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/access.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/access.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/access.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/access.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/access.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/access.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/access.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/adv.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/adv.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/adv.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/adv.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/adv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/adv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/adv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/adv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/atomic.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/atomic.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/atomic.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/atomic.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_att_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_att_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_att_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_att_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_gatt_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_gatt_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_gatt_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_gatt_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_hs_conn_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_hs_conn_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_hs_conn_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_hs_conn_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_coc_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_coc_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_coc_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_coc_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_sig_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_sig_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_sig_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_sig_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_cli.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_cli.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_cli.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_cli.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_srv.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_srv.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_srv.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_srv.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/foundation.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/foundation.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/foundation.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/foundation.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/friend.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/friend.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/friend.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/friend.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/friend.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/friend.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/friend.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/friend.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/glue.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/glue.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/glue.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/glue.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/health_cli.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/health_cli.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/health_cli.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/health_cli.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/health_srv.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/health_srv.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/health_srv.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/health_srv.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/mesh.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/mesh.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/mesh.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/mesh.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/mesh_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/mesh_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/mesh_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/mesh_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/model_cli.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/model_cli.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/model_cli.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/model_cli.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/model_srv.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/model_srv.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/model_srv.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/model_srv.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/net.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/net.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/net.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/net.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/net.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/net.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/net.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/net.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/prov.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/prov.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/prov.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/prov.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/prov.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/prov.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/prov.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/prov.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/settings.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/settings.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/settings.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/settings.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/settings.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/settings.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/settings.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/settings.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/shell.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/shell.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/shell.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/shell.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/shell.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/shell.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/shell.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/shell.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_cmd_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_cmd_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_cmd_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_cmd_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gap_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gap_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gap_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gap_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gatt_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gatt_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gatt_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gatt_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_adv_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_adv_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_adv_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_adv_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_atomic_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_atomic_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_atomic_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_atomic_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_conn_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_conn_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_conn_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_conn_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_dbg_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_dbg_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_dbg_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_dbg_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_flow_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_flow_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_flow_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_flow_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_hci_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_hci_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_hci_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_hci_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_id_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_id_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_id_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_id_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_mbuf_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_mbuf_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_mbuf_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_mbuf_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_periodic_sync_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_periodic_sync_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_periodic_sync_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_periodic_sync_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_pvcy_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_pvcy_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_pvcy_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_pvcy_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_resolv_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_resolv_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_resolv_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_resolv_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_startup_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_startup_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_startup_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_startup_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_coc_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_coc_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_coc_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_coc_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_sig_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_sig_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_sig_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_sig_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_monitor_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_monitor_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_monitor_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_monitor_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_sm_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_sm_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_sm_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_sm_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_uuid_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_uuid_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_uuid_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_uuid_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/testing.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/testing.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/testing.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/testing.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/testing.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/testing.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/testing.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/testing.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/transport.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/transport.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/transport.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/transport.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/transport.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/transport.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/transport.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/mesh/src/transport.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/services/ans/src/ble_svc_ans.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/services/ans/src/ble_svc_ans.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/services/ans/src/ble_svc_ans.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/services/ans/src/ble_svc_ans.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/services/bas/src/ble_svc_bas.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/services/bas/src/ble_svc_bas.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/services/bas/src/ble_svc_bas.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/services/bas/src/ble_svc_bas.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/services/gap/src/ble_svc_gap.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/services/gap/src/ble_svc_gap.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/services/gap/src/ble_svc_gap.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/services/gap/src/ble_svc_gap.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/services/gatt/src/ble_svc_gatt.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/services/gatt/src/ble_svc_gatt.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/services/gatt/src/ble_svc_gatt.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/services/gatt/src/ble_svc_gatt.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/services/ias/src/ble_svc_ias.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/services/ias/src/ble_svc_ias.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/services/ias/src/ble_svc_ias.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/services/ias/src/ble_svc_ias.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/services/ipss/src/ble_svc_ipss.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/services/ipss/src/ble_svc_ipss.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/services/ipss/src/ble_svc_ipss.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/services/ipss/src/ble_svc_ipss.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/services/lls/src/ble_svc_lls.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/services/lls/src/ble_svc_lls.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/services/lls/src/ble_svc_lls.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/services/lls/src/ble_svc_lls.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_hs_hci_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_hs_hci_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_hs_hci_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_hs_hci_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_svc_tps.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_svc_tps.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_svc_tps.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_svc_tps.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_clt.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_clt.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_clt.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_clt.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_svr.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_svr.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_svr.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_att_svr.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_eddystone.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_eddystone.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_eddystone.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_eddystone.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gap.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gap.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gap.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gap.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gap_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gap_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gap_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gap_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gatt_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gatt_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gatt_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gatt_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gattc.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gattc.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gattc.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gattc.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gatts.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gatts.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gatts.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gatts.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gatts_lcl.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gatts_lcl.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gatts_lcl.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_gatts_lcl.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_atomic.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_atomic.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_atomic.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_atomic.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_atomic_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_atomic_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_atomic_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_atomic_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_cfg.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_cfg.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_cfg.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_cfg.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_dbg.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_dbg.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_dbg.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_dbg.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_dbg_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_dbg_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_dbg_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_dbg_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_cmd.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_cmd.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_cmd.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_cmd.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_evt.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_evt.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_evt.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_evt.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_util.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_util.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_util.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_util.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_id.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_id.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_id.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_id.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_id_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_id_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_id_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_id_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_log.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_log.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_log.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_log.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_misc.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_misc.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_misc.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_misc.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_mqueue.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_mqueue.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_mqueue.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_mqueue.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_shutdown.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_shutdown.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_shutdown.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_shutdown.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_stop.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_stop.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_stop.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_hs_stop.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_ibeacon.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_ibeacon.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_ibeacon.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_ibeacon.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig_cmd.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig_cmd.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig_cmd.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig_cmd.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_monitor.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_monitor.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_monitor.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_monitor.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_monitor_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_monitor_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_monitor_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_monitor_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_alg.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_alg.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_alg.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_alg.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_cmd.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_cmd.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_cmd.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_cmd.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_lgcy.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_lgcy.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_lgcy.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_lgcy.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_sc.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_sc.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_sc.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_sm_sc.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_store.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_store.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_store.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_store.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_store_util.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_store_util.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_store_util.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_store_util.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_uuid.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_uuid.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_uuid.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_uuid.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_uuid_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_uuid_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/src/ble_uuid_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/src/ble_uuid_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_config.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_config.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_config.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_config.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_config_priv.h b/lib/libesp32/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_config_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_config_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_config_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_nvs.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_nvs.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_nvs.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_nvs.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/store/ram/src/ble_store_ram.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/store/ram/src/ble_store_ram.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/store/ram/src/ble_store_ram.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/store/ram/src/ble_store_ram.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/host/util/src/addr.c b/lib/libesp32/NimBLE-Arduino/src/nimble/host/util/src/addr.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/host/util/src/addr.c
rename to lib/libesp32/NimBLE-Arduino/src/nimble/host/util/src/addr.c
diff --git a/libesp32/NimBLE-Arduino/src/nimble/nimble_npl.h b/lib/libesp32/NimBLE-Arduino/src/nimble/nimble_npl.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/nimble_npl.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/nimble_npl.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/nimble_npl_os.h b/lib/libesp32/NimBLE-Arduino/src/nimble/nimble_npl_os.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/nimble_npl_os.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/nimble_npl_os.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/nimble_opt.h b/lib/libesp32/NimBLE-Arduino/src/nimble/nimble_opt.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/nimble_opt.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/nimble_opt.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/nimble_opt_auto.h b/lib/libesp32/NimBLE-Arduino/src/nimble/nimble_opt_auto.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/nimble_opt_auto.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/nimble_opt_auto.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/nimble_port.h b/lib/libesp32/NimBLE-Arduino/src/nimble/nimble_port.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/nimble_port.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/nimble_port.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/nimble_port_freertos.h b/lib/libesp32/NimBLE-Arduino/src/nimble/nimble_port_freertos.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/nimble_port_freertos.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/nimble_port_freertos.h
diff --git a/libesp32/NimBLE-Arduino/src/nimble/npl_freertos.h b/lib/libesp32/NimBLE-Arduino/src/nimble/npl_freertos.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimble/npl_freertos.h
rename to lib/libesp32/NimBLE-Arduino/src/nimble/npl_freertos.h
diff --git a/libesp32/NimBLE-Arduino/src/nimconfig.h b/lib/libesp32/NimBLE-Arduino/src/nimconfig.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/nimconfig.h
rename to lib/libesp32/NimBLE-Arduino/src/nimconfig.h
diff --git a/libesp32/NimBLE-Arduino/src/os/endian.h b/lib/libesp32/NimBLE-Arduino/src/os/endian.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/os/endian.h
rename to lib/libesp32/NimBLE-Arduino/src/os/endian.h
diff --git a/libesp32/NimBLE-Arduino/src/os/os.h b/lib/libesp32/NimBLE-Arduino/src/os/os.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/os/os.h
rename to lib/libesp32/NimBLE-Arduino/src/os/os.h
diff --git a/libesp32/NimBLE-Arduino/src/os/os_cputime.h b/lib/libesp32/NimBLE-Arduino/src/os/os_cputime.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/os/os_cputime.h
rename to lib/libesp32/NimBLE-Arduino/src/os/os_cputime.h
diff --git a/libesp32/NimBLE-Arduino/src/os/os_error.h b/lib/libesp32/NimBLE-Arduino/src/os/os_error.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/os/os_error.h
rename to lib/libesp32/NimBLE-Arduino/src/os/os_error.h
diff --git a/libesp32/NimBLE-Arduino/src/os/os_mbuf.h b/lib/libesp32/NimBLE-Arduino/src/os/os_mbuf.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/os/os_mbuf.h
rename to lib/libesp32/NimBLE-Arduino/src/os/os_mbuf.h
diff --git a/libesp32/NimBLE-Arduino/src/os/os_mempool.h b/lib/libesp32/NimBLE-Arduino/src/os/os_mempool.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/os/os_mempool.h
rename to lib/libesp32/NimBLE-Arduino/src/os/os_mempool.h
diff --git a/libesp32/NimBLE-Arduino/src/os/os_trace_api.h b/lib/libesp32/NimBLE-Arduino/src/os/os_trace_api.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/os/os_trace_api.h
rename to lib/libesp32/NimBLE-Arduino/src/os/os_trace_api.h
diff --git a/libesp32/NimBLE-Arduino/src/os/queue.h b/lib/libesp32/NimBLE-Arduino/src/os/queue.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/os/queue.h
rename to lib/libesp32/NimBLE-Arduino/src/os/queue.h
diff --git a/libesp32/NimBLE-Arduino/src/port/src/esp_nimble_mem.c b/lib/libesp32/NimBLE-Arduino/src/port/src/esp_nimble_mem.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/port/src/esp_nimble_mem.c
rename to lib/libesp32/NimBLE-Arduino/src/port/src/esp_nimble_mem.c
diff --git a/libesp32/NimBLE-Arduino/src/porting/nimble/include/nimble/nimble_port.h b/lib/libesp32/NimBLE-Arduino/src/porting/nimble/include/nimble/nimble_port.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/porting/nimble/include/nimble/nimble_port.h
rename to lib/libesp32/NimBLE-Arduino/src/porting/nimble/include/nimble/nimble_port.h
diff --git a/libesp32/NimBLE-Arduino/src/porting/nimble/src/endian.c b/lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/endian.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/porting/nimble/src/endian.c
rename to lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/endian.c
diff --git a/libesp32/NimBLE-Arduino/src/porting/nimble/src/hal_timer.c b/lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/hal_timer.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/porting/nimble/src/hal_timer.c
rename to lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/hal_timer.c
diff --git a/libesp32/NimBLE-Arduino/src/porting/nimble/src/mem.c b/lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/mem.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/porting/nimble/src/mem.c
rename to lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/mem.c
diff --git a/libesp32/NimBLE-Arduino/src/porting/nimble/src/nimble_port.c b/lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/nimble_port.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/porting/nimble/src/nimble_port.c
rename to lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/nimble_port.c
diff --git a/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_cputime.c b/lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_cputime.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/porting/nimble/src/os_cputime.c
rename to lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_cputime.c
diff --git a/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_cputime_pwr2.c b/lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_cputime_pwr2.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/porting/nimble/src/os_cputime_pwr2.c
rename to lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_cputime_pwr2.c
diff --git a/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_mbuf.c b/lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_mbuf.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/porting/nimble/src/os_mbuf.c
rename to lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_mbuf.c
diff --git a/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_mempool.c b/lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_mempool.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/porting/nimble/src/os_mempool.c
rename to lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_mempool.c
diff --git a/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_msys_init.c b/lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_msys_init.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/porting/nimble/src/os_msys_init.c
rename to lib/libesp32/NimBLE-Arduino/src/porting/nimble/src/os_msys_init.c
diff --git a/libesp32/NimBLE-Arduino/src/porting/npl/freertos/src/nimble_port_freertos.c b/lib/libesp32/NimBLE-Arduino/src/porting/npl/freertos/src/nimble_port_freertos.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/porting/npl/freertos/src/nimble_port_freertos.c
rename to lib/libesp32/NimBLE-Arduino/src/porting/npl/freertos/src/nimble_port_freertos.c
diff --git a/libesp32/NimBLE-Arduino/src/porting/npl/freertos/src/npl_os_freertos.c b/lib/libesp32/NimBLE-Arduino/src/porting/npl/freertos/src/npl_os_freertos.c
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/porting/npl/freertos/src/npl_os_freertos.c
rename to lib/libesp32/NimBLE-Arduino/src/porting/npl/freertos/src/npl_os_freertos.c
diff --git a/libesp32/NimBLE-Arduino/src/services/ans/ble_svc_ans.h b/lib/libesp32/NimBLE-Arduino/src/services/ans/ble_svc_ans.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/services/ans/ble_svc_ans.h
rename to lib/libesp32/NimBLE-Arduino/src/services/ans/ble_svc_ans.h
diff --git a/libesp32/NimBLE-Arduino/src/services/bas/ble_svc_bas.h b/lib/libesp32/NimBLE-Arduino/src/services/bas/ble_svc_bas.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/services/bas/ble_svc_bas.h
rename to lib/libesp32/NimBLE-Arduino/src/services/bas/ble_svc_bas.h
diff --git a/libesp32/NimBLE-Arduino/src/services/gap/ble_svc_gap.h b/lib/libesp32/NimBLE-Arduino/src/services/gap/ble_svc_gap.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/services/gap/ble_svc_gap.h
rename to lib/libesp32/NimBLE-Arduino/src/services/gap/ble_svc_gap.h
diff --git a/libesp32/NimBLE-Arduino/src/services/gatt/ble_svc_gatt.h b/lib/libesp32/NimBLE-Arduino/src/services/gatt/ble_svc_gatt.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/services/gatt/ble_svc_gatt.h
rename to lib/libesp32/NimBLE-Arduino/src/services/gatt/ble_svc_gatt.h
diff --git a/libesp32/NimBLE-Arduino/src/services/ias/ble_svc_ias.h b/lib/libesp32/NimBLE-Arduino/src/services/ias/ble_svc_ias.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/services/ias/ble_svc_ias.h
rename to lib/libesp32/NimBLE-Arduino/src/services/ias/ble_svc_ias.h
diff --git a/libesp32/NimBLE-Arduino/src/services/ipss/ble_svc_ipss.h b/lib/libesp32/NimBLE-Arduino/src/services/ipss/ble_svc_ipss.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/services/ipss/ble_svc_ipss.h
rename to lib/libesp32/NimBLE-Arduino/src/services/ipss/ble_svc_ipss.h
diff --git a/libesp32/NimBLE-Arduino/src/services/lls/ble_svc_lls.h b/lib/libesp32/NimBLE-Arduino/src/services/lls/ble_svc_lls.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/services/lls/ble_svc_lls.h
rename to lib/libesp32/NimBLE-Arduino/src/services/lls/ble_svc_lls.h
diff --git a/libesp32/NimBLE-Arduino/src/services/tps/ble_svc_tps.h b/lib/libesp32/NimBLE-Arduino/src/services/tps/ble_svc_tps.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/services/tps/ble_svc_tps.h
rename to lib/libesp32/NimBLE-Arduino/src/services/tps/ble_svc_tps.h
diff --git a/libesp32/NimBLE-Arduino/src/src/ble_hs_hci_priv.h b/lib/libesp32/NimBLE-Arduino/src/src/ble_hs_hci_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/src/ble_hs_hci_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/src/ble_hs_hci_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/src/ble_sm_priv.h b/lib/libesp32/NimBLE-Arduino/src/src/ble_sm_priv.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/src/ble_sm_priv.h
rename to lib/libesp32/NimBLE-Arduino/src/src/ble_sm_priv.h
diff --git a/libesp32/NimBLE-Arduino/src/stats/stats.h b/lib/libesp32/NimBLE-Arduino/src/stats/stats.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/stats/stats.h
rename to lib/libesp32/NimBLE-Arduino/src/stats/stats.h
diff --git a/libesp32/NimBLE-Arduino/src/store/config/ble_store_config.h b/lib/libesp32/NimBLE-Arduino/src/store/config/ble_store_config.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/store/config/ble_store_config.h
rename to lib/libesp32/NimBLE-Arduino/src/store/config/ble_store_config.h
diff --git a/libesp32/NimBLE-Arduino/src/store/ram/ble_store_ram.h b/lib/libesp32/NimBLE-Arduino/src/store/ram/ble_store_ram.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/store/ram/ble_store_ram.h
rename to lib/libesp32/NimBLE-Arduino/src/store/ram/ble_store_ram.h
diff --git a/libesp32/NimBLE-Arduino/src/syscfg/syscfg.h b/lib/libesp32/NimBLE-Arduino/src/syscfg/syscfg.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/syscfg/syscfg.h
rename to lib/libesp32/NimBLE-Arduino/src/syscfg/syscfg.h
diff --git a/libesp32/NimBLE-Arduino/src/sysinit/sysinit.h b/lib/libesp32/NimBLE-Arduino/src/sysinit/sysinit.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/sysinit/sysinit.h
rename to lib/libesp32/NimBLE-Arduino/src/sysinit/sysinit.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/AUTHORS b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/AUTHORS
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/AUTHORS
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/AUTHORS
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/LICENSE b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/LICENSE
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/LICENSE
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/LICENSE
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/README b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/README
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/README
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/README
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/VERSION b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/VERSION
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/VERSION
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/VERSION
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/aes.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/aes.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/aes.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/aes.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/cbc_mode.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/cbc_mode.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/cbc_mode.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/cbc_mode.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/ccm_mode.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/ccm_mode.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/ccm_mode.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/ccm_mode.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/cmac_mode.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/cmac_mode.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/cmac_mode.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/cmac_mode.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/constants.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/constants.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/constants.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/constants.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/ctr_mode.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/ctr_mode.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/ctr_mode.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/ctr_mode.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/ctr_prng.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/ctr_prng.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/ctr_prng.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/ctr_prng.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/documentation/tinycrypt.rst b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/documentation/tinycrypt.rst
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/documentation/tinycrypt.rst
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/documentation/tinycrypt.rst
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/ecc.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/ecc.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/ecc.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/ecc.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/ecc_dh.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/ecc_dh.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/ecc_dh.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/ecc_dh.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/ecc_dsa.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/ecc_dsa.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/ecc_dsa.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/ecc_dsa.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/ecc_platform_specific.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/ecc_platform_specific.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/ecc_platform_specific.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/ecc_platform_specific.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/hmac.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/hmac.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/hmac.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/hmac.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/hmac_prng.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/hmac_prng.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/hmac_prng.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/hmac_prng.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/sha256.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/sha256.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/sha256.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/sha256.h
diff --git a/libesp32/NimBLE-Arduino/src/tinycrypt/utils.h b/lib/libesp32/NimBLE-Arduino/src/tinycrypt/utils.h
similarity index 100%
rename from libesp32/NimBLE-Arduino/src/tinycrypt/utils.h
rename to lib/libesp32/NimBLE-Arduino/src/tinycrypt/utils.h
diff --git a/libesp32/TTGO_TWatch_Library/LICENSE b/lib/libesp32/TTGO_TWatch_Library/LICENSE
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/LICENSE
rename to lib/libesp32/TTGO_TWatch_Library/LICENSE
diff --git a/libesp32/TTGO_TWatch_Library/README.MD b/lib/libesp32/TTGO_TWatch_Library/README.MD
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/README.MD
rename to lib/libesp32/TTGO_TWatch_Library/README.MD
diff --git a/libesp32/TTGO_TWatch_Library/library.json b/lib/libesp32/TTGO_TWatch_Library/library.json
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/library.json
rename to lib/libesp32/TTGO_TWatch_Library/library.json
diff --git a/libesp32/TTGO_TWatch_Library/library.properties b/lib/libesp32/TTGO_TWatch_Library/library.properties
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/library.properties
rename to lib/libesp32/TTGO_TWatch_Library/library.properties
diff --git a/libesp32/TTGO_TWatch_Library/src/axp20x.cpp b/lib/libesp32/TTGO_TWatch_Library/src/axp20x.cpp
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/src/axp20x.cpp
rename to lib/libesp32/TTGO_TWatch_Library/src/axp20x.cpp
diff --git a/libesp32/TTGO_TWatch_Library/src/axp20x.h b/lib/libesp32/TTGO_TWatch_Library/src/axp20x.h
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/src/axp20x.h
rename to lib/libesp32/TTGO_TWatch_Library/src/axp20x.h
diff --git a/libesp32/TTGO_TWatch_Library/src/bma.cpp b/lib/libesp32/TTGO_TWatch_Library/src/bma.cpp
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/src/bma.cpp
rename to lib/libesp32/TTGO_TWatch_Library/src/bma.cpp
diff --git a/libesp32/TTGO_TWatch_Library/src/bma.h b/lib/libesp32/TTGO_TWatch_Library/src/bma.h
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/src/bma.h
rename to lib/libesp32/TTGO_TWatch_Library/src/bma.h
diff --git a/libesp32/TTGO_TWatch_Library/src/bma4.c b/lib/libesp32/TTGO_TWatch_Library/src/bma4.c
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/src/bma4.c
rename to lib/libesp32/TTGO_TWatch_Library/src/bma4.c
diff --git a/libesp32/TTGO_TWatch_Library/src/bma4.h b/lib/libesp32/TTGO_TWatch_Library/src/bma4.h
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/src/bma4.h
rename to lib/libesp32/TTGO_TWatch_Library/src/bma4.h
diff --git a/libesp32/TTGO_TWatch_Library/src/bma423.c b/lib/libesp32/TTGO_TWatch_Library/src/bma423.c
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/src/bma423.c
rename to lib/libesp32/TTGO_TWatch_Library/src/bma423.c
diff --git a/libesp32/TTGO_TWatch_Library/src/bma423.h b/lib/libesp32/TTGO_TWatch_Library/src/bma423.h
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/src/bma423.h
rename to lib/libesp32/TTGO_TWatch_Library/src/bma423.h
diff --git a/libesp32/TTGO_TWatch_Library/src/bma4_defs.h b/lib/libesp32/TTGO_TWatch_Library/src/bma4_defs.h
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/src/bma4_defs.h
rename to lib/libesp32/TTGO_TWatch_Library/src/bma4_defs.h
diff --git a/libesp32/TTGO_TWatch_Library/src/i2c_bus.cpp b/lib/libesp32/TTGO_TWatch_Library/src/i2c_bus.cpp
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/src/i2c_bus.cpp
rename to lib/libesp32/TTGO_TWatch_Library/src/i2c_bus.cpp
diff --git a/libesp32/TTGO_TWatch_Library/src/i2c_bus.h b/lib/libesp32/TTGO_TWatch_Library/src/i2c_bus.h
similarity index 100%
rename from libesp32/TTGO_TWatch_Library/src/i2c_bus.h
rename to lib/libesp32/TTGO_TWatch_Library/src/i2c_bus.h
diff --git a/platformio.ini b/platformio.ini
index d31f9a455..84970115a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -54,7 +54,7 @@ default_envs =
 [platformio]
 description = Provide ESP8266 / ESP32 based devices with Web, MQTT and OTA firmware
 src_dir = tasmota
-lib_dir = lib
+lib_dir = lib/default
 build_cache_dir = .cache
 extra_configs = platformio_tasmota32.ini
                 platformio_tasmota_env.ini
@@ -81,8 +81,16 @@ upload_speed              = 115200
 upload_resetmethod        = nodemcu
 upload_port               = COM5
 extra_scripts             = ${scripts_defaults.extra_scripts}
+lib_ldf_mode              = chain+  
 shared_libdeps_dir        = lib
-lib_ignore                = ${esp82xx_defaults.lib_ignore}
+lib_extra_dirs            = 
+                            lib/lib_basic
+                            lib/lib_i2c
+                            lib/lib_display
+                            lib/lib_ssl
+                            lib/lib_audio
+                            lib/lib_rf
+                            lib/lib_div
 
 [scripts_defaults]
 extra_scripts             = pio/strip-floats.py
@@ -123,22 +131,7 @@ build_flags               = ${esp_defaults.build_flags}
                             -DPSTR_ALIGN=1
                             ; restrict to minimal mime-types
                             -DMIMETYPE_MINIMAL
-
-lib_ignore                = Servo(esp8266)
-                            ESP8266AVRISP
-                            ESP8266LLMNR
-                            ESP8266NetBIOS
-                            ESP8266SSDP
-                            ESP8266WiFiMesh
-                            Ethernet(esp8266)
-                            GDBStub
-                            TFT_Touch_Shield_V2
-                            ESP8266WiFiMesh
-                            EspSoftwareSerial
-                            SPISlave
-                            Hash
-                            
-
+                           
 [irremoteesp_full]
 build_flags               = -DUSE_IR_REMOTE_FULL
                             -U_IR_ENABLE_DEFAULT_
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 9afe61b04..058ad1788 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -72,6 +72,30 @@ extra_scripts             = ${scripts_defaults.extra_scripts}
 ;                            pio/strip-floats.py
 ;                            pio/http-uploader.py
 
+lib_ldf_mode              = chain+  
+shared_libdeps_dir        = lib
+
+; *** Library disable / enable for variant Tasmota. Disable reduces compile time
+; *** !!! Disabling needed libs will generate compile errors !!!
+; *** The resulting firmware will NOT be different if you leave all libs enabled
+; *** Disabling by putting a ";" in front of the lib name
+; *** If you dont know what it is all about, do not change
+lib_extra_dirs            = 
+; *** Only disabled for Tasmota minimal and Tasmota light. For all other variants needed!
+                            lib/lib_basic
+; **** I2C devices. Most sensors. Disable only if you dont have ANY I2C device enabled
+                            lib/lib_i2c
+; *** Displays. Disable if you dont have any Display activated
+                            lib/lib_display
+; *** Bear SSL and base64. Disable if you dont have SSL or TLS activated
+                            lib/lib_ssl
+; *** Audio needs a lot of time to compile. Mostly not used functions. Recommended to disable
+                            lib/lib_audio
+; *** RF 433 stuff (not RF Bridge). Recommended to disable
+                            lib/lib_rf
+; *** Mostly not used functions. Recommended to disable
+                            lib/lib_div
+
 [core]
 ; Activate only (one set) if you want to override the standard core defined in platformio.ini !!!
 
@@ -156,7 +180,6 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ;                           -fexceptions
 ;                           -lstdc++-exc
 
-
 [core32]
 ; Activate Stage Core32 by removing ";" in next line, if you want to override the standard core32
 ;platform_packages       = ${core32_stage.platform_packages}
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index 2eb453954..6cc05dfe7 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -43,6 +43,7 @@ default_envs =  ${build_envs.default_envs}
 [core32]
 platform                = espressif32@2.0.0
 platform_packages       = tool-esptoolpy@1.20800.0
+                          platformio/framework-arduinoespressif32 @ 3.10004.201016
 
 [common32]
 platform                = ${core32.platform}
@@ -75,8 +76,28 @@ build_flags             = ${esp_defaults.build_flags}
     -D memcpy_P=memcpy
 	  -D memcmp_P=memcmp
 
-lib_extra_dirs =
-    libesp32
+lib_ldf_mode            = chain+  
+shared_libdeps_dir      = lib
+; *** Library disable / enable for variant Tasmota. Disable reduces compile time
+; *** !!! Disabling needed libs will generate compile errors !!!
+; *** The resulting firmware will NOT be different if you leave all libs enabled
+; *** Disabling by putting a ";" in front of the lib name
+; *** If you dont know what it is all about, do not change
+lib_extra_dirs            = 
+; *** ESP32 lib. ALWAYS needed for ESP32 !!!
+                            lib/libesp32
+; *** Only disabled for Tasmota minimal and Tasmota light. For all other variants needed!
+                            lib/lib_basic
+; **** I2C devices. Most sensors. Disable only if you dont have ANY I2C device enabled
+                            lib/lib_i2c
+; *** Displays. Disable if you dont have any Display activated
+                            lib/lib_display
+; *** Bear SSL and base64. Disable if you dont have SSL or TLS activated
+                            lib/lib_ssl
+; *** Audio needs a lot of time to compile. Mostly not used functions. Recommended to disable
+                            lib/lib_audio
+; *** RF 433 stuff (not RF Bridge). Recommended to disable
+                            lib/lib_rf
+; *** Mostly not used functions. Recommended to disable
+                            lib/lib_div
 
-lib_ignore =
-    cc1101
diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index 1fe97de07..9817fdb0f 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -14,87 +14,48 @@ upload_port = ${common.upload_port}
 upload_resetmethod = ${common.upload_resetmethod}
 upload_speed = ${common.upload_speed}
 extra_scripts = ${common.extra_scripts}
-lib_extra_dirs = ${common.shared_libdeps_dir}
-lib_ignore = ${common.lib_ignore}
+lib_extra_dirs = ${common.lib_extra_dirs}
+lib_ignore = 
+    Servo(esp8266)
+    ESP8266AVRISP
+    ESP8266LLMNR
+    ESP8266NetBIOS
+    ESP8266SSDP
+    SP8266WiFiMesh
+    Ethernet(esp8266)
+    GDBStub
+    TFT_Touch_Shield_V2
+    ESP8266HTTPUpdateServer
+    ESP8266WiFiMesh
+    EspSoftwareSerial
+    SPISlave
+    Hash
 
 [env:tasmota]
 
 [env:tasmota-minimal]
 build_flags = ${common.build_flags} -DFIRMWARE_MINIMAL
-lib_ignore = ${common.lib_ignore}
-    LittleFS(esp8266)
-    A4988_Stepper
-    Adafruit BusIO
-    Adafruit CCS811 Library
-    Adafruit GFX Library
-    Arduino ST7789 Library
-    Adafruit ILI9341
-    ILI9488
-    RA8876
-    Adafruit LED Backpack Library
-    Waveshare esp 2.9 inch e-paper display driver
-    LiquidCrystal_I2C
-    Adafruit MAX31865 library
-    Adafruit MCP9808 Library
-    Adafruit SGP30 Sensor
-    Adafruit SH1106-gemu-1.0
-    Adafruit SSD1306
-    Adafruit TSL2591
-    Joba Tsl2561 Library
-    Joba_Tsl2561
-    Adafruit VEML7700 Library
-    SSD3115
-    NTP Library
-    base64
-    C2Programmer
-    ;ESP KNX IP Library
-    I2Cdevlib-Core
-    MPU6050 I2C
-    LibTeleinfo
-    LinkedList
-    LOLIN_HP303B
-    Mutichannel_Gas_Sensor
-    NewPing
-    OneWire
-    OpenTherm Library
-    rc-switch
-    RF24
-    TasmotaModbus
-    TasmotaSerial
-    UdpListener
-    VL53L0X
-    VL53L1X
-    MLX90640
-    FrogmoreScd30
-    cc1101
-    EEPROM 24C128
-    BME680
-    FrogmoreScd30
-    FT5206_Library
-    HPMA115S0 Arduino Library
-    Grove - Multichannel Gas Sensor
-    BearSSL
-    OneWire
-    IRremoteESP8266
-    ESP8266Audio
-    ESP8266SAM
-    KeeloqLib
-    NeoPixelBus
+lib_extra_dirs = 
 
 [env:tasmota-lite]
 build_flags = ${common.build_flags} -DFIRMWARE_LITE
+lib_extra_dirs =
 
 [env:tasmota-knx]
 build_flags = ${common.build_flags} -DFIRMWARE_KNX_NO_EMULATION
+lib_extra_dirs = lib/lib_basic, lib/lib_div
 
 [env:tasmota-sensors]
 build_flags = ${common.build_flags} -DFIRMWARE_SENSORS
+lib_extra_dirs = lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div
 
 [env:tasmota-display]
 build_flags = ${common.build_flags} -DFIRMWARE_DISPLAYS
+lib_extra_dirs = lib/lib_basic, lib/lib_display
 
 [env:tasmota-ir]
 build_flags = ${common.build_flags} ${irremoteesp_full.build_flags} -DFIRMWARE_IR
+lib_extra_dirs = lib/lib_basic
 
 [env:tasmota-ircustom]
 build_flags = ${common.build_flags} ${irremoteesp_full.build_flags} -DFIRMWARE_IR_CUSTOM
@@ -102,6 +63,7 @@ build_flags = ${common.build_flags} ${irremoteesp_full.build_flags} -DFIRMWARE_I
 [env:tasmota-zbbridge]
 build_flags = ${common.build_flags} -DFIRMWARE_ZBBRIDGE
 board_build.f_cpu = 160000000L
+lib_extra_dirs = lib/lib_ssl 
 
 [env:tasmota-BG]
 build_flags = ${common.build_flags} -DMY_LANGUAGE=bg_BG
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 2e8b98fbb..58eb34a4a 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -13,40 +13,56 @@ upload_port             = ${common32.upload_port}
 upload_resetmethod      = ${common32.upload_resetmethod}
 upload_speed            = ${common32.upload_speed}
 extra_scripts           = ${common32.extra_scripts}
-lib_extra_dirs          = ${common32.lib_extra_dirs}
-lib_ignore              = ${common32.lib_ignore}
 build_unflags           = ${common32.build_unflags}
 build_flags             = ${common32.build_flags}
+lib_extra_dirs          = ${common32.lib_extra_dirs}
+lib_ignore              =
+    cc1101
+    ESP32 Azure IoT Arduino
+    ESP32 Async UDP
+    ESP32 BLE Arduino
+    SimpleBLE
+    NetBIOS
+    ESP32
+    Preferences
+    BluetoothSerial
 
 [env:tasmota32-webcam]
 extends = env:tasmota32
 board                   = esp32cam
 board_build.f_cpu       = 240000000L
 build_flags             = ${common32.build_flags} -DFIRMWARE_WEBCAM
+lib_extra_dirs          = lib/libesp32, lib/lib_basic
 
 [env:tasmota32-minimal]
 extends = env:tasmota32
 build_flags             = ${common32.build_flags} -DFIRMWARE_MINIMAL
+lib_extra_dirs          = lib/libesp32
 
 [env:tasmota32-lite]
 extends = env:tasmota32
 build_flags             = ${common32.build_flags} -DFIRMWARE_LITE
+lib_extra_dirs          = lib/libesp32
 
 [env:tasmota32-knx]
 extends = env:tasmota32
 build_flags             = ${common32.build_flags} -DFIRMWARE_KNX_NO_EMULATION
+lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_div
 
 [env:tasmota32-sensors]
 extends = env:tasmota32
 build_flags             = ${common32.build_flags} -DFIRMWARE_SENSORS
+lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div
 
 [env:tasmota32-display]
 extends = env:tasmota32
 build_flags             = ${common32.build_flags} -DFIRMWARE_DISPLAYS
+lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_display
 
 [env:tasmota32-ir]
 extends = env:tasmota32
 build_flags             = ${common32.build_flags} ${irremoteesp_full.build_flags} -DFIRMWARE_IR
+lib_extra_dirs          = lib/libesp32, lib/lib_basic
 
 [env:tasmota32-ircustom]
 extends = env:tasmota32
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 34b479e0e..e1497d93a 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -567,7 +567,7 @@
 //  #define USE_EZORTD                             // [I2cDriver55] Enable support for EZO's RTD sensor (+0k2 code) - Shared EZO code required for any EZO device (+1k2 code)
 //  #define USE_EZOHUM                             // [I2cDriver55] Enable support for EZO's HUM sensor (+0k3 code) - Shared EZO code required for any EZO device (+1k2 code)
 //  #define USE_EZOEC                              // [I2cDriver55] Enable support for EZO's EC sensor (+0k3 code) - Shared EZO code required for any EZO device (+1k2 code)
-//  #define USE_EZOCO2                             // [I2cDriver55] Enable support for EZO's CO2 sensor (+0k3 code) - Shared EZO code required for any EZO device (+1k2 code)
+//  #define USE_EZOCO2                             // [I2cDriver55] Enable support for EZO's CO2 sensor (+0k2 code) - Shared EZO code required for any EZO device (+1k2 code)
 
 //  #define USE_DISPLAY                            // Add I2C Display Support (+2k code)
     #define USE_DISPLAY_MODES1TO5                // Enable display mode 1 to 5 in addition to mode 0
diff --git a/tasmota/support_network.ino b/tasmota/support_network.ino
index da6512acb..ed4df6705 100644
--- a/tasmota/support_network.ino
+++ b/tasmota/support_network.ino
@@ -72,6 +72,7 @@ void MdnsAddServiceHttp(void) {
   if (1 == Mdns.begun) {
     Mdns.begun = 2;
     MDNS.addService("http", "tcp", WEB_PORT);
+    MDNS.addServiceTxt("http", "tcp", "devicetype", "tasmota");
   }
 }
 
diff --git a/tasmota/tasmota_configurations.h b/tasmota/tasmota_configurations.h
index 95fdcbea0..ed425a645 100644
--- a/tasmota/tasmota_configurations.h
+++ b/tasmota/tasmota_configurations.h
@@ -132,7 +132,7 @@
 //#define USE_EZORTD                             // [I2cDriver55] Enable support for EZO's RTD sensor (+0k2 code) - Shared EZO code required for any EZO device (+1k2 code)
 //#define USE_EZOHUM                             // [I2cDriver55] Enable support for EZO's HUM sensor (+0k3 code) - Shared EZO code required for any EZO device (+1k2 code)
 //#define USE_EZOEC                              // [I2cDriver55] Enable support for EZO's EC sensor (+0k3 code) - Shared EZO code required for any EZO device (+1k2 code)
-//#define USE_EZOCO2                             // [I2cDriver55] Enable support for EZO's CO2 sensor (+0k3 code) - Shared EZO code required for any EZO device (+1k2 code)
+//#define USE_EZOCO2                             // [I2cDriver55] Enable support for EZO's CO2 sensor (+0k2 code) - Shared EZO code required for any EZO device (+1k2 code)
 
 #define USE_MHZ19                                // Add support for MH-Z19 CO2 sensor (+2k code)
 #define USE_SENSEAIR                             // Add support for SenseAir K30, K70 and S8 CO2 sensor (+2k3 code)
diff --git a/tasmota/tasmota_globals.h b/tasmota/tasmota_globals.h
index e245f3f2f..fa6a4f9fc 100644
--- a/tasmota/tasmota_globals.h
+++ b/tasmota/tasmota_globals.h
@@ -33,10 +33,10 @@ extern "C" {
 }
 #endif
 
-//#ifdef USE_KNX  // Enabling this will fail compilation. It has no impact if not used. (20180417)
-#include <esp-knx-ip.h>
+#include <esp-knx-ip.h> // KNX Header files have to be global else compile fails -> lib/headers
+#ifdef USE_KNX 
 void KNX_CB_Action(message_t const &msg, void *arg);
-//#endif  // USE_KNX
+#endif  // USE_KNX
 
 void DomoticzTempHumPressureSensor(float temp, float hum, float baro = -1);
 char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, char inbetween = '\0');
diff --git a/tasmota/xdrv_10_rules.ino b/tasmota/xdrv_10_rules.ino
index e5a041674..accb43042 100644
--- a/tasmota/xdrv_10_rules.ino
+++ b/tasmota/xdrv_10_rules.ino
@@ -401,7 +401,7 @@ int32_t SetRule(uint32_t idx, const char *content, bool append = false) {
 
 /*******************************************************************************************/
 
-bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
+bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule, bool stop_all_rules)
 {
   // event = {"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089}}
   // event = {"System":{"Boot":1}}
@@ -575,7 +575,9 @@ bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
     }
   } else match = true;
 
-//AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Match 1 %d"), match);
+  if (stop_all_rules) { match = false; }
+
+//AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Match 1 %d, Triggers %08X, TriggerCount %d"), match, Rules.triggers[rule_set], Rules.trigger_count[rule_set]);
 
   if (bitRead(Settings.rule_once, rule_set)) {
     if (match) {                                       // Only allow match state changes
@@ -589,7 +591,7 @@ bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
     }
   }
 
-//AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Match 2 %d"), match);
+//AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Match 2 %d, Triggers %08X, TriggerCount %d"), match, Rules.triggers[rule_set], Rules.trigger_count[rule_set]);
 
   return match;
 }
@@ -696,8 +698,8 @@ bool RuleSetProcess(uint8_t rule_set, String &event_saved)
 
 //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Event |%s|, Rule |%s|, Command(s) |%s|"), event.c_str(), event_trigger.c_str(), commands.c_str());
 
-    if (RulesRuleMatch(rule_set, event, event_trigger)) {
-      if (plen == plen2) { stop_all_rules = true; }         // If BREAK was used on a triggered rule, Stop execution of this rule set
+    if (RulesRuleMatch(rule_set, event, event_trigger, stop_all_rules)) {
+      if (plen == plen2) { stop_all_rules = true; }       // If BREAK was used on a triggered rule, Stop execution of this rule set
       commands.trim();
       String ucommand = commands;
       ucommand.toUpperCase();
@@ -754,7 +756,6 @@ bool RuleSetProcess(uint8_t rule_set, String &event_saved)
 #endif
       ExecuteCommand(command, SRC_RULE);
       serviced = true;
-      if (stop_all_rules) { return serviced; }            // If BREAK was used, Stop execution of this rule set
     }
     plen += 6;
     Rules.trigger_count[rule_set]++;
@@ -2175,7 +2176,10 @@ void CmndMemory(void)
       if (XdrvMailbox.data_len > 0) {
 #ifdef USE_EXPRESSION
         if (XdrvMailbox.data[0] == '=') {  // Spaces already been skipped in data
-          dtostrfd(evaluateExpression(XdrvMailbox.data + 1, XdrvMailbox.data_len - 1), Settings.flag2.calc_resolution, SettingsText(SET_MEM1 + XdrvMailbox.index -1));
+          char rules_mem[FLOATSZ];
+          dtostrfd(evaluateExpression(XdrvMailbox.data + 1, XdrvMailbox.data_len - 1), Settings.flag2.calc_resolution, rules_mem);
+          SettingsUpdateText(SET_MEM1 + XdrvMailbox.index -1, rules_mem);
+
         } else {
           SettingsUpdateText(SET_MEM1 + XdrvMailbox.index -1, ('"' == XdrvMailbox.data[0]) ? "" : XdrvMailbox.data);
         }
diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino
index bb9e5caf9..85483c62c 100644
--- a/tasmota/xdrv_12_home_assistant.ino
+++ b/tasmota/xdrv_12_home_assistant.ino
@@ -322,7 +322,7 @@ void NewHAssDiscovery(void)
   if (!Settings.flag.hass_discovery) { // HassDiscoveryRelays(relays)
     Response_P(HASS_DISCOVER_DEVICE, WiFi.localIP().toString().c_str(), SettingsText(SET_DEVICENAME),
               stemp2, my_hostname, unique_id, ModuleName().c_str(), TuyaMod, GetStateText(0), GetStateText(1), GetStateText(2), GetStateText(3),
-              my_version, mqtt_topic, MQTT_FULLTOPIC, SUB_PREFIX, PUB_PREFIX, PUB_PREFIX2, Hass.RelLst, stemp3, stemp4, Settings.flag.button_swap,
+              my_version, mqtt_topic, SettingsText(SET_MQTT_FULLTOPIC), SUB_PREFIX, PUB_PREFIX, PUB_PREFIX2, Hass.RelLst, stemp3, stemp4, Settings.flag.button_swap,
               Settings.flag.button_single, Settings.flag.decimal_text, Settings.flag.not_power_linked, Settings.flag.hass_light, Settings.flag3.pwm_multi_channels,
               Settings.flag3.mqtt_buttons, Settings.flag3.shutter_mode, Settings.flag4.alexa_ct_range, light_controller.isCTRGBLinked(), Light.subtype);
   }
diff --git a/tasmota/xsns_78_ezo.ino b/tasmota/xsns_78_ezo.ino
index 783d86538..36fcea423 100644
--- a/tasmota/xsns_78_ezo.ino
+++ b/tasmota/xsns_78_ezo.ino
@@ -80,6 +80,8 @@ struct EZOStruct {
   virtual void ProcessMeasurement(void);
   virtual void Show(bool json, const char *name);
 
+  static const char id[] PROGMEM;
+
 protected:
   void ProcessMeasurement(char *const data, const uint32_t len, const uint32_t latency)
   {
@@ -108,7 +110,7 @@ protected:
   uint32_t  lastRead;
 };
 
-
+const char EZOStruct::id[] PROGMEM = "";
 
 #endif  // USE_EZO
 #endif  // USE_I2C
diff --git a/tasmota/xsns_78_ezoco2.ino b/tasmota/xsns_78_ezoco2.ino
index df23a05cf..f9f09e1c4 100644
--- a/tasmota/xsns_78_ezoco2.ino
+++ b/tasmota/xsns_78_ezoco2.ino
@@ -49,9 +49,13 @@ struct EZOCO2 : public EZOStruct {
     }
   }
 
+  static const char id[] PROGMEM;
+
 private:
   uint16_t  CO2;
 };
 
+const char EZOCO2::id[] PROGMEM = "CO2";
+
 #endif  // USE_EZOCO2
 #endif  // USE_I2C
diff --git a/tasmota/xsns_78_ezoec.ino b/tasmota/xsns_78_ezoec.ino
index 8d5a22912..1566e2907 100644
--- a/tasmota/xsns_78_ezoec.ino
+++ b/tasmota/xsns_78_ezoec.ino
@@ -1,5 +1,5 @@
 /*
-  xsns_78_ezoph.ino - EZO EC I2C EC sensor support for Tasmota
+  xsns_78_ezoec.ino - EZO EC I2C EC sensor support for Tasmota
 
   Copyright (C) 2020  Christopher Tremblay
 
@@ -35,8 +35,8 @@ struct EZOEC : public EZOStruct {
 
   virtual void Show(bool json, const char *name)
   {
-    char str[6];
-    dtostrfd(EC, 2, str);
+    char str[10];
+    dtostrfd(EC, 3, str);
 
     if (json) {
       ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_EC "\":%s}" ), name, str);
@@ -48,9 +48,13 @@ struct EZOEC : public EZOStruct {
     }
   }
 
+  static const char id[] PROGMEM;
+
 private:
   float     EC;
 };
 
+const char EZOEC::id[]  PROGMEM = "EC";
+
 #endif  // USE_EZOEC
 #endif  // USE_I2C
diff --git a/tasmota/xsns_78_ezohum.ino b/tasmota/xsns_78_ezohum.ino
index 1eadb767d..62b6edc68 100644
--- a/tasmota/xsns_78_ezohum.ino
+++ b/tasmota/xsns_78_ezohum.ino
@@ -52,10 +52,14 @@ struct EZOHUM : public EZOStruct {
     }
   }
 
+  static const char id[] PROGMEM;
+
 private:
   float     humidity;
   float     temperature;
 };
 
+const char EZOHUM::id[] PROGMEM = "HUM";
+
 #endif  // USE_EZOHUM
 #endif  // USE_I2C
diff --git a/tasmota/xsns_78_ezoorp.ino b/tasmota/xsns_78_ezoorp.ino
index 187245f35..d9faa999c 100644
--- a/tasmota/xsns_78_ezoorp.ino
+++ b/tasmota/xsns_78_ezoorp.ino
@@ -35,8 +35,8 @@ struct EZOORP : public EZOStruct {
 
   virtual void Show(bool json, const char *name)
   {
-    char str[6];
-    dtostrfd(ORP, 0, str);
+    char str[8];
+    dtostrfd(ORP, 2, str);
 
     if (json) {
       ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_ORP "\":%s}" ), name, str);
@@ -48,11 +48,13 @@ struct EZOORP : public EZOStruct {
     }
   }
 
+  static const char id[] PROGMEM;
+
 private:
   float     ORP;
 };
 
-
+const char EZOORP::id[] PROGMEM = "ORP";
 
 #endif  // USE_EZOORP
 #endif  // USE_I2C
diff --git a/tasmota/xsns_78_ezoph.ino b/tasmota/xsns_78_ezoph.ino
index 522f93eea..77939d97a 100644
--- a/tasmota/xsns_78_ezoph.ino
+++ b/tasmota/xsns_78_ezoph.ino
@@ -22,8 +22,8 @@
 
 #define EZO_PH_READ_LATENCY   900
 
-struct EZOpH : public EZOStruct {
-  EZOpH(uint32_t addr) : EZOStruct(addr), pH(NAN) {}
+struct EZOPH : public EZOStruct {
+  EZOPH(uint32_t addr) : EZOStruct(addr), pH(NAN) {}
 
   virtual void ProcessMeasurement(void)
   {
@@ -48,9 +48,13 @@ struct EZOpH : public EZOStruct {
     }
   }
 
+  static const char id[] PROGMEM;
+
 private:
   float     pH;
 };
 
+const char EZOPH::id[]  PROGMEM = "pH";
+
 #endif  // USE_EZOPH
 #endif  // USE_I2C
diff --git a/tasmota/xsns_78_ezortd.ino b/tasmota/xsns_78_ezortd.ino
index da5869439..1d564d095 100644
--- a/tasmota/xsns_78_ezortd.ino
+++ b/tasmota/xsns_78_ezortd.ino
@@ -34,7 +34,7 @@ struct EZORTD : public EZOStruct {
   }
 
   virtual void Show(bool json, const char *name)
-{
+  {
     char str[10];
     dtostrfd(ConvertTemp(temperature), Settings.flag2.temperature_resolution, str);
 
@@ -46,11 +46,15 @@ struct EZORTD : public EZOStruct {
       WSContentSend_PD(HTTP_SNS_TEMP, name, str, TempUnit());
 #endif  // USE_WEBSERVER
     }
-}
+  }
+
+  static const char id[] PROGMEM;
 
 private:
   float     temperature;
 };
 
+const char EZORTD::id[] PROGMEM = "RTD";
+
 #endif  // USE_EZORTD
 #endif  // USE_I2C
diff --git a/tasmota/xsns_78_xezo.ino b/tasmota/xsns_78_xezo.ino
index beb8a2288..0415c335d 100644
--- a/tasmota/xsns_78_xezo.ino
+++ b/tasmota/xsns_78_xezo.ino
@@ -28,7 +28,6 @@
 
 
 // List of known EZO devices and their default address
-
 enum {
   EZO_DO  = 0x61, // D.O.
   EZO_ORP = 0x62, // ORP
@@ -49,83 +48,37 @@ enum {
 };
 
 
-const char EZO_EMPTY[]    PROGMEM = "";
-//const char EZO_DO_NAME[]  PROGMEM = "DO";
-#ifdef USE_EZOORP
-const char EZO_ORP_NAME[] PROGMEM = "ORP";
-#endif
-#ifdef USE_EZOPH
-const char EZO_PH_NAME[]  PROGMEM = "pH";
-#endif
-#ifdef USE_EZOEC
-const char EZO_EC_NAME[]  PROGMEM = "EC";
-#endif
-#ifdef USE_EZORTD
-const char EZO_RTD_NAME[] PROGMEM = "RTD";
-#endif
-//const char EZO_PMP_NAME[] PROGMEM = "PMP";
-//const char EZO_FLO_NAME[] PROGMEM = "FLO";
-const char EZO_CO2_NAME[] PROGMEM = "CO2";
-//const char EZO_PRS_NAME[] PROGMEM = "PRS";
-//const char EZO_O2_NAME[]  PROGMEM = "O2";
-#ifdef USE_EZOHUM
-const char EZO_HUM_NAME[] PROGMEM = "HUM";
-#endif
-//const char EZO_RGB_NAME[] PROGMEM = "RGB";
 
+// Creates a complex preprocessor macro to fetch a specified class OR EZOStruct if it wasn't defined
+template <class T, class = void>  struct IsComplete : std::false_type {};
+template <class T>                struct IsComplete< T, decltype(void(sizeof(T))) > : std::true_type {};
+
+#define GET_EZO_CLASS(CLASS) std::conditional<IsComplete<CLASS>::value, CLASS, EZOStruct>::type
+
+// The order of the EZO devices must map with the enum declared above
 const char *const EZOSupport[EZO_ADDR_n] PROGMEM = {
-  EZO_EMPTY,
-
-#ifdef USE_EZOORP
-  EZO_ORP_NAME,
-#else
-  EZO_EMPTY,
-#endif
-
-#ifdef USE_EZOPH
-  EZO_PH_NAME,
-#else
-  EZO_EMPTY,
-#endif
-
-#ifdef USE_EZOEC
-  EZO_EC_NAME,
-#else
-  EZO_EMPTY,
-#endif
-
-  EZO_EMPTY,
-
-#ifdef USE_EZORTD
-  EZO_RTD_NAME,
-#else
-  EZO_EMPTY,
-#endif
-
-  EZO_EMPTY,
-  EZO_EMPTY,
-
-#ifdef USE_EZOCO2
-  EZO_CO2_NAME,
-#else
-  EZO_EMPTY,
-#endif
-
-  EZO_EMPTY,
-  EZO_EMPTY,
-  EZO_EMPTY,
-  EZO_EMPTY,
-  EZO_EMPTY,
-
-#ifdef USE_EZOHUM
-  EZO_HUM_NAME,
-#else
-  EZO_EMPTY,
-#endif
-
-  EZO_EMPTY,
+  EZOStruct::id,  // "DO"
+  GET_EZO_CLASS(EZOORP)::id,
+  GET_EZO_CLASS(EZOPH)::id,
+  GET_EZO_CLASS(EZOEC)::id,
+  EZOStruct::id,
+  GET_EZO_CLASS(EZORTD)::id,
+  EZOStruct::id,  // "PMP"
+  EZOStruct::id,  // "FLO"
+  GET_EZO_CLASS(EZOCO2)::id,
+  EZOStruct::id,  // "PRS"
+  EZOStruct::id,
+  EZOStruct::id,  // "O2"
+  EZOStruct::id,
+  EZOStruct::id,
+  GET_EZO_CLASS(EZOHUM)::id,
+  EZOStruct::id,  // "RGB"
 };
 
+#define CREATE_EZO_CLASS(CLASS)             \
+  case EZO_ ## CLASS:                       \
+    sensor[count] = new EZO ## CLASS(addr); \
+    break;
 
 
 struct EZOManager {
@@ -252,34 +205,22 @@ private:
                 // We use switch intead of virtual function to save RAM
                 switch (j + EZO_ADDR_0) {
 #ifdef USE_EZOORP
-                  case EZO_ORP:
-                    sensor[count] = new EZOORP(addr);
-                    break;
+                  CREATE_EZO_CLASS(ORP)
 #endif
 #ifdef USE_EZOPH
-                  case EZO_PH:
-                    sensor[count] = new EZOpH(addr);
-                    break;
+                  CREATE_EZO_CLASS(PH)
 #endif
 #ifdef USE_EZOEC
-                  case EZO_EC:
-                    sensor[count] = new EZOEC(addr);
-                    break;
+                  CREATE_EZO_CLASS(EC)
 #endif
 #ifdef USE_EZORTD
-                  case EZO_RTD:
-                    sensor[count] = new EZORTD(addr);
-                    break;
+                  CREATE_EZO_CLASS(RTD)
 #endif
 #ifdef USE_EZOCO2
-                  case EZO_CO2:
-                    sensor[count] = new EZOCO2(addr);
-                    break;
+                  CREATE_EZO_CLASS(CO2)
 #endif
 #ifdef USE_EZOHUM
-                  case EZO_HUM:
-                    sensor[count] = new EZOHUM(addr);
-                    break;
+                  CREATE_EZO_CLASS(HUM)
 #endif
                 }