diff --git a/.gitignore b/.gitignore
index 89cc49c..f4c1074 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.idea
 .pio
 .vscode/.browse.c_cpp.db*
 .vscode/c_cpp_properties.json
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/iris-kit.iml b/.idea/iris-kit.iml
deleted file mode 100644
index bc2cd87..0000000
--- a/.idea/iris-kit.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="CPP_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index b78e90c..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/iris-kit.iml" filepath="$PROJECT_DIR$/.idea/iris-kit.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
deleted file mode 100644
index 080e70d..0000000
--- a/.vscode/extensions.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        "platformio.platformio-ide"
-    ],
-    "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
-    ]
-}
diff --git a/esp8285/.gitignore b/esp8285/.gitignore
deleted file mode 100644
index f4c1074..0000000
--- a/esp8285/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.idea
-.pio
-.vscode/.browse.c_cpp.db*
-.vscode/c_cpp_properties.json
-.vscode/launch.json
-.vscode/ipch
diff --git a/esp8285/.vscode/extensions.json b/esp8285/.vscode/extensions.json
deleted file mode 100644
index 080e70d..0000000
--- a/esp8285/.vscode/extensions.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        "platformio.platformio-ide"
-    ],
-    "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
-    ]
-}
diff --git a/esp8285/include/README b/include/README
similarity index 100%
rename from esp8285/include/README
rename to include/README
diff --git a/esp8285/lib/AliyunIoTSDK/.piopm b/lib/AliyunIoTSDK/.piopm
similarity index 100%
rename from esp8285/lib/AliyunIoTSDK/.piopm
rename to lib/AliyunIoTSDK/.piopm
diff --git a/esp8285/lib/AliyunIoTSDK/CHANGES.txt b/lib/AliyunIoTSDK/CHANGES.txt
similarity index 100%
rename from esp8285/lib/AliyunIoTSDK/CHANGES.txt
rename to lib/AliyunIoTSDK/CHANGES.txt
diff --git a/esp8285/lib/AliyunIoTSDK/LICENSE.txt b/lib/AliyunIoTSDK/LICENSE.txt
similarity index 100%
rename from esp8285/lib/AliyunIoTSDK/LICENSE.txt
rename to lib/AliyunIoTSDK/LICENSE.txt
diff --git a/esp8285/lib/AliyunIoTSDK/README.md b/lib/AliyunIoTSDK/README.md
similarity index 100%
rename from esp8285/lib/AliyunIoTSDK/README.md
rename to lib/AliyunIoTSDK/README.md
diff --git a/esp8285/lib/AliyunIoTSDK/keywords.txt b/lib/AliyunIoTSDK/keywords.txt
similarity index 100%
rename from esp8285/lib/AliyunIoTSDK/keywords.txt
rename to lib/AliyunIoTSDK/keywords.txt
diff --git a/esp8285/lib/AliyunIoTSDK/library.json b/lib/AliyunIoTSDK/library.json
similarity index 100%
rename from esp8285/lib/AliyunIoTSDK/library.json
rename to lib/AliyunIoTSDK/library.json
diff --git a/esp8285/lib/AliyunIoTSDK/library.properties b/lib/AliyunIoTSDK/library.properties
similarity index 100%
rename from esp8285/lib/AliyunIoTSDK/library.properties
rename to lib/AliyunIoTSDK/library.properties
diff --git a/esp8285/lib/AliyunIoTSDK/src/AliyunIoTSDK.cpp b/lib/AliyunIoTSDK/src/AliyunIoTSDK.cpp
similarity index 100%
rename from esp8285/lib/AliyunIoTSDK/src/AliyunIoTSDK.cpp
rename to lib/AliyunIoTSDK/src/AliyunIoTSDK.cpp
diff --git a/esp8285/lib/AliyunIoTSDK/src/AliyunIoTSDK.h b/lib/AliyunIoTSDK/src/AliyunIoTSDK.h
similarity index 100%
rename from esp8285/lib/AliyunIoTSDK/src/AliyunIoTSDK.h
rename to lib/AliyunIoTSDK/src/AliyunIoTSDK.h
diff --git a/esp8285/lib/ArduinoJson/.clang-format b/lib/ArduinoJson/.clang-format
similarity index 100%
rename from esp8285/lib/ArduinoJson/.clang-format
rename to lib/ArduinoJson/.clang-format
diff --git a/esp8285/lib/ArduinoJson/.gitattributes b/lib/ArduinoJson/.gitattributes
similarity index 100%
rename from esp8285/lib/ArduinoJson/.gitattributes
rename to lib/ArduinoJson/.gitattributes
diff --git a/esp8285/lib/ArduinoJson/.github/FUNDING.yml b/lib/ArduinoJson/.github/FUNDING.yml
similarity index 100%
rename from esp8285/lib/ArduinoJson/.github/FUNDING.yml
rename to lib/ArduinoJson/.github/FUNDING.yml
diff --git a/esp8285/lib/ArduinoJson/.github/ISSUE_TEMPLATE.md b/lib/ArduinoJson/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from esp8285/lib/ArduinoJson/.github/ISSUE_TEMPLATE.md
rename to lib/ArduinoJson/.github/ISSUE_TEMPLATE.md
diff --git a/esp8285/lib/ArduinoJson/.github/lock.yml b/lib/ArduinoJson/.github/lock.yml
similarity index 100%
rename from esp8285/lib/ArduinoJson/.github/lock.yml
rename to lib/ArduinoJson/.github/lock.yml
diff --git a/esp8285/lib/ArduinoJson/.gitignore b/lib/ArduinoJson/.gitignore
similarity index 100%
rename from esp8285/lib/ArduinoJson/.gitignore
rename to lib/ArduinoJson/.gitignore
diff --git a/esp8285/lib/ArduinoJson/.library.json b/lib/ArduinoJson/.library.json
similarity index 100%
rename from esp8285/lib/ArduinoJson/.library.json
rename to lib/ArduinoJson/.library.json
diff --git a/esp8285/lib/ArduinoJson/.mbedignore b/lib/ArduinoJson/.mbedignore
similarity index 100%
rename from esp8285/lib/ArduinoJson/.mbedignore
rename to lib/ArduinoJson/.mbedignore
diff --git a/esp8285/lib/ArduinoJson/.travis.yml b/lib/ArduinoJson/.travis.yml
similarity index 100%
rename from esp8285/lib/ArduinoJson/.travis.yml
rename to lib/ArduinoJson/.travis.yml
diff --git a/esp8285/lib/ArduinoJson/ArduinoJson.h b/lib/ArduinoJson/ArduinoJson.h
similarity index 100%
rename from esp8285/lib/ArduinoJson/ArduinoJson.h
rename to lib/ArduinoJson/ArduinoJson.h
diff --git a/esp8285/lib/ArduinoJson/CHANGELOG.md b/lib/ArduinoJson/CHANGELOG.md
similarity index 100%
rename from esp8285/lib/ArduinoJson/CHANGELOG.md
rename to lib/ArduinoJson/CHANGELOG.md
diff --git a/esp8285/lib/ArduinoJson/CMakeLists.txt b/lib/ArduinoJson/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/CMakeLists.txt
rename to lib/ArduinoJson/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/CONTRIBUTING.md b/lib/ArduinoJson/CONTRIBUTING.md
similarity index 100%
rename from esp8285/lib/ArduinoJson/CONTRIBUTING.md
rename to lib/ArduinoJson/CONTRIBUTING.md
diff --git a/esp8285/lib/ArduinoJson/LICENSE.md b/lib/ArduinoJson/LICENSE.md
similarity index 100%
rename from esp8285/lib/ArduinoJson/LICENSE.md
rename to lib/ArduinoJson/LICENSE.md
diff --git a/esp8285/lib/ArduinoJson/README.md b/lib/ArduinoJson/README.md
similarity index 100%
rename from esp8285/lib/ArduinoJson/README.md
rename to lib/ArduinoJson/README.md
diff --git a/esp8285/lib/ArduinoJson/SUPPORT.md b/lib/ArduinoJson/SUPPORT.md
similarity index 100%
rename from esp8285/lib/ArduinoJson/SUPPORT.md
rename to lib/ArduinoJson/SUPPORT.md
diff --git a/esp8285/lib/ArduinoJson/appveyor.yml b/lib/ArduinoJson/appveyor.yml
similarity index 100%
rename from esp8285/lib/ArduinoJson/appveyor.yml
rename to lib/ArduinoJson/appveyor.yml
diff --git a/esp8285/lib/ArduinoJson/banner.svg b/lib/ArduinoJson/banner.svg
similarity index 100%
rename from esp8285/lib/ArduinoJson/banner.svg
rename to lib/ArduinoJson/banner.svg
diff --git a/esp8285/lib/ArduinoJson/component.mk b/lib/ArduinoJson/component.mk
similarity index 100%
rename from esp8285/lib/ArduinoJson/component.mk
rename to lib/ArduinoJson/component.mk
diff --git a/esp8285/lib/ArduinoJson/examples/JsonConfigFile/JsonConfigFile.ino b/lib/ArduinoJson/examples/JsonConfigFile/JsonConfigFile.ino
similarity index 100%
rename from esp8285/lib/ArduinoJson/examples/JsonConfigFile/JsonConfigFile.ino
rename to lib/ArduinoJson/examples/JsonConfigFile/JsonConfigFile.ino
diff --git a/esp8285/lib/ArduinoJson/examples/JsonGeneratorExample/JsonGeneratorExample.ino b/lib/ArduinoJson/examples/JsonGeneratorExample/JsonGeneratorExample.ino
similarity index 100%
rename from esp8285/lib/ArduinoJson/examples/JsonGeneratorExample/JsonGeneratorExample.ino
rename to lib/ArduinoJson/examples/JsonGeneratorExample/JsonGeneratorExample.ino
diff --git a/esp8285/lib/ArduinoJson/examples/JsonHttpClient/JsonHttpClient.ino b/lib/ArduinoJson/examples/JsonHttpClient/JsonHttpClient.ino
similarity index 100%
rename from esp8285/lib/ArduinoJson/examples/JsonHttpClient/JsonHttpClient.ino
rename to lib/ArduinoJson/examples/JsonHttpClient/JsonHttpClient.ino
diff --git a/esp8285/lib/ArduinoJson/examples/JsonParserExample/JsonParserExample.ino b/lib/ArduinoJson/examples/JsonParserExample/JsonParserExample.ino
similarity index 100%
rename from esp8285/lib/ArduinoJson/examples/JsonParserExample/JsonParserExample.ino
rename to lib/ArduinoJson/examples/JsonParserExample/JsonParserExample.ino
diff --git a/esp8285/lib/ArduinoJson/examples/JsonServer/JsonServer.ino b/lib/ArduinoJson/examples/JsonServer/JsonServer.ino
similarity index 100%
rename from esp8285/lib/ArduinoJson/examples/JsonServer/JsonServer.ino
rename to lib/ArduinoJson/examples/JsonServer/JsonServer.ino
diff --git a/esp8285/lib/ArduinoJson/examples/JsonUdpBeacon/JsonUdpBeacon.ino b/lib/ArduinoJson/examples/JsonUdpBeacon/JsonUdpBeacon.ino
similarity index 100%
rename from esp8285/lib/ArduinoJson/examples/JsonUdpBeacon/JsonUdpBeacon.ino
rename to lib/ArduinoJson/examples/JsonUdpBeacon/JsonUdpBeacon.ino
diff --git a/esp8285/lib/ArduinoJson/examples/MsgPackParser/MsgPackParser.ino b/lib/ArduinoJson/examples/MsgPackParser/MsgPackParser.ino
similarity index 100%
rename from esp8285/lib/ArduinoJson/examples/MsgPackParser/MsgPackParser.ino
rename to lib/ArduinoJson/examples/MsgPackParser/MsgPackParser.ino
diff --git a/esp8285/lib/ArduinoJson/examples/ProgmemExample/ProgmemExample.ino b/lib/ArduinoJson/examples/ProgmemExample/ProgmemExample.ino
similarity index 100%
rename from esp8285/lib/ArduinoJson/examples/ProgmemExample/ProgmemExample.ino
rename to lib/ArduinoJson/examples/ProgmemExample/ProgmemExample.ino
diff --git a/esp8285/lib/ArduinoJson/examples/StringExample/StringExample.ino b/lib/ArduinoJson/examples/StringExample/StringExample.ino
similarity index 100%
rename from esp8285/lib/ArduinoJson/examples/StringExample/StringExample.ino
rename to lib/ArduinoJson/examples/StringExample/StringExample.ino
diff --git a/esp8285/lib/ArduinoJson/extras/ci/arduino.sh b/lib/ArduinoJson/extras/ci/arduino.sh
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/ci/arduino.sh
rename to lib/ArduinoJson/extras/ci/arduino.sh
diff --git a/esp8285/lib/ArduinoJson/extras/ci/build.sh b/lib/ArduinoJson/extras/ci/build.sh
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/ci/build.sh
rename to lib/ArduinoJson/extras/ci/build.sh
diff --git a/esp8285/lib/ArduinoJson/extras/ci/coverage.sh b/lib/ArduinoJson/extras/ci/coverage.sh
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/ci/coverage.sh
rename to lib/ArduinoJson/extras/ci/coverage.sh
diff --git a/esp8285/lib/ArduinoJson/extras/ci/fuzz.sh b/lib/ArduinoJson/extras/ci/fuzz.sh
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/ci/fuzz.sh
rename to lib/ArduinoJson/extras/ci/fuzz.sh
diff --git a/esp8285/lib/ArduinoJson/extras/ci/platformio.sh b/lib/ArduinoJson/extras/ci/platformio.sh
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/ci/platformio.sh
rename to lib/ArduinoJson/extras/ci/platformio.sh
diff --git a/esp8285/lib/ArduinoJson/extras/ci/test.sh b/lib/ArduinoJson/extras/ci/test.sh
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/ci/test.sh
rename to lib/ArduinoJson/extras/ci/test.sh
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/CMakeLists.txt b/lib/ArduinoJson/extras/fuzzing/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/CMakeLists.txt
rename to lib/ArduinoJson/extras/fuzzing/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/Makefile b/lib/ArduinoJson/extras/fuzzing/Makefile
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/Makefile
rename to lib/ArduinoJson/extras/fuzzing/Makefile
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/fuzzer_main.cpp b/lib/ArduinoJson/extras/fuzzing/fuzzer_main.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/fuzzer_main.cpp
rename to lib/ArduinoJson/extras/fuzzing/fuzzer_main.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/json_corpus/.gitignore b/lib/ArduinoJson/extras/fuzzing/json_corpus/.gitignore
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/json_corpus/.gitignore
rename to lib/ArduinoJson/extras/fuzzing/json_corpus/.gitignore
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/json_fuzzer.cpp b/lib/ArduinoJson/extras/fuzzing/json_fuzzer.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/json_fuzzer.cpp
rename to lib/ArduinoJson/extras/fuzzing/json_fuzzer.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Comments.json b/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Comments.json
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Comments.json
rename to lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Comments.json
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyArray.json b/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyArray.json
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyArray.json
rename to lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyArray.json
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyObject.json b/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyObject.json
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyObject.json
rename to lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyObject.json
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json b/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json
rename to lib/ArduinoJson/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/IntegerOverflow.json b/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/IntegerOverflow.json
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/IntegerOverflow.json
rename to lib/ArduinoJson/extras/fuzzing/json_seed_corpus/IntegerOverflow.json
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Numbers.json b/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Numbers.json
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Numbers.json
rename to lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Numbers.json
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json b/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json
rename to lib/ArduinoJson/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Strings.json b/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Strings.json
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Strings.json
rename to lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Strings.json
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/WeatherUnderground.json b/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/WeatherUnderground.json
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/WeatherUnderground.json
rename to lib/ArduinoJson/extras/fuzzing/json_seed_corpus/WeatherUnderground.json
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_corpus/.gitignore b/lib/ArduinoJson/extras/fuzzing/msgpack_corpus/.gitignore
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_corpus/.gitignore
rename to lib/ArduinoJson/extras/fuzzing/msgpack_corpus/.gitignore
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_fuzzer.cpp b/lib/ArduinoJson/extras/fuzzing/msgpack_fuzzer.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_fuzzer.cpp
rename to lib/ArduinoJson/extras/fuzzing/msgpack_fuzzer.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array16 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array16
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array16
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array16
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array32 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array32
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array32
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array32
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/false b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/false
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/false
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/false
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixarray b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixarray
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixarray
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixarray
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_negative b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_negative
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_negative
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_negative
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_positive b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_positive
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_positive
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_positive
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixmap b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixmap
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixmap
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixmap
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixstr b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixstr
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixstr
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixstr
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float32 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float32
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float32
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float32
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float64 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float64
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float64
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float64
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int16 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int16
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int16
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int16
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int32 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int32
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int32
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int32
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int64 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int64
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int64
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int64
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int8 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int8
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int8
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int8
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map16 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map16
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map16
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map16
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map32 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map32
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map32
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map32
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/nil b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/nil
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/nil
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/nil
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str16 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str16
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str16
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str16
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str32 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str32
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str32
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str32
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str8 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str8
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str8
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str8
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/true b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/true
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/true
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/true
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint16 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint16
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint16
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint16
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint32 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint32
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint32
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint32
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint64 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint64
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint64
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint64
diff --git a/esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint8 b/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint8
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint8
rename to lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint8
diff --git a/esp8285/lib/ArduinoJson/extras/scripts/build-arduino-package.sh b/lib/ArduinoJson/extras/scripts/build-arduino-package.sh
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/scripts/build-arduino-package.sh
rename to lib/ArduinoJson/extras/scripts/build-arduino-package.sh
diff --git a/esp8285/lib/ArduinoJson/extras/scripts/build-single-header.sh b/lib/ArduinoJson/extras/scripts/build-single-header.sh
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/scripts/build-single-header.sh
rename to lib/ArduinoJson/extras/scripts/build-single-header.sh
diff --git a/esp8285/lib/ArduinoJson/extras/scripts/create-build-envs.sh b/lib/ArduinoJson/extras/scripts/create-build-envs.sh
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/scripts/create-build-envs.sh
rename to lib/ArduinoJson/extras/scripts/create-build-envs.sh
diff --git a/esp8285/lib/ArduinoJson/extras/scripts/publish-particle-library.sh b/lib/ArduinoJson/extras/scripts/publish-particle-library.sh
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/scripts/publish-particle-library.sh
rename to lib/ArduinoJson/extras/scripts/publish-particle-library.sh
diff --git a/esp8285/lib/ArduinoJson/extras/scripts/publish.sh b/lib/ArduinoJson/extras/scripts/publish.sh
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/scripts/publish.sh
rename to lib/ArduinoJson/extras/scripts/publish.sh
diff --git a/esp8285/lib/ArduinoJson/extras/scripts/wandbox/JsonGeneratorExample.cpp b/lib/ArduinoJson/extras/scripts/wandbox/JsonGeneratorExample.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/scripts/wandbox/JsonGeneratorExample.cpp
rename to lib/ArduinoJson/extras/scripts/wandbox/JsonGeneratorExample.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/scripts/wandbox/JsonParserExample.cpp b/lib/ArduinoJson/extras/scripts/wandbox/JsonParserExample.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/scripts/wandbox/JsonParserExample.cpp
rename to lib/ArduinoJson/extras/scripts/wandbox/JsonParserExample.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/scripts/wandbox/MsgPackParserExample.cpp b/lib/ArduinoJson/extras/scripts/wandbox/MsgPackParserExample.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/scripts/wandbox/MsgPackParserExample.cpp
rename to lib/ArduinoJson/extras/scripts/wandbox/MsgPackParserExample.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/scripts/wandbox/publish.sh b/lib/ArduinoJson/extras/scripts/wandbox/publish.sh
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/scripts/wandbox/publish.sh
rename to lib/ArduinoJson/extras/scripts/wandbox/publish.sh
diff --git a/esp8285/lib/ArduinoJson/extras/tests/CMakeLists.txt b/lib/ArduinoJson/extras/tests/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/ElementProxy/CMakeLists.txt b/lib/ArduinoJson/extras/tests/ElementProxy/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/ElementProxy/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/ElementProxy/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/ElementProxy/add.cpp b/lib/ArduinoJson/extras/tests/ElementProxy/add.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/ElementProxy/add.cpp
rename to lib/ArduinoJson/extras/tests/ElementProxy/add.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/ElementProxy/clear.cpp b/lib/ArduinoJson/extras/tests/ElementProxy/clear.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/ElementProxy/clear.cpp
rename to lib/ArduinoJson/extras/tests/ElementProxy/clear.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/ElementProxy/compare.cpp b/lib/ArduinoJson/extras/tests/ElementProxy/compare.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/ElementProxy/compare.cpp
rename to lib/ArduinoJson/extras/tests/ElementProxy/compare.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/ElementProxy/remove.cpp b/lib/ArduinoJson/extras/tests/ElementProxy/remove.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/ElementProxy/remove.cpp
rename to lib/ArduinoJson/extras/tests/ElementProxy/remove.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/ElementProxy/set.cpp b/lib/ArduinoJson/extras/tests/ElementProxy/set.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/ElementProxy/set.cpp
rename to lib/ArduinoJson/extras/tests/ElementProxy/set.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/ElementProxy/size.cpp b/lib/ArduinoJson/extras/tests/ElementProxy/size.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/ElementProxy/size.cpp
rename to lib/ArduinoJson/extras/tests/ElementProxy/size.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Helpers/CustomReader.hpp b/lib/ArduinoJson/extras/tests/Helpers/CustomReader.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Helpers/CustomReader.hpp
rename to lib/ArduinoJson/extras/tests/Helpers/CustomReader.hpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Helpers/Stream.h b/lib/ArduinoJson/extras/tests/Helpers/Stream.h
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Helpers/Stream.h
rename to lib/ArduinoJson/extras/tests/Helpers/Stream.h
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Helpers/WString.h b/lib/ArduinoJson/extras/tests/Helpers/WString.h
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Helpers/WString.h
rename to lib/ArduinoJson/extras/tests/Helpers/WString.h
diff --git a/esp8285/lib/ArduinoJson/extras/tests/IntegrationTests/CMakeLists.txt b/lib/ArduinoJson/extras/tests/IntegrationTests/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/IntegrationTests/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/IntegrationTests/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/IntegrationTests/gbathree.cpp b/lib/ArduinoJson/extras/tests/IntegrationTests/gbathree.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/IntegrationTests/gbathree.cpp
rename to lib/ArduinoJson/extras/tests/IntegrationTests/gbathree.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/IntegrationTests/issue772.cpp b/lib/ArduinoJson/extras/tests/IntegrationTests/issue772.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/IntegrationTests/issue772.cpp
rename to lib/ArduinoJson/extras/tests/IntegrationTests/issue772.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/IntegrationTests/round_trip.cpp b/lib/ArduinoJson/extras/tests/IntegrationTests/round_trip.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/IntegrationTests/round_trip.cpp
rename to lib/ArduinoJson/extras/tests/IntegrationTests/round_trip.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/CMakeLists.txt b/lib/ArduinoJson/extras/tests/JsonArray/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/JsonArray/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/add.cpp b/lib/ArduinoJson/extras/tests/JsonArray/add.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/add.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/add.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/copyArray.cpp b/lib/ArduinoJson/extras/tests/JsonArray/copyArray.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/copyArray.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/copyArray.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/createNested.cpp b/lib/ArduinoJson/extras/tests/JsonArray/createNested.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/createNested.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/createNested.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/equals.cpp b/lib/ArduinoJson/extras/tests/JsonArray/equals.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/equals.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/equals.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/get.cpp b/lib/ArduinoJson/extras/tests/JsonArray/get.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/get.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/get.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/isNull.cpp b/lib/ArduinoJson/extras/tests/JsonArray/isNull.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/isNull.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/isNull.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/iterator.cpp b/lib/ArduinoJson/extras/tests/JsonArray/iterator.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/iterator.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/iterator.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/memoryUsage.cpp b/lib/ArduinoJson/extras/tests/JsonArray/memoryUsage.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/memoryUsage.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/memoryUsage.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/nesting.cpp b/lib/ArduinoJson/extras/tests/JsonArray/nesting.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/nesting.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/nesting.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/remove.cpp b/lib/ArduinoJson/extras/tests/JsonArray/remove.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/remove.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/remove.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/size.cpp b/lib/ArduinoJson/extras/tests/JsonArray/size.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/size.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/size.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/std_string.cpp b/lib/ArduinoJson/extras/tests/JsonArray/std_string.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/std_string.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/std_string.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/subscript.cpp b/lib/ArduinoJson/extras/tests/JsonArray/subscript.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/subscript.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/subscript.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonArray/undefined.cpp b/lib/ArduinoJson/extras/tests/JsonArray/undefined.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonArray/undefined.cpp
rename to lib/ArduinoJson/extras/tests/JsonArray/undefined.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/CMakeLists.txt b/lib/ArduinoJson/extras/tests/JsonDeserializer/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/JsonDeserializer/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/DeserializationError.cpp b/lib/ArduinoJson/extras/tests/JsonDeserializer/DeserializationError.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/DeserializationError.cpp
rename to lib/ArduinoJson/extras/tests/JsonDeserializer/DeserializationError.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/array.cpp b/lib/ArduinoJson/extras/tests/JsonDeserializer/array.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/array.cpp
rename to lib/ArduinoJson/extras/tests/JsonDeserializer/array.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/array_static.cpp b/lib/ArduinoJson/extras/tests/JsonDeserializer/array_static.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/array_static.cpp
rename to lib/ArduinoJson/extras/tests/JsonDeserializer/array_static.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/incomplete_input.cpp b/lib/ArduinoJson/extras/tests/JsonDeserializer/incomplete_input.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/incomplete_input.cpp
rename to lib/ArduinoJson/extras/tests/JsonDeserializer/incomplete_input.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/input_types.cpp b/lib/ArduinoJson/extras/tests/JsonDeserializer/input_types.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/input_types.cpp
rename to lib/ArduinoJson/extras/tests/JsonDeserializer/input_types.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/invalid_input.cpp b/lib/ArduinoJson/extras/tests/JsonDeserializer/invalid_input.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/invalid_input.cpp
rename to lib/ArduinoJson/extras/tests/JsonDeserializer/invalid_input.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/misc.cpp b/lib/ArduinoJson/extras/tests/JsonDeserializer/misc.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/misc.cpp
rename to lib/ArduinoJson/extras/tests/JsonDeserializer/misc.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/nestingLimit.cpp b/lib/ArduinoJson/extras/tests/JsonDeserializer/nestingLimit.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/nestingLimit.cpp
rename to lib/ArduinoJson/extras/tests/JsonDeserializer/nestingLimit.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/number.cpp b/lib/ArduinoJson/extras/tests/JsonDeserializer/number.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/number.cpp
rename to lib/ArduinoJson/extras/tests/JsonDeserializer/number.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/object.cpp b/lib/ArduinoJson/extras/tests/JsonDeserializer/object.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/object.cpp
rename to lib/ArduinoJson/extras/tests/JsonDeserializer/object.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/object_static.cpp b/lib/ArduinoJson/extras/tests/JsonDeserializer/object_static.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/object_static.cpp
rename to lib/ArduinoJson/extras/tests/JsonDeserializer/object_static.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/string.cpp b/lib/ArduinoJson/extras/tests/JsonDeserializer/string.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDeserializer/string.cpp
rename to lib/ArduinoJson/extras/tests/JsonDeserializer/string.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/BasicJsonDocument.cpp b/lib/ArduinoJson/extras/tests/JsonDocument/BasicJsonDocument.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/BasicJsonDocument.cpp
rename to lib/ArduinoJson/extras/tests/JsonDocument/BasicJsonDocument.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/CMakeLists.txt b/lib/ArduinoJson/extras/tests/JsonDocument/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/JsonDocument/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/DynamicJsonDocument.cpp b/lib/ArduinoJson/extras/tests/JsonDocument/DynamicJsonDocument.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/DynamicJsonDocument.cpp
rename to lib/ArduinoJson/extras/tests/JsonDocument/DynamicJsonDocument.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/StaticJsonDocument.cpp b/lib/ArduinoJson/extras/tests/JsonDocument/StaticJsonDocument.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/StaticJsonDocument.cpp
rename to lib/ArduinoJson/extras/tests/JsonDocument/StaticJsonDocument.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/add.cpp b/lib/ArduinoJson/extras/tests/JsonDocument/add.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/add.cpp
rename to lib/ArduinoJson/extras/tests/JsonDocument/add.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/compare.cpp b/lib/ArduinoJson/extras/tests/JsonDocument/compare.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/compare.cpp
rename to lib/ArduinoJson/extras/tests/JsonDocument/compare.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/containsKey.cpp b/lib/ArduinoJson/extras/tests/JsonDocument/containsKey.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/containsKey.cpp
rename to lib/ArduinoJson/extras/tests/JsonDocument/containsKey.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/createNested.cpp b/lib/ArduinoJson/extras/tests/JsonDocument/createNested.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/createNested.cpp
rename to lib/ArduinoJson/extras/tests/JsonDocument/createNested.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/isNull.cpp b/lib/ArduinoJson/extras/tests/JsonDocument/isNull.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/isNull.cpp
rename to lib/ArduinoJson/extras/tests/JsonDocument/isNull.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/nesting.cpp b/lib/ArduinoJson/extras/tests/JsonDocument/nesting.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/nesting.cpp
rename to lib/ArduinoJson/extras/tests/JsonDocument/nesting.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/remove.cpp b/lib/ArduinoJson/extras/tests/JsonDocument/remove.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/remove.cpp
rename to lib/ArduinoJson/extras/tests/JsonDocument/remove.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/shrinkToFit.cpp b/lib/ArduinoJson/extras/tests/JsonDocument/shrinkToFit.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/shrinkToFit.cpp
rename to lib/ArduinoJson/extras/tests/JsonDocument/shrinkToFit.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/size.cpp b/lib/ArduinoJson/extras/tests/JsonDocument/size.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/size.cpp
rename to lib/ArduinoJson/extras/tests/JsonDocument/size.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonDocument/subscript.cpp b/lib/ArduinoJson/extras/tests/JsonDocument/subscript.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonDocument/subscript.cpp
rename to lib/ArduinoJson/extras/tests/JsonDocument/subscript.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/CMakeLists.txt b/lib/ArduinoJson/extras/tests/JsonObject/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/JsonObject/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/containsKey.cpp b/lib/ArduinoJson/extras/tests/JsonObject/containsKey.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/containsKey.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/containsKey.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/copy.cpp b/lib/ArduinoJson/extras/tests/JsonObject/copy.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/copy.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/copy.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/createNestedArray.cpp b/lib/ArduinoJson/extras/tests/JsonObject/createNestedArray.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/createNestedArray.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/createNestedArray.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/createNestedObject.cpp b/lib/ArduinoJson/extras/tests/JsonObject/createNestedObject.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/createNestedObject.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/createNestedObject.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/equals.cpp b/lib/ArduinoJson/extras/tests/JsonObject/equals.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/equals.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/equals.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/invalid.cpp b/lib/ArduinoJson/extras/tests/JsonObject/invalid.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/invalid.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/invalid.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/isNull.cpp b/lib/ArduinoJson/extras/tests/JsonObject/isNull.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/isNull.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/isNull.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/iterator.cpp b/lib/ArduinoJson/extras/tests/JsonObject/iterator.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/iterator.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/iterator.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/memoryUsage.cpp b/lib/ArduinoJson/extras/tests/JsonObject/memoryUsage.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/memoryUsage.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/memoryUsage.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/nesting.cpp b/lib/ArduinoJson/extras/tests/JsonObject/nesting.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/nesting.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/nesting.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/remove.cpp b/lib/ArduinoJson/extras/tests/JsonObject/remove.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/remove.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/remove.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/size.cpp b/lib/ArduinoJson/extras/tests/JsonObject/size.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/size.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/size.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/std_string.cpp b/lib/ArduinoJson/extras/tests/JsonObject/std_string.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/std_string.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/std_string.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonObject/subscript.cpp b/lib/ArduinoJson/extras/tests/JsonObject/subscript.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonObject/subscript.cpp
rename to lib/ArduinoJson/extras/tests/JsonObject/subscript.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/CMakeLists.txt b/lib/ArduinoJson/extras/tests/JsonSerializer/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/JsonSerializer/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/CustomWriter.cpp b/lib/ArduinoJson/extras/tests/JsonSerializer/CustomWriter.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/CustomWriter.cpp
rename to lib/ArduinoJson/extras/tests/JsonSerializer/CustomWriter.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArray.cpp b/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArray.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArray.cpp
rename to lib/ArduinoJson/extras/tests/JsonSerializer/JsonArray.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArrayPretty.cpp b/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArrayPretty.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArrayPretty.cpp
rename to lib/ArduinoJson/extras/tests/JsonSerializer/JsonArrayPretty.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObject.cpp b/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObject.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObject.cpp
rename to lib/ArduinoJson/extras/tests/JsonSerializer/JsonObject.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObjectPretty.cpp b/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObjectPretty.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObjectPretty.cpp
rename to lib/ArduinoJson/extras/tests/JsonSerializer/JsonObjectPretty.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/JsonVariant.cpp b/lib/ArduinoJson/extras/tests/JsonSerializer/JsonVariant.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/JsonVariant.cpp
rename to lib/ArduinoJson/extras/tests/JsonSerializer/JsonVariant.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/misc.cpp b/lib/ArduinoJson/extras/tests/JsonSerializer/misc.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/misc.cpp
rename to lib/ArduinoJson/extras/tests/JsonSerializer/misc.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/std_stream.cpp b/lib/ArduinoJson/extras/tests/JsonSerializer/std_stream.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/std_stream.cpp
rename to lib/ArduinoJson/extras/tests/JsonSerializer/std_stream.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/std_string.cpp b/lib/ArduinoJson/extras/tests/JsonSerializer/std_string.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonSerializer/std_string.cpp
rename to lib/ArduinoJson/extras/tests/JsonSerializer/std_string.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/CMakeLists.txt b/lib/ArduinoJson/extras/tests/JsonVariant/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/JsonVariant/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/add.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/add.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/add.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/add.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/as.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/as.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/as.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/as.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/clear.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/clear.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/clear.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/clear.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/compare.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/compare.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/compare.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/compare.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/containsKey.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/containsKey.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/containsKey.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/containsKey.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/copy.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/copy.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/copy.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/copy.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/createNested.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/createNested.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/createNested.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/createNested.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/is.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/is.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/is.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/is.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/isnull.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/isnull.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/isnull.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/isnull.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/memoryUsage.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/memoryUsage.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/memoryUsage.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/memoryUsage.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/misc.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/misc.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/misc.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/misc.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/nesting.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/nesting.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/nesting.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/nesting.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/or.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/or.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/or.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/or.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/overflow.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/overflow.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/overflow.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/overflow.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/remove.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/remove.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/remove.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/remove.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/set.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/set.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/set.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/set.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/subscript.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/subscript.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/subscript.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/subscript.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/types.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/types.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/types.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/types.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/JsonVariant/undefined.cpp b/lib/ArduinoJson/extras/tests/JsonVariant/undefined.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/JsonVariant/undefined.cpp
rename to lib/ArduinoJson/extras/tests/JsonVariant/undefined.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemberProxy/CMakeLists.txt b/lib/ArduinoJson/extras/tests/MemberProxy/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemberProxy/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/MemberProxy/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemberProxy/add.cpp b/lib/ArduinoJson/extras/tests/MemberProxy/add.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemberProxy/add.cpp
rename to lib/ArduinoJson/extras/tests/MemberProxy/add.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemberProxy/clear.cpp b/lib/ArduinoJson/extras/tests/MemberProxy/clear.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemberProxy/clear.cpp
rename to lib/ArduinoJson/extras/tests/MemberProxy/clear.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemberProxy/compare.cpp b/lib/ArduinoJson/extras/tests/MemberProxy/compare.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemberProxy/compare.cpp
rename to lib/ArduinoJson/extras/tests/MemberProxy/compare.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemberProxy/containsKey.cpp b/lib/ArduinoJson/extras/tests/MemberProxy/containsKey.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemberProxy/containsKey.cpp
rename to lib/ArduinoJson/extras/tests/MemberProxy/containsKey.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemberProxy/remove.cpp b/lib/ArduinoJson/extras/tests/MemberProxy/remove.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemberProxy/remove.cpp
rename to lib/ArduinoJson/extras/tests/MemberProxy/remove.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemberProxy/set.cpp b/lib/ArduinoJson/extras/tests/MemberProxy/set.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemberProxy/set.cpp
rename to lib/ArduinoJson/extras/tests/MemberProxy/set.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemberProxy/size.cpp b/lib/ArduinoJson/extras/tests/MemberProxy/size.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemberProxy/size.cpp
rename to lib/ArduinoJson/extras/tests/MemberProxy/size.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemberProxy/subscript.cpp b/lib/ArduinoJson/extras/tests/MemberProxy/subscript.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemberProxy/subscript.cpp
rename to lib/ArduinoJson/extras/tests/MemberProxy/subscript.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemoryPool/CMakeLists.txt b/lib/ArduinoJson/extras/tests/MemoryPool/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemoryPool/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/MemoryPool/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemoryPool/StringBuilder.cpp b/lib/ArduinoJson/extras/tests/MemoryPool/StringBuilder.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemoryPool/StringBuilder.cpp
rename to lib/ArduinoJson/extras/tests/MemoryPool/StringBuilder.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemoryPool/allocString.cpp b/lib/ArduinoJson/extras/tests/MemoryPool/allocString.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemoryPool/allocString.cpp
rename to lib/ArduinoJson/extras/tests/MemoryPool/allocString.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemoryPool/allocVariant.cpp b/lib/ArduinoJson/extras/tests/MemoryPool/allocVariant.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemoryPool/allocVariant.cpp
rename to lib/ArduinoJson/extras/tests/MemoryPool/allocVariant.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemoryPool/clear.cpp b/lib/ArduinoJson/extras/tests/MemoryPool/clear.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemoryPool/clear.cpp
rename to lib/ArduinoJson/extras/tests/MemoryPool/clear.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MemoryPool/size.cpp b/lib/ArduinoJson/extras/tests/MemoryPool/size.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MemoryPool/size.cpp
rename to lib/ArduinoJson/extras/tests/MemoryPool/size.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Misc/CMakeLists.txt b/lib/ArduinoJson/extras/tests/Misc/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Misc/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/Misc/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Misc/FloatParts.cpp b/lib/ArduinoJson/extras/tests/Misc/FloatParts.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Misc/FloatParts.cpp
rename to lib/ArduinoJson/extras/tests/Misc/FloatParts.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Misc/Issue978.cpp b/lib/ArduinoJson/extras/tests/Misc/Issue978.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Misc/Issue978.cpp
rename to lib/ArduinoJson/extras/tests/Misc/Issue978.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Misc/Readers.cpp b/lib/ArduinoJson/extras/tests/Misc/Readers.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Misc/Readers.cpp
rename to lib/ArduinoJson/extras/tests/Misc/Readers.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Misc/StringAdapters.cpp b/lib/ArduinoJson/extras/tests/Misc/StringAdapters.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Misc/StringAdapters.cpp
rename to lib/ArduinoJson/extras/tests/Misc/StringAdapters.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Misc/StringWriter.cpp b/lib/ArduinoJson/extras/tests/Misc/StringWriter.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Misc/StringWriter.cpp
rename to lib/ArduinoJson/extras/tests/Misc/StringWriter.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Misc/TypeTraits.cpp b/lib/ArduinoJson/extras/tests/Misc/TypeTraits.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Misc/TypeTraits.cpp
rename to lib/ArduinoJson/extras/tests/Misc/TypeTraits.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Misc/Utf16.cpp b/lib/ArduinoJson/extras/tests/Misc/Utf16.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Misc/Utf16.cpp
rename to lib/ArduinoJson/extras/tests/Misc/Utf16.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Misc/Utf8.cpp b/lib/ArduinoJson/extras/tests/Misc/Utf8.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Misc/Utf8.cpp
rename to lib/ArduinoJson/extras/tests/Misc/Utf8.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Misc/conflicts.cpp b/lib/ArduinoJson/extras/tests/Misc/conflicts.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Misc/conflicts.cpp
rename to lib/ArduinoJson/extras/tests/Misc/conflicts.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Misc/custom_string.hpp b/lib/ArduinoJson/extras/tests/Misc/custom_string.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Misc/custom_string.hpp
rename to lib/ArduinoJson/extras/tests/Misc/custom_string.hpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Misc/unsigned_char.cpp b/lib/ArduinoJson/extras/tests/Misc/unsigned_char.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Misc/unsigned_char.cpp
rename to lib/ArduinoJson/extras/tests/Misc/unsigned_char.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Misc/version.cpp b/lib/ArduinoJson/extras/tests/Misc/version.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Misc/version.cpp
rename to lib/ArduinoJson/extras/tests/Misc/version.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/CMakeLists.txt b/lib/ArduinoJson/extras/tests/MixedConfiguration/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/cpp11.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/cpp11.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/cpp11.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/cpp11.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_0.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_0.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_0.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_0.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_1.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_1.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_1.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_1.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_0.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_0.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_0.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_0.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_1.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_1.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_1.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_1.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_0.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_0.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_0.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_0.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_1.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_1.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_1.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_1.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_0.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_0.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_0.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_0.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_1.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_1.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_1.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_1.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_progmem_1.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_progmem_1.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_progmem_1.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/enable_progmem_1.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/progmem_emulation.hpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/progmem_emulation.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/progmem_emulation.hpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/progmem_emulation.hpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_0.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_0.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_0.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_0.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_1.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_1.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_1.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_1.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_0.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_0.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_0.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_0.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_1.cpp b/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_1.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_1.cpp
rename to lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_1.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/CMakeLists.txt b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/MsgPackDeserializer/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeArray.cpp b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeArray.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeArray.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeArray.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeObject.cpp b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeObject.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeObject.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeObject.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeStaticVariant.cpp b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeStaticVariant.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeStaticVariant.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeStaticVariant.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeVariant.cpp b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeVariant.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeVariant.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeVariant.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/doubleToFloat.cpp b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/doubleToFloat.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/doubleToFloat.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackDeserializer/doubleToFloat.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/incompleteInput.cpp b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/incompleteInput.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/incompleteInput.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackDeserializer/incompleteInput.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/input_types.cpp b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/input_types.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/input_types.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackDeserializer/input_types.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/nestingLimit.cpp b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/nestingLimit.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/nestingLimit.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackDeserializer/nestingLimit.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/notSupported.cpp b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/notSupported.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackDeserializer/notSupported.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackDeserializer/notSupported.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/CMakeLists.txt b/lib/ArduinoJson/extras/tests/MsgPackSerializer/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/MsgPackSerializer/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/destination_types.cpp b/lib/ArduinoJson/extras/tests/MsgPackSerializer/destination_types.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/destination_types.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackSerializer/destination_types.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/measure.cpp b/lib/ArduinoJson/extras/tests/MsgPackSerializer/measure.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/measure.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackSerializer/measure.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/misc.cpp b/lib/ArduinoJson/extras/tests/MsgPackSerializer/misc.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/misc.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackSerializer/misc.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeArray.cpp b/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeArray.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeArray.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeArray.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeObject.cpp b/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeObject.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeObject.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeObject.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeVariant.cpp b/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeVariant.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeVariant.cpp
rename to lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeVariant.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Numbers/CMakeLists.txt b/lib/ArduinoJson/extras/tests/Numbers/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Numbers/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/Numbers/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Numbers/parseFloat.cpp b/lib/ArduinoJson/extras/tests/Numbers/parseFloat.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Numbers/parseFloat.cpp
rename to lib/ArduinoJson/extras/tests/Numbers/parseFloat.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Numbers/parseInteger.cpp b/lib/ArduinoJson/extras/tests/Numbers/parseInteger.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Numbers/parseInteger.cpp
rename to lib/ArduinoJson/extras/tests/Numbers/parseInteger.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/Numbers/parseNumber.cpp b/lib/ArduinoJson/extras/tests/Numbers/parseNumber.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/Numbers/parseNumber.cpp
rename to lib/ArduinoJson/extras/tests/Numbers/parseNumber.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/TextFormatter/CMakeLists.txt b/lib/ArduinoJson/extras/tests/TextFormatter/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/TextFormatter/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/TextFormatter/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/TextFormatter/writeFloat.cpp b/lib/ArduinoJson/extras/tests/TextFormatter/writeFloat.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/TextFormatter/writeFloat.cpp
rename to lib/ArduinoJson/extras/tests/TextFormatter/writeFloat.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/TextFormatter/writeString.cpp b/lib/ArduinoJson/extras/tests/TextFormatter/writeString.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/TextFormatter/writeString.cpp
rename to lib/ArduinoJson/extras/tests/TextFormatter/writeString.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/catch/CMakeLists.txt b/lib/ArduinoJson/extras/tests/catch/CMakeLists.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/catch/CMakeLists.txt
rename to lib/ArduinoJson/extras/tests/catch/CMakeLists.txt
diff --git a/esp8285/lib/ArduinoJson/extras/tests/catch/catch.cpp b/lib/ArduinoJson/extras/tests/catch/catch.cpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/catch/catch.cpp
rename to lib/ArduinoJson/extras/tests/catch/catch.cpp
diff --git a/esp8285/lib/ArduinoJson/extras/tests/catch/catch.hpp b/lib/ArduinoJson/extras/tests/catch/catch.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/extras/tests/catch/catch.hpp
rename to lib/ArduinoJson/extras/tests/catch/catch.hpp
diff --git a/esp8285/lib/ArduinoJson/keywords.txt b/lib/ArduinoJson/keywords.txt
similarity index 100%
rename from esp8285/lib/ArduinoJson/keywords.txt
rename to lib/ArduinoJson/keywords.txt
diff --git a/esp8285/lib/ArduinoJson/library.json b/lib/ArduinoJson/library.json
similarity index 100%
rename from esp8285/lib/ArduinoJson/library.json
rename to lib/ArduinoJson/library.json
diff --git a/esp8285/lib/ArduinoJson/library.properties b/lib/ArduinoJson/library.properties
similarity index 100%
rename from esp8285/lib/ArduinoJson/library.properties
rename to lib/ArduinoJson/library.properties
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson.h b/lib/ArduinoJson/src/ArduinoJson.h
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson.h
rename to lib/ArduinoJson/src/ArduinoJson.h
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson.hpp b/lib/ArduinoJson/src/ArduinoJson.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson.hpp
rename to lib/ArduinoJson/src/ArduinoJson.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Array/ArrayFunctions.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/ArrayFunctions.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Array/ArrayFunctions.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Array/ArrayFunctions.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Array/ArrayImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/ArrayImpl.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Array/ArrayImpl.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Array/ArrayImpl.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Array/ArrayIterator.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/ArrayIterator.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Array/ArrayIterator.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Array/ArrayIterator.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Array/ArrayRef.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/ArrayRef.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Array/ArrayRef.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Array/ArrayRef.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Array/ArrayShortcuts.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/ArrayShortcuts.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Array/ArrayShortcuts.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Array/ArrayShortcuts.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Array/ElementProxy.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/ElementProxy.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Array/ElementProxy.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Array/ElementProxy.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Array/Utilities.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/Utilities.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Array/Utilities.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Array/Utilities.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionData.hpp b/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionData.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionData.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Collection/CollectionData.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionImpl.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionImpl.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Collection/CollectionImpl.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Configuration.hpp b/lib/ArduinoJson/src/ArduinoJson/Configuration.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Configuration.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Configuration.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationError.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationError.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationError.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationError.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/NestingLimit.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/NestingLimit.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/NestingLimit.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Deserialization/NestingLimit.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Reader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Reader.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Reader.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Deserialization/Reader.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/RamReader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/RamReader.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/RamReader.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/RamReader.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/deserialize.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/deserialize.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Deserialization/deserialize.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Deserialization/deserialize.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Document/BasicJsonDocument.hpp b/lib/ArduinoJson/src/ArduinoJson/Document/BasicJsonDocument.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Document/BasicJsonDocument.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Document/BasicJsonDocument.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Document/DynamicJsonDocument.hpp b/lib/ArduinoJson/src/ArduinoJson/Document/DynamicJsonDocument.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Document/DynamicJsonDocument.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Document/DynamicJsonDocument.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Document/JsonDocument.hpp b/lib/ArduinoJson/src/ArduinoJson/Document/JsonDocument.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Document/JsonDocument.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Document/JsonDocument.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Document/StaticJsonDocument.hpp b/lib/ArduinoJson/src/ArduinoJson/Document/StaticJsonDocument.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Document/StaticJsonDocument.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Document/StaticJsonDocument.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Json/EscapeSequence.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/EscapeSequence.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Json/EscapeSequence.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Json/EscapeSequence.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Json/JsonDeserializer.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/JsonDeserializer.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Json/JsonDeserializer.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Json/JsonDeserializer.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Json/JsonSerializer.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/JsonSerializer.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Json/JsonSerializer.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Json/JsonSerializer.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Json/PrettyJsonSerializer.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/PrettyJsonSerializer.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Json/PrettyJsonSerializer.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Json/PrettyJsonSerializer.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Json/TextFormatter.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/TextFormatter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Json/TextFormatter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Json/TextFormatter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Json/Utf16.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/Utf16.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Json/Utf16.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Json/Utf16.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Json/Utf8.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/Utf8.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Json/Utf8.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Json/Utf8.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Memory/Alignment.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/Alignment.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Memory/Alignment.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Memory/Alignment.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Memory/MemoryPool.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/MemoryPool.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Memory/MemoryPool.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Memory/MemoryPool.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Memory/StringBuilder.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/StringBuilder.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Memory/StringBuilder.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Memory/StringBuilder.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Memory/StringSlot.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/StringSlot.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Memory/StringSlot.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Memory/StringSlot.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Misc/SerializedValue.hpp b/lib/ArduinoJson/src/ArduinoJson/Misc/SerializedValue.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Misc/SerializedValue.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Misc/SerializedValue.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Misc/Visitable.hpp b/lib/ArduinoJson/src/ArduinoJson/Misc/Visitable.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Misc/Visitable.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Misc/Visitable.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp b/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
rename to lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp b/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp
rename to lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/MsgPack/endianess.hpp b/lib/ArduinoJson/src/ArduinoJson/MsgPack/endianess.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/MsgPack/endianess.hpp
rename to lib/ArduinoJson/src/ArduinoJson/MsgPack/endianess.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/MsgPack/ieee754.hpp b/lib/ArduinoJson/src/ArduinoJson/MsgPack/ieee754.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/MsgPack/ieee754.hpp
rename to lib/ArduinoJson/src/ArduinoJson/MsgPack/ieee754.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Namespace.hpp b/lib/ArduinoJson/src/ArduinoJson/Namespace.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Namespace.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Namespace.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/Float.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/Float.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/Float.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Numbers/Float.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatParts.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatParts.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatParts.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Numbers/FloatParts.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatTraits.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatTraits.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatTraits.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Numbers/FloatTraits.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/Integer.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/Integer.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/Integer.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Numbers/Integer.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/convertNumber.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/convertNumber.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/convertNumber.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Numbers/convertNumber.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/parseFloat.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/parseFloat.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/parseFloat.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Numbers/parseFloat.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/parseInteger.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/parseInteger.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/parseInteger.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Numbers/parseInteger.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/parseNumber.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/parseNumber.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Numbers/parseNumber.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Numbers/parseNumber.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Object/MemberProxy.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/MemberProxy.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Object/MemberProxy.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Object/MemberProxy.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Object/ObjectFunctions.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/ObjectFunctions.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Object/ObjectFunctions.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Object/ObjectFunctions.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Object/ObjectImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/ObjectImpl.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Object/ObjectImpl.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Object/ObjectImpl.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Object/ObjectIterator.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/ObjectIterator.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Object/ObjectIterator.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Object/ObjectIterator.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Object/ObjectRef.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/ObjectRef.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Object/ObjectRef.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Object/ObjectRef.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Object/ObjectShortcuts.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/ObjectShortcuts.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Object/ObjectShortcuts.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Object/ObjectShortcuts.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Object/Pair.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/Pair.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Object/Pair.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Object/Pair.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Operators/VariantCasts.hpp b/lib/ArduinoJson/src/ArduinoJson/Operators/VariantCasts.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Operators/VariantCasts.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Operators/VariantCasts.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Operators/VariantComparisons.hpp b/lib/ArduinoJson/src/ArduinoJson/Operators/VariantComparisons.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Operators/VariantComparisons.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Operators/VariantComparisons.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Operators/VariantOperators.hpp b/lib/ArduinoJson/src/ArduinoJson/Operators/VariantOperators.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Operators/VariantOperators.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Operators/VariantOperators.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Operators/VariantOr.hpp b/lib/ArduinoJson/src/ArduinoJson/Operators/VariantOr.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Operators/VariantOr.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Operators/VariantOr.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Operators/VariantShortcuts.hpp b/lib/ArduinoJson/src/ArduinoJson/Operators/VariantShortcuts.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Operators/VariantShortcuts.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Operators/VariantShortcuts.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/alias_cast.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/alias_cast.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/alias_cast.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/alias_cast.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/assert.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/assert.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/assert.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/assert.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/attributes.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/attributes.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/attributes.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/attributes.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/ctype.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/ctype.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/ctype.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/ctype.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/gsl/not_null.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/gsl/not_null.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/gsl/not_null.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/gsl/not_null.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/limits.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/limits.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/limits.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/limits.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/math.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/math.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/math.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/math.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/mpl/max.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/mpl/max.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/mpl/max.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/mpl/max.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/safe_strcmp.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/safe_strcmp.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/safe_strcmp.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/safe_strcmp.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/conditional.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/conditional.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/conditional.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/conditional.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/enable_if.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/enable_if.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/enable_if.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/enable_if.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/integral_constant.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/integral_constant.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/integral_constant.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/integral_constant.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_array.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_array.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_array.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_array.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_base_of.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_base_of.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_base_of.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_base_of.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_const.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_const.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_const.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_const.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_floating_point.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_floating_point.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_floating_point.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_floating_point.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_same.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_same.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_same.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_same.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_const.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_const.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_const.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_const.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_reference.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_reference.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_reference.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_reference.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/type_identity.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/type_identity.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/type_identity.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/type_identity.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/utility.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/utility.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Polyfills/utility.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Polyfills/utility.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writer.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writer.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writer.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Serialization/Writer.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/DummyWriter.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/DummyWriter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/DummyWriter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/DummyWriter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/PrintWriter.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/PrintWriter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/PrintWriter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/PrintWriter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStringWriter.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStringWriter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStringWriter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStringWriter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/measure.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/measure.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/measure.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Serialization/measure.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/serialize.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/serialize.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Serialization/serialize.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Serialization/serialize.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringCopier.hpp b/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringCopier.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringCopier.hpp
rename to lib/ArduinoJson/src/ArduinoJson/StringStorage/StringCopier.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringMover.hpp b/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringMover.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringMover.hpp
rename to lib/ArduinoJson/src/ArduinoJson/StringStorage/StringMover.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringStorage.hpp b/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringStorage.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringStorage.hpp
rename to lib/ArduinoJson/src/ArduinoJson/StringStorage/StringStorage.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/ArduinoStringAdapter.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/ArduinoStringAdapter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/ArduinoStringAdapter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Strings/ArduinoStringAdapter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/ConstRamStringAdapter.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/ConstRamStringAdapter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/ConstRamStringAdapter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Strings/ConstRamStringAdapter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/FlashStringAdapter.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/FlashStringAdapter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/FlashStringAdapter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Strings/FlashStringAdapter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/IsWriteableString.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/IsWriteableString.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/IsWriteableString.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Strings/IsWriteableString.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/RamStringAdapter.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/RamStringAdapter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/RamStringAdapter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Strings/RamStringAdapter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/SizedFlashStringAdapter.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/SizedFlashStringAdapter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/SizedFlashStringAdapter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Strings/SizedFlashStringAdapter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/SizedRamStringAdapter.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/SizedRamStringAdapter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/SizedRamStringAdapter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Strings/SizedRamStringAdapter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/StlStringAdapter.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/StlStringAdapter.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/StlStringAdapter.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Strings/StlStringAdapter.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/String.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/String.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/String.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Strings/String.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapters.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapters.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapters.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapters.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/SlotFunctions.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/SlotFunctions.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/SlotFunctions.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Variant/SlotFunctions.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantAs.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantAs.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantAs.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Variant/VariantAs.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantAsImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantAsImpl.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantAsImpl.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Variant/VariantAsImpl.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantContent.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantContent.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantContent.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Variant/VariantContent.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantData.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantData.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantData.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Variant/VariantData.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantFunctions.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantFunctions.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantFunctions.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Variant/VariantFunctions.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantImpl.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantImpl.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Variant/VariantImpl.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantRef.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantRef.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantRef.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Variant/VariantRef.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantSlot.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantSlot.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantSlot.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Variant/VariantSlot.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantTo.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantTo.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/Variant/VariantTo.hpp
rename to lib/ArduinoJson/src/ArduinoJson/Variant/VariantTo.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/compatibility.hpp b/lib/ArduinoJson/src/ArduinoJson/compatibility.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/compatibility.hpp
rename to lib/ArduinoJson/src/ArduinoJson/compatibility.hpp
diff --git a/esp8285/lib/ArduinoJson/src/ArduinoJson/version.hpp b/lib/ArduinoJson/src/ArduinoJson/version.hpp
similarity index 100%
rename from esp8285/lib/ArduinoJson/src/ArduinoJson/version.hpp
rename to lib/ArduinoJson/src/ArduinoJson/version.hpp
diff --git a/esp8285/lib/Crypto/.piopm b/lib/Crypto/.piopm
similarity index 100%
rename from esp8285/lib/Crypto/.piopm
rename to lib/Crypto/.piopm
diff --git a/esp8285/lib/Crypto/AES.h b/lib/Crypto/AES.h
similarity index 100%
rename from esp8285/lib/Crypto/AES.h
rename to lib/Crypto/AES.h
diff --git a/esp8285/lib/Crypto/AES128.cpp b/lib/Crypto/AES128.cpp
similarity index 100%
rename from esp8285/lib/Crypto/AES128.cpp
rename to lib/Crypto/AES128.cpp
diff --git a/esp8285/lib/Crypto/AES192.cpp b/lib/Crypto/AES192.cpp
similarity index 100%
rename from esp8285/lib/Crypto/AES192.cpp
rename to lib/Crypto/AES192.cpp
diff --git a/esp8285/lib/Crypto/AES256.cpp b/lib/Crypto/AES256.cpp
similarity index 100%
rename from esp8285/lib/Crypto/AES256.cpp
rename to lib/Crypto/AES256.cpp
diff --git a/esp8285/lib/Crypto/AESCommon.cpp b/lib/Crypto/AESCommon.cpp
similarity index 100%
rename from esp8285/lib/Crypto/AESCommon.cpp
rename to lib/Crypto/AESCommon.cpp
diff --git a/esp8285/lib/Crypto/AESEsp32.cpp b/lib/Crypto/AESEsp32.cpp
similarity index 100%
rename from esp8285/lib/Crypto/AESEsp32.cpp
rename to lib/Crypto/AESEsp32.cpp
diff --git a/esp8285/lib/Crypto/AuthenticatedCipher.cpp b/lib/Crypto/AuthenticatedCipher.cpp
similarity index 100%
rename from esp8285/lib/Crypto/AuthenticatedCipher.cpp
rename to lib/Crypto/AuthenticatedCipher.cpp
diff --git a/esp8285/lib/Crypto/AuthenticatedCipher.h b/lib/Crypto/AuthenticatedCipher.h
similarity index 100%
rename from esp8285/lib/Crypto/AuthenticatedCipher.h
rename to lib/Crypto/AuthenticatedCipher.h
diff --git a/esp8285/lib/Crypto/BLAKE2b.cpp b/lib/Crypto/BLAKE2b.cpp
similarity index 100%
rename from esp8285/lib/Crypto/BLAKE2b.cpp
rename to lib/Crypto/BLAKE2b.cpp
diff --git a/esp8285/lib/Crypto/BLAKE2b.h b/lib/Crypto/BLAKE2b.h
similarity index 100%
rename from esp8285/lib/Crypto/BLAKE2b.h
rename to lib/Crypto/BLAKE2b.h
diff --git a/esp8285/lib/Crypto/BLAKE2s.cpp b/lib/Crypto/BLAKE2s.cpp
similarity index 100%
rename from esp8285/lib/Crypto/BLAKE2s.cpp
rename to lib/Crypto/BLAKE2s.cpp
diff --git a/esp8285/lib/Crypto/BLAKE2s.h b/lib/Crypto/BLAKE2s.h
similarity index 100%
rename from esp8285/lib/Crypto/BLAKE2s.h
rename to lib/Crypto/BLAKE2s.h
diff --git a/esp8285/lib/Crypto/BigNumberUtil.cpp b/lib/Crypto/BigNumberUtil.cpp
similarity index 100%
rename from esp8285/lib/Crypto/BigNumberUtil.cpp
rename to lib/Crypto/BigNumberUtil.cpp
diff --git a/esp8285/lib/Crypto/BigNumberUtil.h b/lib/Crypto/BigNumberUtil.h
similarity index 100%
rename from esp8285/lib/Crypto/BigNumberUtil.h
rename to lib/Crypto/BigNumberUtil.h
diff --git a/esp8285/lib/Crypto/BlockCipher.cpp b/lib/Crypto/BlockCipher.cpp
similarity index 100%
rename from esp8285/lib/Crypto/BlockCipher.cpp
rename to lib/Crypto/BlockCipher.cpp
diff --git a/esp8285/lib/Crypto/BlockCipher.h b/lib/Crypto/BlockCipher.h
similarity index 100%
rename from esp8285/lib/Crypto/BlockCipher.h
rename to lib/Crypto/BlockCipher.h
diff --git a/esp8285/lib/Crypto/CTR.cpp b/lib/Crypto/CTR.cpp
similarity index 100%
rename from esp8285/lib/Crypto/CTR.cpp
rename to lib/Crypto/CTR.cpp
diff --git a/esp8285/lib/Crypto/CTR.h b/lib/Crypto/CTR.h
similarity index 100%
rename from esp8285/lib/Crypto/CTR.h
rename to lib/Crypto/CTR.h
diff --git a/esp8285/lib/Crypto/ChaCha.cpp b/lib/Crypto/ChaCha.cpp
similarity index 100%
rename from esp8285/lib/Crypto/ChaCha.cpp
rename to lib/Crypto/ChaCha.cpp
diff --git a/esp8285/lib/Crypto/ChaCha.h b/lib/Crypto/ChaCha.h
similarity index 100%
rename from esp8285/lib/Crypto/ChaCha.h
rename to lib/Crypto/ChaCha.h
diff --git a/esp8285/lib/Crypto/ChaChaPoly.cpp b/lib/Crypto/ChaChaPoly.cpp
similarity index 100%
rename from esp8285/lib/Crypto/ChaChaPoly.cpp
rename to lib/Crypto/ChaChaPoly.cpp
diff --git a/esp8285/lib/Crypto/ChaChaPoly.h b/lib/Crypto/ChaChaPoly.h
similarity index 100%
rename from esp8285/lib/Crypto/ChaChaPoly.h
rename to lib/Crypto/ChaChaPoly.h
diff --git a/esp8285/lib/Crypto/Cipher.cpp b/lib/Crypto/Cipher.cpp
similarity index 100%
rename from esp8285/lib/Crypto/Cipher.cpp
rename to lib/Crypto/Cipher.cpp
diff --git a/esp8285/lib/Crypto/Cipher.h b/lib/Crypto/Cipher.h
similarity index 100%
rename from esp8285/lib/Crypto/Cipher.h
rename to lib/Crypto/Cipher.h
diff --git a/esp8285/lib/Crypto/Crypto.cpp b/lib/Crypto/Crypto.cpp
similarity index 100%
rename from esp8285/lib/Crypto/Crypto.cpp
rename to lib/Crypto/Crypto.cpp
diff --git a/esp8285/lib/Crypto/Crypto.h b/lib/Crypto/Crypto.h
similarity index 100%
rename from esp8285/lib/Crypto/Crypto.h
rename to lib/Crypto/Crypto.h
diff --git a/esp8285/lib/Crypto/Curve25519.cpp b/lib/Crypto/Curve25519.cpp
similarity index 100%
rename from esp8285/lib/Crypto/Curve25519.cpp
rename to lib/Crypto/Curve25519.cpp
diff --git a/esp8285/lib/Crypto/Curve25519.h b/lib/Crypto/Curve25519.h
similarity index 100%
rename from esp8285/lib/Crypto/Curve25519.h
rename to lib/Crypto/Curve25519.h
diff --git a/esp8285/lib/Crypto/EAX.cpp b/lib/Crypto/EAX.cpp
similarity index 100%
rename from esp8285/lib/Crypto/EAX.cpp
rename to lib/Crypto/EAX.cpp
diff --git a/esp8285/lib/Crypto/EAX.h b/lib/Crypto/EAX.h
similarity index 100%
rename from esp8285/lib/Crypto/EAX.h
rename to lib/Crypto/EAX.h
diff --git a/esp8285/lib/Crypto/Ed25519.cpp b/lib/Crypto/Ed25519.cpp
similarity index 100%
rename from esp8285/lib/Crypto/Ed25519.cpp
rename to lib/Crypto/Ed25519.cpp
diff --git a/esp8285/lib/Crypto/Ed25519.h b/lib/Crypto/Ed25519.h
similarity index 100%
rename from esp8285/lib/Crypto/Ed25519.h
rename to lib/Crypto/Ed25519.h
diff --git a/esp8285/lib/Crypto/GCM.cpp b/lib/Crypto/GCM.cpp
similarity index 100%
rename from esp8285/lib/Crypto/GCM.cpp
rename to lib/Crypto/GCM.cpp
diff --git a/esp8285/lib/Crypto/GCM.h b/lib/Crypto/GCM.h
similarity index 100%
rename from esp8285/lib/Crypto/GCM.h
rename to lib/Crypto/GCM.h
diff --git a/esp8285/lib/Crypto/GF128.cpp b/lib/Crypto/GF128.cpp
similarity index 100%
rename from esp8285/lib/Crypto/GF128.cpp
rename to lib/Crypto/GF128.cpp
diff --git a/esp8285/lib/Crypto/GF128.h b/lib/Crypto/GF128.h
similarity index 100%
rename from esp8285/lib/Crypto/GF128.h
rename to lib/Crypto/GF128.h
diff --git a/esp8285/lib/Crypto/GHASH.cpp b/lib/Crypto/GHASH.cpp
similarity index 100%
rename from esp8285/lib/Crypto/GHASH.cpp
rename to lib/Crypto/GHASH.cpp
diff --git a/esp8285/lib/Crypto/GHASH.h b/lib/Crypto/GHASH.h
similarity index 100%
rename from esp8285/lib/Crypto/GHASH.h
rename to lib/Crypto/GHASH.h
diff --git a/esp8285/lib/Crypto/Hash.cpp b/lib/Crypto/Hash.cpp
similarity index 100%
rename from esp8285/lib/Crypto/Hash.cpp
rename to lib/Crypto/Hash.cpp
diff --git a/esp8285/lib/Crypto/Hash.h b/lib/Crypto/Hash.h
similarity index 100%
rename from esp8285/lib/Crypto/Hash.h
rename to lib/Crypto/Hash.h
diff --git a/esp8285/lib/Crypto/KeccakCore.cpp b/lib/Crypto/KeccakCore.cpp
similarity index 100%
rename from esp8285/lib/Crypto/KeccakCore.cpp
rename to lib/Crypto/KeccakCore.cpp
diff --git a/esp8285/lib/Crypto/KeccakCore.h b/lib/Crypto/KeccakCore.h
similarity index 100%
rename from esp8285/lib/Crypto/KeccakCore.h
rename to lib/Crypto/KeccakCore.h
diff --git a/esp8285/lib/Crypto/NoiseSource.cpp b/lib/Crypto/NoiseSource.cpp
similarity index 100%
rename from esp8285/lib/Crypto/NoiseSource.cpp
rename to lib/Crypto/NoiseSource.cpp
diff --git a/esp8285/lib/Crypto/NoiseSource.h b/lib/Crypto/NoiseSource.h
similarity index 100%
rename from esp8285/lib/Crypto/NoiseSource.h
rename to lib/Crypto/NoiseSource.h
diff --git a/esp8285/lib/Crypto/OMAC.cpp b/lib/Crypto/OMAC.cpp
similarity index 100%
rename from esp8285/lib/Crypto/OMAC.cpp
rename to lib/Crypto/OMAC.cpp
diff --git a/esp8285/lib/Crypto/OMAC.h b/lib/Crypto/OMAC.h
similarity index 100%
rename from esp8285/lib/Crypto/OMAC.h
rename to lib/Crypto/OMAC.h
diff --git a/esp8285/lib/Crypto/P521.cpp b/lib/Crypto/P521.cpp
similarity index 100%
rename from esp8285/lib/Crypto/P521.cpp
rename to lib/Crypto/P521.cpp
diff --git a/esp8285/lib/Crypto/P521.h b/lib/Crypto/P521.h
similarity index 100%
rename from esp8285/lib/Crypto/P521.h
rename to lib/Crypto/P521.h
diff --git a/esp8285/lib/Crypto/Poly1305.cpp b/lib/Crypto/Poly1305.cpp
similarity index 100%
rename from esp8285/lib/Crypto/Poly1305.cpp
rename to lib/Crypto/Poly1305.cpp
diff --git a/esp8285/lib/Crypto/Poly1305.h b/lib/Crypto/Poly1305.h
similarity index 100%
rename from esp8285/lib/Crypto/Poly1305.h
rename to lib/Crypto/Poly1305.h
diff --git a/esp8285/lib/Crypto/RNG.cpp b/lib/Crypto/RNG.cpp
similarity index 100%
rename from esp8285/lib/Crypto/RNG.cpp
rename to lib/Crypto/RNG.cpp
diff --git a/esp8285/lib/Crypto/RNG.h b/lib/Crypto/RNG.h
similarity index 100%
rename from esp8285/lib/Crypto/RNG.h
rename to lib/Crypto/RNG.h
diff --git a/esp8285/lib/Crypto/SHA256.cpp b/lib/Crypto/SHA256.cpp
similarity index 100%
rename from esp8285/lib/Crypto/SHA256.cpp
rename to lib/Crypto/SHA256.cpp
diff --git a/esp8285/lib/Crypto/SHA256.h b/lib/Crypto/SHA256.h
similarity index 100%
rename from esp8285/lib/Crypto/SHA256.h
rename to lib/Crypto/SHA256.h
diff --git a/esp8285/lib/Crypto/SHA3.cpp b/lib/Crypto/SHA3.cpp
similarity index 100%
rename from esp8285/lib/Crypto/SHA3.cpp
rename to lib/Crypto/SHA3.cpp
diff --git a/esp8285/lib/Crypto/SHA3.h b/lib/Crypto/SHA3.h
similarity index 100%
rename from esp8285/lib/Crypto/SHA3.h
rename to lib/Crypto/SHA3.h
diff --git a/esp8285/lib/Crypto/SHA512.cpp b/lib/Crypto/SHA512.cpp
similarity index 100%
rename from esp8285/lib/Crypto/SHA512.cpp
rename to lib/Crypto/SHA512.cpp
diff --git a/esp8285/lib/Crypto/SHA512.h b/lib/Crypto/SHA512.h
similarity index 100%
rename from esp8285/lib/Crypto/SHA512.h
rename to lib/Crypto/SHA512.h
diff --git a/esp8285/lib/Crypto/SHAKE.cpp b/lib/Crypto/SHAKE.cpp
similarity index 100%
rename from esp8285/lib/Crypto/SHAKE.cpp
rename to lib/Crypto/SHAKE.cpp
diff --git a/esp8285/lib/Crypto/SHAKE.h b/lib/Crypto/SHAKE.h
similarity index 100%
rename from esp8285/lib/Crypto/SHAKE.h
rename to lib/Crypto/SHAKE.h
diff --git a/esp8285/lib/Crypto/XOF.cpp b/lib/Crypto/XOF.cpp
similarity index 100%
rename from esp8285/lib/Crypto/XOF.cpp
rename to lib/Crypto/XOF.cpp
diff --git a/esp8285/lib/Crypto/XOF.h b/lib/Crypto/XOF.h
similarity index 100%
rename from esp8285/lib/Crypto/XOF.h
rename to lib/Crypto/XOF.h
diff --git a/esp8285/lib/Crypto/XTS.cpp b/lib/Crypto/XTS.cpp
similarity index 100%
rename from esp8285/lib/Crypto/XTS.cpp
rename to lib/Crypto/XTS.cpp
diff --git a/esp8285/lib/Crypto/XTS.h b/lib/Crypto/XTS.h
similarity index 100%
rename from esp8285/lib/Crypto/XTS.h
rename to lib/Crypto/XTS.h
diff --git a/esp8285/lib/Crypto/examples/TestAES/TestAES.ino b/lib/Crypto/examples/TestAES/TestAES.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestAES/TestAES.ino
rename to lib/Crypto/examples/TestAES/TestAES.ino
diff --git a/esp8285/lib/Crypto/examples/TestAESSmall/TestAESSmall.ino b/lib/Crypto/examples/TestAESSmall/TestAESSmall.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestAESSmall/TestAESSmall.ino
rename to lib/Crypto/examples/TestAESSmall/TestAESSmall.ino
diff --git a/esp8285/lib/Crypto/examples/TestAESTiny/TestAESTiny.ino b/lib/Crypto/examples/TestAESTiny/TestAESTiny.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestAESTiny/TestAESTiny.ino
rename to lib/Crypto/examples/TestAESTiny/TestAESTiny.ino
diff --git a/esp8285/lib/Crypto/examples/TestBLAKE2b/TestBLAKE2b.ino b/lib/Crypto/examples/TestBLAKE2b/TestBLAKE2b.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestBLAKE2b/TestBLAKE2b.ino
rename to lib/Crypto/examples/TestBLAKE2b/TestBLAKE2b.ino
diff --git a/esp8285/lib/Crypto/examples/TestBLAKE2s/TestBLAKE2s.ino b/lib/Crypto/examples/TestBLAKE2s/TestBLAKE2s.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestBLAKE2s/TestBLAKE2s.ino
rename to lib/Crypto/examples/TestBLAKE2s/TestBLAKE2s.ino
diff --git a/esp8285/lib/Crypto/examples/TestBigNumberUtil/TestBigNumberUtil.ino b/lib/Crypto/examples/TestBigNumberUtil/TestBigNumberUtil.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestBigNumberUtil/TestBigNumberUtil.ino
rename to lib/Crypto/examples/TestBigNumberUtil/TestBigNumberUtil.ino
diff --git a/esp8285/lib/Crypto/examples/TestCTR/TestCTR.ino b/lib/Crypto/examples/TestCTR/TestCTR.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestCTR/TestCTR.ino
rename to lib/Crypto/examples/TestCTR/TestCTR.ino
diff --git a/esp8285/lib/Crypto/examples/TestChaCha/TestChaCha.ino b/lib/Crypto/examples/TestChaCha/TestChaCha.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestChaCha/TestChaCha.ino
rename to lib/Crypto/examples/TestChaCha/TestChaCha.ino
diff --git a/esp8285/lib/Crypto/examples/TestChaChaPoly/TestChaChaPoly.ino b/lib/Crypto/examples/TestChaChaPoly/TestChaChaPoly.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestChaChaPoly/TestChaChaPoly.ino
rename to lib/Crypto/examples/TestChaChaPoly/TestChaChaPoly.ino
diff --git a/esp8285/lib/Crypto/examples/TestCurve25519/TestCurve25519.ino b/lib/Crypto/examples/TestCurve25519/TestCurve25519.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestCurve25519/TestCurve25519.ino
rename to lib/Crypto/examples/TestCurve25519/TestCurve25519.ino
diff --git a/esp8285/lib/Crypto/examples/TestCurve25519Math/TestCurve25519Math.ino b/lib/Crypto/examples/TestCurve25519Math/TestCurve25519Math.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestCurve25519Math/TestCurve25519Math.ino
rename to lib/Crypto/examples/TestCurve25519Math/TestCurve25519Math.ino
diff --git a/esp8285/lib/Crypto/examples/TestEAX/TestEAX.ino b/lib/Crypto/examples/TestEAX/TestEAX.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestEAX/TestEAX.ino
rename to lib/Crypto/examples/TestEAX/TestEAX.ino
diff --git a/esp8285/lib/Crypto/examples/TestEd25519/TestEd25519.ino b/lib/Crypto/examples/TestEd25519/TestEd25519.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestEd25519/TestEd25519.ino
rename to lib/Crypto/examples/TestEd25519/TestEd25519.ino
diff --git a/esp8285/lib/Crypto/examples/TestGCM/TestGCM.ino b/lib/Crypto/examples/TestGCM/TestGCM.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestGCM/TestGCM.ino
rename to lib/Crypto/examples/TestGCM/TestGCM.ino
diff --git a/esp8285/lib/Crypto/examples/TestGHASH/TestGHASH.ino b/lib/Crypto/examples/TestGHASH/TestGHASH.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestGHASH/TestGHASH.ino
rename to lib/Crypto/examples/TestGHASH/TestGHASH.ino
diff --git a/esp8285/lib/Crypto/examples/TestP521/TestP521.ino b/lib/Crypto/examples/TestP521/TestP521.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestP521/TestP521.ino
rename to lib/Crypto/examples/TestP521/TestP521.ino
diff --git a/esp8285/lib/Crypto/examples/TestP521Math/TestP521Math.ino b/lib/Crypto/examples/TestP521Math/TestP521Math.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestP521Math/TestP521Math.ino
rename to lib/Crypto/examples/TestP521Math/TestP521Math.ino
diff --git a/esp8285/lib/Crypto/examples/TestPoly1305/TestPoly1305.ino b/lib/Crypto/examples/TestPoly1305/TestPoly1305.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestPoly1305/TestPoly1305.ino
rename to lib/Crypto/examples/TestPoly1305/TestPoly1305.ino
diff --git a/esp8285/lib/Crypto/examples/TestRNG/TestRNG.ino b/lib/Crypto/examples/TestRNG/TestRNG.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestRNG/TestRNG.ino
rename to lib/Crypto/examples/TestRNG/TestRNG.ino
diff --git a/esp8285/lib/Crypto/examples/TestSHA256/TestSHA256.ino b/lib/Crypto/examples/TestSHA256/TestSHA256.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestSHA256/TestSHA256.ino
rename to lib/Crypto/examples/TestSHA256/TestSHA256.ino
diff --git a/esp8285/lib/Crypto/examples/TestSHA3_256/TestSHA3_256.ino b/lib/Crypto/examples/TestSHA3_256/TestSHA3_256.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestSHA3_256/TestSHA3_256.ino
rename to lib/Crypto/examples/TestSHA3_256/TestSHA3_256.ino
diff --git a/esp8285/lib/Crypto/examples/TestSHA3_512/TestSHA3_512.ino b/lib/Crypto/examples/TestSHA3_512/TestSHA3_512.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestSHA3_512/TestSHA3_512.ino
rename to lib/Crypto/examples/TestSHA3_512/TestSHA3_512.ino
diff --git a/esp8285/lib/Crypto/examples/TestSHA512/TestSHA512.ino b/lib/Crypto/examples/TestSHA512/TestSHA512.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestSHA512/TestSHA512.ino
rename to lib/Crypto/examples/TestSHA512/TestSHA512.ino
diff --git a/esp8285/lib/Crypto/examples/TestSHAKE128/TestSHAKE128.ino b/lib/Crypto/examples/TestSHAKE128/TestSHAKE128.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestSHAKE128/TestSHAKE128.ino
rename to lib/Crypto/examples/TestSHAKE128/TestSHAKE128.ino
diff --git a/esp8285/lib/Crypto/examples/TestSHAKE256/TestSHAKE256.ino b/lib/Crypto/examples/TestSHAKE256/TestSHAKE256.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestSHAKE256/TestSHAKE256.ino
rename to lib/Crypto/examples/TestSHAKE256/TestSHAKE256.ino
diff --git a/esp8285/lib/Crypto/examples/TestXTS/TestXTS.ino b/lib/Crypto/examples/TestXTS/TestXTS.ino
similarity index 100%
rename from esp8285/lib/Crypto/examples/TestXTS/TestXTS.ino
rename to lib/Crypto/examples/TestXTS/TestXTS.ino
diff --git a/esp8285/lib/Crypto/keywords.txt b/lib/Crypto/keywords.txt
similarity index 100%
rename from esp8285/lib/Crypto/keywords.txt
rename to lib/Crypto/keywords.txt
diff --git a/esp8285/lib/Crypto/library.json b/lib/Crypto/library.json
similarity index 100%
rename from esp8285/lib/Crypto/library.json
rename to lib/Crypto/library.json
diff --git a/esp8285/lib/Crypto/utility/EndianUtil.h b/lib/Crypto/utility/EndianUtil.h
similarity index 100%
rename from esp8285/lib/Crypto/utility/EndianUtil.h
rename to lib/Crypto/utility/EndianUtil.h
diff --git a/esp8285/lib/Crypto/utility/LimbUtil.h b/lib/Crypto/utility/LimbUtil.h
similarity index 100%
rename from esp8285/lib/Crypto/utility/LimbUtil.h
rename to lib/Crypto/utility/LimbUtil.h
diff --git a/esp8285/lib/Crypto/utility/ProgMemUtil.h b/lib/Crypto/utility/ProgMemUtil.h
similarity index 100%
rename from esp8285/lib/Crypto/utility/ProgMemUtil.h
rename to lib/Crypto/utility/ProgMemUtil.h
diff --git a/esp8285/lib/Crypto/utility/RotateUtil.h b/lib/Crypto/utility/RotateUtil.h
similarity index 100%
rename from esp8285/lib/Crypto/utility/RotateUtil.h
rename to lib/Crypto/utility/RotateUtil.h
diff --git a/esp8285/lib/IRext/include/ir_ac_apply.h b/lib/IRext/include/ir_ac_apply.h
similarity index 100%
rename from esp8285/lib/IRext/include/ir_ac_apply.h
rename to lib/IRext/include/ir_ac_apply.h
diff --git a/esp8285/lib/IRext/include/ir_ac_binary_parse.h b/lib/IRext/include/ir_ac_binary_parse.h
similarity index 100%
rename from esp8285/lib/IRext/include/ir_ac_binary_parse.h
rename to lib/IRext/include/ir_ac_binary_parse.h
diff --git a/esp8285/lib/IRext/include/ir_ac_build_frame.h b/lib/IRext/include/ir_ac_build_frame.h
similarity index 100%
rename from esp8285/lib/IRext/include/ir_ac_build_frame.h
rename to lib/IRext/include/ir_ac_build_frame.h
diff --git a/esp8285/lib/IRext/include/ir_ac_control.h b/lib/IRext/include/ir_ac_control.h
similarity index 100%
rename from esp8285/lib/IRext/include/ir_ac_control.h
rename to lib/IRext/include/ir_ac_control.h
diff --git a/esp8285/lib/IRext/include/ir_ac_parse_forbidden_info.h b/lib/IRext/include/ir_ac_parse_forbidden_info.h
similarity index 100%
rename from esp8285/lib/IRext/include/ir_ac_parse_forbidden_info.h
rename to lib/IRext/include/ir_ac_parse_forbidden_info.h
diff --git a/esp8285/lib/IRext/include/ir_ac_parse_frame_info.h b/lib/IRext/include/ir_ac_parse_frame_info.h
similarity index 100%
rename from esp8285/lib/IRext/include/ir_ac_parse_frame_info.h
rename to lib/IRext/include/ir_ac_parse_frame_info.h
diff --git a/esp8285/lib/IRext/include/ir_ac_parse_parameter.h b/lib/IRext/include/ir_ac_parse_parameter.h
similarity index 100%
rename from esp8285/lib/IRext/include/ir_ac_parse_parameter.h
rename to lib/IRext/include/ir_ac_parse_parameter.h
diff --git a/esp8285/lib/IRext/include/ir_decode.h b/lib/IRext/include/ir_decode.h
similarity index 100%
rename from esp8285/lib/IRext/include/ir_decode.h
rename to lib/IRext/include/ir_decode.h
diff --git a/esp8285/lib/IRext/include/ir_defs.h b/lib/IRext/include/ir_defs.h
similarity index 100%
rename from esp8285/lib/IRext/include/ir_defs.h
rename to lib/IRext/include/ir_defs.h
diff --git a/esp8285/lib/IRext/include/ir_tv_control.h b/lib/IRext/include/ir_tv_control.h
similarity index 100%
rename from esp8285/lib/IRext/include/ir_tv_control.h
rename to lib/IRext/include/ir_tv_control.h
diff --git a/esp8285/lib/IRext/include/ir_utils.h b/lib/IRext/include/ir_utils.h
similarity index 100%
rename from esp8285/lib/IRext/include/ir_utils.h
rename to lib/IRext/include/ir_utils.h
diff --git a/esp8285/lib/IRext/ir_ac_apply.c b/lib/IRext/ir_ac_apply.c
similarity index 100%
rename from esp8285/lib/IRext/ir_ac_apply.c
rename to lib/IRext/ir_ac_apply.c
diff --git a/esp8285/lib/IRext/ir_ac_binary_parse.c b/lib/IRext/ir_ac_binary_parse.c
similarity index 100%
rename from esp8285/lib/IRext/ir_ac_binary_parse.c
rename to lib/IRext/ir_ac_binary_parse.c
diff --git a/esp8285/lib/IRext/ir_ac_build_frame.c b/lib/IRext/ir_ac_build_frame.c
similarity index 100%
rename from esp8285/lib/IRext/ir_ac_build_frame.c
rename to lib/IRext/ir_ac_build_frame.c
diff --git a/esp8285/lib/IRext/ir_ac_control.c b/lib/IRext/ir_ac_control.c
similarity index 100%
rename from esp8285/lib/IRext/ir_ac_control.c
rename to lib/IRext/ir_ac_control.c
diff --git a/esp8285/lib/IRext/ir_ac_parse_forbidden_info.c b/lib/IRext/ir_ac_parse_forbidden_info.c
similarity index 100%
rename from esp8285/lib/IRext/ir_ac_parse_forbidden_info.c
rename to lib/IRext/ir_ac_parse_forbidden_info.c
diff --git a/esp8285/lib/IRext/ir_ac_parse_frame_info.c b/lib/IRext/ir_ac_parse_frame_info.c
similarity index 100%
rename from esp8285/lib/IRext/ir_ac_parse_frame_info.c
rename to lib/IRext/ir_ac_parse_frame_info.c
diff --git a/esp8285/lib/IRext/ir_ac_parse_parameter.c b/lib/IRext/ir_ac_parse_parameter.c
similarity index 100%
rename from esp8285/lib/IRext/ir_ac_parse_parameter.c
rename to lib/IRext/ir_ac_parse_parameter.c
diff --git a/esp8285/lib/IRext/ir_decode.c b/lib/IRext/ir_decode.c
similarity index 100%
rename from esp8285/lib/IRext/ir_decode.c
rename to lib/IRext/ir_decode.c
diff --git a/esp8285/lib/IRext/ir_tv_control.c b/lib/IRext/ir_tv_control.c
similarity index 100%
rename from esp8285/lib/IRext/ir_tv_control.c
rename to lib/IRext/ir_tv_control.c
diff --git a/esp8285/lib/IRext/ir_utils.c b/lib/IRext/ir_utils.c
similarity index 100%
rename from esp8285/lib/IRext/ir_utils.c
rename to lib/IRext/ir_utils.c
diff --git a/esp8285/lib/IRremoteESP8266/.github/CONTRIBUTING.md b/lib/IRremoteESP8266/.github/CONTRIBUTING.md
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/.github/CONTRIBUTING.md
rename to lib/IRremoteESP8266/.github/CONTRIBUTING.md
diff --git a/esp8285/lib/IRremoteESP8266/.github/Contributors.md b/lib/IRremoteESP8266/.github/Contributors.md
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/.github/Contributors.md
rename to lib/IRremoteESP8266/.github/Contributors.md
diff --git a/esp8285/lib/IRremoteESP8266/.github/issue_template.md b/lib/IRremoteESP8266/.github/issue_template.md
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/.github/issue_template.md
rename to lib/IRremoteESP8266/.github/issue_template.md
diff --git a/esp8285/lib/IRremoteESP8266/.gitignore b/lib/IRremoteESP8266/.gitignore
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/.gitignore
rename to lib/IRremoteESP8266/.gitignore
diff --git a/esp8285/lib/IRremoteESP8266/.gitmodules b/lib/IRremoteESP8266/.gitmodules
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/.gitmodules
rename to lib/IRremoteESP8266/.gitmodules
diff --git a/esp8285/lib/IRremoteESP8266/.library.json b/lib/IRremoteESP8266/.library.json
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/.library.json
rename to lib/IRremoteESP8266/.library.json
diff --git a/esp8285/lib/IRremoteESP8266/.style.yapf b/lib/IRremoteESP8266/.style.yapf
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/.style.yapf
rename to lib/IRremoteESP8266/.style.yapf
diff --git a/esp8285/lib/IRremoteESP8266/.travis.yml b/lib/IRremoteESP8266/.travis.yml
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/.travis.yml
rename to lib/IRremoteESP8266/.travis.yml
diff --git a/esp8285/lib/IRremoteESP8266/CPPLINT.cfg b/lib/IRremoteESP8266/CPPLINT.cfg
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/CPPLINT.cfg
rename to lib/IRremoteESP8266/CPPLINT.cfg
diff --git a/esp8285/lib/IRremoteESP8266/LICENSE.txt b/lib/IRremoteESP8266/LICENSE.txt
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/LICENSE.txt
rename to lib/IRremoteESP8266/LICENSE.txt
diff --git a/esp8285/lib/IRremoteESP8266/README.md b/lib/IRremoteESP8266/README.md
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/README.md
rename to lib/IRremoteESP8266/README.md
diff --git a/esp8285/lib/IRremoteESP8266/ReleaseNotes.md b/lib/IRremoteESP8266/ReleaseNotes.md
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/ReleaseNotes.md
rename to lib/IRremoteESP8266/ReleaseNotes.md
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRGCSendDemo/IRGCSendDemo.ino b/lib/IRremoteESP8266/examples/IRGCSendDemo/IRGCSendDemo.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRGCSendDemo/IRGCSendDemo.ino
rename to lib/IRremoteESP8266/examples/IRGCSendDemo/IRGCSendDemo.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRGCSendDemo/platformio.ini b/lib/IRremoteESP8266/examples/IRGCSendDemo/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRGCSendDemo/platformio.ini
rename to lib/IRremoteESP8266/examples/IRGCSendDemo/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRGCTCPServer/IRGCTCPServer.ino b/lib/IRremoteESP8266/examples/IRGCTCPServer/IRGCTCPServer.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRGCTCPServer/IRGCTCPServer.ino
rename to lib/IRremoteESP8266/examples/IRGCTCPServer/IRGCTCPServer.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRGCTCPServer/platformio.ini b/lib/IRremoteESP8266/examples/IRGCTCPServer/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRGCTCPServer/platformio.ini
rename to lib/IRremoteESP8266/examples/IRGCTCPServer/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRMQTTServer/IRMQTTServer.ino b/lib/IRremoteESP8266/examples/IRMQTTServer/IRMQTTServer.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRMQTTServer/IRMQTTServer.ino
rename to lib/IRremoteESP8266/examples/IRMQTTServer/IRMQTTServer.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRMQTTServer/platformio.ini b/lib/IRremoteESP8266/examples/IRMQTTServer/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRMQTTServer/platformio.ini
rename to lib/IRremoteESP8266/examples/IRMQTTServer/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRServer/IRServer.ino b/lib/IRremoteESP8266/examples/IRServer/IRServer.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRServer/IRServer.ino
rename to lib/IRremoteESP8266/examples/IRServer/IRServer.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRServer/platformio.ini b/lib/IRremoteESP8266/examples/IRServer/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRServer/platformio.ini
rename to lib/IRremoteESP8266/examples/IRServer/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRrecvDemo/IRrecvDemo.ino b/lib/IRremoteESP8266/examples/IRrecvDemo/IRrecvDemo.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRrecvDemo/IRrecvDemo.ino
rename to lib/IRremoteESP8266/examples/IRrecvDemo/IRrecvDemo.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRrecvDemo/platformio.ini b/lib/IRremoteESP8266/examples/IRrecvDemo/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRrecvDemo/platformio.ini
rename to lib/IRremoteESP8266/examples/IRrecvDemo/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRrecvDump/IRrecvDump.ino b/lib/IRremoteESP8266/examples/IRrecvDump/IRrecvDump.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRrecvDump/IRrecvDump.ino
rename to lib/IRremoteESP8266/examples/IRrecvDump/IRrecvDump.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRrecvDump/platformio.ini b/lib/IRremoteESP8266/examples/IRrecvDump/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRrecvDump/platformio.ini
rename to lib/IRremoteESP8266/examples/IRrecvDump/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRrecvDumpV2/IRrecvDumpV2.ino b/lib/IRremoteESP8266/examples/IRrecvDumpV2/IRrecvDumpV2.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRrecvDumpV2/IRrecvDumpV2.ino
rename to lib/IRremoteESP8266/examples/IRrecvDumpV2/IRrecvDumpV2.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRrecvDumpV2/platformio.ini b/lib/IRremoteESP8266/examples/IRrecvDumpV2/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRrecvDumpV2/platformio.ini
rename to lib/IRremoteESP8266/examples/IRrecvDumpV2/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRsendDemo/IRsendDemo.ino b/lib/IRremoteESP8266/examples/IRsendDemo/IRsendDemo.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRsendDemo/IRsendDemo.ino
rename to lib/IRremoteESP8266/examples/IRsendDemo/IRsendDemo.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRsendDemo/platformio.ini b/lib/IRremoteESP8266/examples/IRsendDemo/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRsendDemo/platformio.ini
rename to lib/IRremoteESP8266/examples/IRsendDemo/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRsendProntoDemo/IRsendProntoDemo.ino b/lib/IRremoteESP8266/examples/IRsendProntoDemo/IRsendProntoDemo.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRsendProntoDemo/IRsendProntoDemo.ino
rename to lib/IRremoteESP8266/examples/IRsendProntoDemo/IRsendProntoDemo.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/IRsendProntoDemo/platformio.ini b/lib/IRremoteESP8266/examples/IRsendProntoDemo/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/IRsendProntoDemo/platformio.ini
rename to lib/IRremoteESP8266/examples/IRsendProntoDemo/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino b/lib/IRremoteESP8266/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
rename to lib/IRremoteESP8266/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/JVCPanasonicSendDemo/platformio.ini b/lib/IRremoteESP8266/examples/JVCPanasonicSendDemo/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/JVCPanasonicSendDemo/platformio.ini
rename to lib/IRremoteESP8266/examples/JVCPanasonicSendDemo/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/LGACSend/LGACSend.ino b/lib/IRremoteESP8266/examples/LGACSend/LGACSend.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/LGACSend/LGACSend.ino
rename to lib/IRremoteESP8266/examples/LGACSend/LGACSend.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/LGACSend/platformio.ini b/lib/IRremoteESP8266/examples/LGACSend/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/LGACSend/platformio.ini
rename to lib/IRremoteESP8266/examples/LGACSend/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnArgoAC/TurnOnArgoAC.ino b/lib/IRremoteESP8266/examples/TurnOnArgoAC/TurnOnArgoAC.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnArgoAC/TurnOnArgoAC.ino
rename to lib/IRremoteESP8266/examples/TurnOnArgoAC/TurnOnArgoAC.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnArgoAC/platformio.ini b/lib/IRremoteESP8266/examples/TurnOnArgoAC/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnArgoAC/platformio.ini
rename to lib/IRremoteESP8266/examples/TurnOnArgoAC/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino b/lib/IRremoteESP8266/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
rename to lib/IRremoteESP8266/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnDaikinAC/platformio.ini b/lib/IRremoteESP8266/examples/TurnOnDaikinAC/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnDaikinAC/platformio.ini
rename to lib/IRremoteESP8266/examples/TurnOnDaikinAC/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino b/lib/IRremoteESP8266/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
rename to lib/IRremoteESP8266/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnFujitsuAC/platformio.ini b/lib/IRremoteESP8266/examples/TurnOnFujitsuAC/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnFujitsuAC/platformio.ini
rename to lib/IRremoteESP8266/examples/TurnOnFujitsuAC/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino b/lib/IRremoteESP8266/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
rename to lib/IRremoteESP8266/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnKelvinatorAC/platformio.ini b/lib/IRremoteESP8266/examples/TurnOnKelvinatorAC/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnKelvinatorAC/platformio.ini
rename to lib/IRremoteESP8266/examples/TurnOnKelvinatorAC/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino b/lib/IRremoteESP8266/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
rename to lib/IRremoteESP8266/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnMitsubishiAC/platformio.ini b/lib/IRremoteESP8266/examples/TurnOnMitsubishiAC/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnMitsubishiAC/platformio.ini
rename to lib/IRremoteESP8266/examples/TurnOnMitsubishiAC/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino b/lib/IRremoteESP8266/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
rename to lib/IRremoteESP8266/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnToshibaAC/platformio.ini b/lib/IRremoteESP8266/examples/TurnOnToshibaAC/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnToshibaAC/platformio.ini
rename to lib/IRremoteESP8266/examples/TurnOnToshibaAC/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino b/lib/IRremoteESP8266/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
rename to lib/IRremoteESP8266/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
diff --git a/esp8285/lib/IRremoteESP8266/examples/TurnOnTrotecAC/platformio.ini b/lib/IRremoteESP8266/examples/TurnOnTrotecAC/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/examples/TurnOnTrotecAC/platformio.ini
rename to lib/IRremoteESP8266/examples/TurnOnTrotecAC/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/keywords.txt b/lib/IRremoteESP8266/keywords.txt
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/keywords.txt
rename to lib/IRremoteESP8266/keywords.txt
diff --git a/esp8285/lib/IRremoteESP8266/library.json b/lib/IRremoteESP8266/library.json
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/library.json
rename to lib/IRremoteESP8266/library.json
diff --git a/esp8285/lib/IRremoteESP8266/library.properties b/lib/IRremoteESP8266/library.properties
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/library.properties
rename to lib/IRremoteESP8266/library.properties
diff --git a/esp8285/lib/IRremoteESP8266/platformio.ini b/lib/IRremoteESP8266/platformio.ini
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/platformio.ini
rename to lib/IRremoteESP8266/platformio.ini
diff --git a/esp8285/lib/IRremoteESP8266/pylintrc b/lib/IRremoteESP8266/pylintrc
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/pylintrc
rename to lib/IRremoteESP8266/pylintrc
diff --git a/esp8285/lib/IRremoteESP8266/src/CPPLINT.cfg b/lib/IRremoteESP8266/src/CPPLINT.cfg
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/src/CPPLINT.cfg
rename to lib/IRremoteESP8266/src/CPPLINT.cfg
diff --git a/esp8285/lib/IRremoteESP8266/src/IRrecv.cpp b/lib/IRremoteESP8266/src/IRrecv.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/src/IRrecv.cpp
rename to lib/IRremoteESP8266/src/IRrecv.cpp
diff --git a/esp8285/lib/IRremoteESP8266/src/IRrecv.h b/lib/IRremoteESP8266/src/IRrecv.h
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/src/IRrecv.h
rename to lib/IRremoteESP8266/src/IRrecv.h
diff --git a/esp8285/lib/IRremoteESP8266/src/IRremoteESP8266.h b/lib/IRremoteESP8266/src/IRremoteESP8266.h
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/src/IRremoteESP8266.h
rename to lib/IRremoteESP8266/src/IRremoteESP8266.h
diff --git a/esp8285/lib/IRremoteESP8266/src/IRsend.cpp b/lib/IRremoteESP8266/src/IRsend.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/src/IRsend.cpp
rename to lib/IRremoteESP8266/src/IRsend.cpp
diff --git a/esp8285/lib/IRremoteESP8266/src/IRsend.h b/lib/IRremoteESP8266/src/IRsend.h
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/src/IRsend.h
rename to lib/IRremoteESP8266/src/IRsend.h
diff --git a/esp8285/lib/IRremoteESP8266/src/IRtimer.cpp b/lib/IRremoteESP8266/src/IRtimer.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/src/IRtimer.cpp
rename to lib/IRremoteESP8266/src/IRtimer.cpp
diff --git a/esp8285/lib/IRremoteESP8266/src/IRtimer.h b/lib/IRremoteESP8266/src/IRtimer.h
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/src/IRtimer.h
rename to lib/IRremoteESP8266/src/IRtimer.h
diff --git a/esp8285/lib/IRremoteESP8266/src/IRutils.cpp b/lib/IRremoteESP8266/src/IRutils.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/src/IRutils.cpp
rename to lib/IRremoteESP8266/src/IRutils.cpp
diff --git a/esp8285/lib/IRremoteESP8266/src/IRutils.h b/lib/IRremoteESP8266/src/IRutils.h
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/src/IRutils.h
rename to lib/IRremoteESP8266/src/IRutils.h
diff --git a/esp8285/lib/IRremoteESP8266/test/IRrecv_test.cpp b/lib/IRremoteESP8266/test/IRrecv_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/IRrecv_test.cpp
rename to lib/IRremoteESP8266/test/IRrecv_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/IRrecv_test.h b/lib/IRremoteESP8266/test/IRrecv_test.h
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/IRrecv_test.h
rename to lib/IRremoteESP8266/test/IRrecv_test.h
diff --git a/esp8285/lib/IRremoteESP8266/test/IRsend_test.cpp b/lib/IRremoteESP8266/test/IRsend_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/IRsend_test.cpp
rename to lib/IRremoteESP8266/test/IRsend_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/IRsend_test.h b/lib/IRremoteESP8266/test/IRsend_test.h
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/IRsend_test.h
rename to lib/IRremoteESP8266/test/IRsend_test.h
diff --git a/esp8285/lib/IRremoteESP8266/test/IRutils_test.cpp b/lib/IRremoteESP8266/test/IRutils_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/IRutils_test.cpp
rename to lib/IRremoteESP8266/test/IRutils_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/Makefile b/lib/IRremoteESP8266/test/Makefile
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/Makefile
rename to lib/IRremoteESP8266/test/Makefile
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Aiwa_test.cpp b/lib/IRremoteESP8266/test/ir_Aiwa_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Aiwa_test.cpp
rename to lib/IRremoteESP8266/test/ir_Aiwa_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Carrier_test.cpp b/lib/IRremoteESP8266/test/ir_Carrier_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Carrier_test.cpp
rename to lib/IRremoteESP8266/test/ir_Carrier_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Coolix_test.cpp b/lib/IRremoteESP8266/test/ir_Coolix_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Coolix_test.cpp
rename to lib/IRremoteESP8266/test/ir_Coolix_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Daikin_test.cpp b/lib/IRremoteESP8266/test/ir_Daikin_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Daikin_test.cpp
rename to lib/IRremoteESP8266/test/ir_Daikin_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Denon_test.cpp b/lib/IRremoteESP8266/test/ir_Denon_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Denon_test.cpp
rename to lib/IRremoteESP8266/test/ir_Denon_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Dish_test.cpp b/lib/IRremoteESP8266/test/ir_Dish_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Dish_test.cpp
rename to lib/IRremoteESP8266/test/ir_Dish_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Electra_test.cpp b/lib/IRremoteESP8266/test/ir_Electra_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Electra_test.cpp
rename to lib/IRremoteESP8266/test/ir_Electra_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Fujitsu_test.cpp b/lib/IRremoteESP8266/test/ir_Fujitsu_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Fujitsu_test.cpp
rename to lib/IRremoteESP8266/test/ir_Fujitsu_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_GICable_test.cpp b/lib/IRremoteESP8266/test/ir_GICable_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_GICable_test.cpp
rename to lib/IRremoteESP8266/test/ir_GICable_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_GlobalCache_test.cpp b/lib/IRremoteESP8266/test/ir_GlobalCache_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_GlobalCache_test.cpp
rename to lib/IRremoteESP8266/test/ir_GlobalCache_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Gree_test.cpp b/lib/IRremoteESP8266/test/ir_Gree_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Gree_test.cpp
rename to lib/IRremoteESP8266/test/ir_Gree_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Haier_test.cpp b/lib/IRremoteESP8266/test/ir_Haier_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Haier_test.cpp
rename to lib/IRremoteESP8266/test/ir_Haier_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Hitachi_test.cpp b/lib/IRremoteESP8266/test/ir_Hitachi_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Hitachi_test.cpp
rename to lib/IRremoteESP8266/test/ir_Hitachi_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_JVC_test.cpp b/lib/IRremoteESP8266/test/ir_JVC_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_JVC_test.cpp
rename to lib/IRremoteESP8266/test/ir_JVC_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Kelvinator_test.cpp b/lib/IRremoteESP8266/test/ir_Kelvinator_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Kelvinator_test.cpp
rename to lib/IRremoteESP8266/test/ir_Kelvinator_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_LG_test.cpp b/lib/IRremoteESP8266/test/ir_LG_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_LG_test.cpp
rename to lib/IRremoteESP8266/test/ir_LG_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Lasertag_test.cpp b/lib/IRremoteESP8266/test/ir_Lasertag_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Lasertag_test.cpp
rename to lib/IRremoteESP8266/test/ir_Lasertag_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Lutron_test.cpp b/lib/IRremoteESP8266/test/ir_Lutron_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Lutron_test.cpp
rename to lib/IRremoteESP8266/test/ir_Lutron_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_MWM_test.cpp b/lib/IRremoteESP8266/test/ir_MWM_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_MWM_test.cpp
rename to lib/IRremoteESP8266/test/ir_MWM_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Magiquest_test.cpp b/lib/IRremoteESP8266/test/ir_Magiquest_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Magiquest_test.cpp
rename to lib/IRremoteESP8266/test/ir_Magiquest_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Midea_test.cpp b/lib/IRremoteESP8266/test/ir_Midea_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Midea_test.cpp
rename to lib/IRremoteESP8266/test/ir_Midea_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Mitsubishi_test.cpp b/lib/IRremoteESP8266/test/ir_Mitsubishi_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Mitsubishi_test.cpp
rename to lib/IRremoteESP8266/test/ir_Mitsubishi_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_NEC_test.cpp b/lib/IRremoteESP8266/test/ir_NEC_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_NEC_test.cpp
rename to lib/IRremoteESP8266/test/ir_NEC_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Nikai_test.cpp b/lib/IRremoteESP8266/test/ir_Nikai_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Nikai_test.cpp
rename to lib/IRremoteESP8266/test/ir_Nikai_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Panasonic_test.cpp b/lib/IRremoteESP8266/test/ir_Panasonic_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Panasonic_test.cpp
rename to lib/IRremoteESP8266/test/ir_Panasonic_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Pioneer_test.cpp b/lib/IRremoteESP8266/test/ir_Pioneer_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Pioneer_test.cpp
rename to lib/IRremoteESP8266/test/ir_Pioneer_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Pronto_test.cpp b/lib/IRremoteESP8266/test/ir_Pronto_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Pronto_test.cpp
rename to lib/IRremoteESP8266/test/ir_Pronto_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_RC5_RC6_test.cpp b/lib/IRremoteESP8266/test/ir_RC5_RC6_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_RC5_RC6_test.cpp
rename to lib/IRremoteESP8266/test/ir_RC5_RC6_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_RCMM_test.cpp b/lib/IRremoteESP8266/test/ir_RCMM_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_RCMM_test.cpp
rename to lib/IRremoteESP8266/test/ir_RCMM_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Samsung_test.cpp b/lib/IRremoteESP8266/test/ir_Samsung_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Samsung_test.cpp
rename to lib/IRremoteESP8266/test/ir_Samsung_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Sanyo_test.cpp b/lib/IRremoteESP8266/test/ir_Sanyo_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Sanyo_test.cpp
rename to lib/IRremoteESP8266/test/ir_Sanyo_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Sharp_test.cpp b/lib/IRremoteESP8266/test/ir_Sharp_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Sharp_test.cpp
rename to lib/IRremoteESP8266/test/ir_Sharp_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Sherwood_test.cpp b/lib/IRremoteESP8266/test/ir_Sherwood_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Sherwood_test.cpp
rename to lib/IRremoteESP8266/test/ir_Sherwood_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Sony_test.cpp b/lib/IRremoteESP8266/test/ir_Sony_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Sony_test.cpp
rename to lib/IRremoteESP8266/test/ir_Sony_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Toshiba_test.cpp b/lib/IRremoteESP8266/test/ir_Toshiba_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Toshiba_test.cpp
rename to lib/IRremoteESP8266/test/ir_Toshiba_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Whirlpool_test.cpp b/lib/IRremoteESP8266/test/ir_Whirlpool_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Whirlpool_test.cpp
rename to lib/IRremoteESP8266/test/ir_Whirlpool_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/test/ir_Whynter_test.cpp b/lib/IRremoteESP8266/test/ir_Whynter_test.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/test/ir_Whynter_test.cpp
rename to lib/IRremoteESP8266/test/ir_Whynter_test.cpp
diff --git a/esp8285/lib/IRremoteESP8266/tools/Makefile b/lib/IRremoteESP8266/tools/Makefile
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/tools/Makefile
rename to lib/IRremoteESP8266/tools/Makefile
diff --git a/esp8285/lib/IRremoteESP8266/tools/RawToGlobalCache.sh b/lib/IRremoteESP8266/tools/RawToGlobalCache.sh
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/tools/RawToGlobalCache.sh
rename to lib/IRremoteESP8266/tools/RawToGlobalCache.sh
diff --git a/esp8285/lib/IRremoteESP8266/tools/auto_analyse_raw_data.py b/lib/IRremoteESP8266/tools/auto_analyse_raw_data.py
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/tools/auto_analyse_raw_data.py
rename to lib/IRremoteESP8266/tools/auto_analyse_raw_data.py
diff --git a/esp8285/lib/IRremoteESP8266/tools/auto_analyse_raw_data_test.py b/lib/IRremoteESP8266/tools/auto_analyse_raw_data_test.py
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/tools/auto_analyse_raw_data_test.py
rename to lib/IRremoteESP8266/tools/auto_analyse_raw_data_test.py
diff --git a/esp8285/lib/IRremoteESP8266/tools/gc_decode.cpp b/lib/IRremoteESP8266/tools/gc_decode.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/tools/gc_decode.cpp
rename to lib/IRremoteESP8266/tools/gc_decode.cpp
diff --git a/esp8285/lib/IRremoteESP8266/tools/mkkeywords b/lib/IRremoteESP8266/tools/mkkeywords
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/tools/mkkeywords
rename to lib/IRremoteESP8266/tools/mkkeywords
diff --git a/esp8285/lib/IRremoteESP8266/tools/mode2_decode.cpp b/lib/IRremoteESP8266/tools/mode2_decode.cpp
similarity index 100%
rename from esp8285/lib/IRremoteESP8266/tools/mode2_decode.cpp
rename to lib/IRremoteESP8266/tools/mode2_decode.cpp
diff --git a/esp8285/lib/PubSubClient/.gitignore b/lib/PubSubClient/.gitignore
similarity index 100%
rename from esp8285/lib/PubSubClient/.gitignore
rename to lib/PubSubClient/.gitignore
diff --git a/esp8285/lib/PubSubClient/.library.json b/lib/PubSubClient/.library.json
similarity index 100%
rename from esp8285/lib/PubSubClient/.library.json
rename to lib/PubSubClient/.library.json
diff --git a/esp8285/lib/PubSubClient/.travis.yml b/lib/PubSubClient/.travis.yml
similarity index 100%
rename from esp8285/lib/PubSubClient/.travis.yml
rename to lib/PubSubClient/.travis.yml
diff --git a/esp8285/lib/PubSubClient/CHANGES.txt b/lib/PubSubClient/CHANGES.txt
similarity index 100%
rename from esp8285/lib/PubSubClient/CHANGES.txt
rename to lib/PubSubClient/CHANGES.txt
diff --git a/esp8285/lib/PubSubClient/LICENSE.txt b/lib/PubSubClient/LICENSE.txt
similarity index 100%
rename from esp8285/lib/PubSubClient/LICENSE.txt
rename to lib/PubSubClient/LICENSE.txt
diff --git a/esp8285/lib/PubSubClient/README.md b/lib/PubSubClient/README.md
similarity index 100%
rename from esp8285/lib/PubSubClient/README.md
rename to lib/PubSubClient/README.md
diff --git a/esp8285/lib/PubSubClient/examples/mqtt_auth/mqtt_auth.ino b/lib/PubSubClient/examples/mqtt_auth/mqtt_auth.ino
similarity index 100%
rename from esp8285/lib/PubSubClient/examples/mqtt_auth/mqtt_auth.ino
rename to lib/PubSubClient/examples/mqtt_auth/mqtt_auth.ino
diff --git a/esp8285/lib/PubSubClient/examples/mqtt_basic/mqtt_basic.ino b/lib/PubSubClient/examples/mqtt_basic/mqtt_basic.ino
similarity index 100%
rename from esp8285/lib/PubSubClient/examples/mqtt_basic/mqtt_basic.ino
rename to lib/PubSubClient/examples/mqtt_basic/mqtt_basic.ino
diff --git a/esp8285/lib/PubSubClient/examples/mqtt_esp8266/mqtt_esp8266.ino b/lib/PubSubClient/examples/mqtt_esp8266/mqtt_esp8266.ino
similarity index 100%
rename from esp8285/lib/PubSubClient/examples/mqtt_esp8266/mqtt_esp8266.ino
rename to lib/PubSubClient/examples/mqtt_esp8266/mqtt_esp8266.ino
diff --git a/esp8285/lib/PubSubClient/examples/mqtt_large_message/mqtt_large_message.ino b/lib/PubSubClient/examples/mqtt_large_message/mqtt_large_message.ino
similarity index 100%
rename from esp8285/lib/PubSubClient/examples/mqtt_large_message/mqtt_large_message.ino
rename to lib/PubSubClient/examples/mqtt_large_message/mqtt_large_message.ino
diff --git a/esp8285/lib/PubSubClient/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino b/lib/PubSubClient/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino
similarity index 100%
rename from esp8285/lib/PubSubClient/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino
rename to lib/PubSubClient/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino
diff --git a/esp8285/lib/PubSubClient/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino b/lib/PubSubClient/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino
similarity index 100%
rename from esp8285/lib/PubSubClient/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino
rename to lib/PubSubClient/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino
diff --git a/esp8285/lib/PubSubClient/examples/mqtt_stream/mqtt_stream.ino b/lib/PubSubClient/examples/mqtt_stream/mqtt_stream.ino
similarity index 100%
rename from esp8285/lib/PubSubClient/examples/mqtt_stream/mqtt_stream.ino
rename to lib/PubSubClient/examples/mqtt_stream/mqtt_stream.ino
diff --git a/esp8285/lib/PubSubClient/keywords.txt b/lib/PubSubClient/keywords.txt
similarity index 100%
rename from esp8285/lib/PubSubClient/keywords.txt
rename to lib/PubSubClient/keywords.txt
diff --git a/esp8285/lib/PubSubClient/library.json b/lib/PubSubClient/library.json
similarity index 100%
rename from esp8285/lib/PubSubClient/library.json
rename to lib/PubSubClient/library.json
diff --git a/esp8285/lib/PubSubClient/library.properties b/lib/PubSubClient/library.properties
similarity index 100%
rename from esp8285/lib/PubSubClient/library.properties
rename to lib/PubSubClient/library.properties
diff --git a/esp8285/lib/PubSubClient/src/PubSubClient.cpp b/lib/PubSubClient/src/PubSubClient.cpp
similarity index 100%
rename from esp8285/lib/PubSubClient/src/PubSubClient.cpp
rename to lib/PubSubClient/src/PubSubClient.cpp
diff --git a/esp8285/lib/PubSubClient/src/PubSubClient.h b/lib/PubSubClient/src/PubSubClient.h
similarity index 100%
rename from esp8285/lib/PubSubClient/src/PubSubClient.h
rename to lib/PubSubClient/src/PubSubClient.h
diff --git a/esp8285/lib/RC-Switch/RCSwitch.cpp b/lib/RC-Switch/RCSwitch.cpp
similarity index 100%
rename from esp8285/lib/RC-Switch/RCSwitch.cpp
rename to lib/RC-Switch/RCSwitch.cpp
diff --git a/esp8285/lib/RC-Switch/RCSwitch.h b/lib/RC-Switch/RCSwitch.h
similarity index 100%
rename from esp8285/lib/RC-Switch/RCSwitch.h
rename to lib/RC-Switch/RCSwitch.h
diff --git a/esp8285/lib/RC-Switch/README.md b/lib/RC-Switch/README.md
similarity index 100%
rename from esp8285/lib/RC-Switch/README.md
rename to lib/RC-Switch/README.md
diff --git a/esp8285/lib/RC-Switch/library.json b/lib/RC-Switch/library.json
similarity index 100%
rename from esp8285/lib/RC-Switch/library.json
rename to lib/RC-Switch/library.json
diff --git a/esp8285/lib/RC-Switch/library.properties b/lib/RC-Switch/library.properties
similarity index 100%
rename from esp8285/lib/RC-Switch/library.properties
rename to lib/RC-Switch/library.properties
diff --git a/esp8285/platformio.ini b/platformio.ini
similarity index 100%
rename from esp8285/platformio.ini
rename to platformio.ini
diff --git a/esp8285/src/aliot_client.cpp b/src/aliot_client.cpp
similarity index 100%
rename from esp8285/src/aliot_client.cpp
rename to src/aliot_client.cpp
diff --git a/esp8285/src/aliot_client.h b/src/aliot_client.h
similarity index 100%
rename from esp8285/src/aliot_client.h
rename to src/aliot_client.h
diff --git a/esp8285/src/defines.h b/src/defines.h
similarity index 100%
rename from esp8285/src/defines.h
rename to src/defines.h
diff --git a/esp8285/src/emq_client.cpp b/src/emq_client.cpp
similarity index 100%
rename from esp8285/src/emq_client.cpp
rename to src/emq_client.cpp
diff --git a/esp8285/src/emq_client.h b/src/emq_client.h
similarity index 100%
rename from esp8285/src/emq_client.h
rename to src/emq_client.h
diff --git a/esp8285/src/global.cpp b/src/global.cpp
similarity index 100%
rename from esp8285/src/global.cpp
rename to src/global.cpp
diff --git a/esp8285/src/global.h b/src/global.h
similarity index 100%
rename from esp8285/src/global.h
rename to src/global.h
diff --git a/esp8285/src/high_availability.cpp b/src/high_availability.cpp
similarity index 100%
rename from esp8285/src/high_availability.cpp
rename to src/high_availability.cpp
diff --git a/esp8285/src/high_availability.h b/src/high_availability.h
similarity index 100%
rename from esp8285/src/high_availability.h
rename to src/high_availability.h
diff --git a/esp8285/src/http_client.cpp b/src/http_client.cpp
similarity index 100%
rename from esp8285/src/http_client.cpp
rename to src/http_client.cpp
diff --git a/esp8285/src/http_client.h b/src/http_client.h
similarity index 100%
rename from esp8285/src/http_client.h
rename to src/http_client.h
diff --git a/esp8285/src/iot_hub.cpp b/src/iot_hub.cpp
similarity index 100%
rename from esp8285/src/iot_hub.cpp
rename to src/iot_hub.cpp
diff --git a/esp8285/src/iot_hub.h b/src/iot_hub.h
similarity index 100%
rename from esp8285/src/iot_hub.h
rename to src/iot_hub.h
diff --git a/esp8285/src/ir_drv_ctrl.cpp b/src/ir_drv_ctrl.cpp
similarity index 100%
rename from esp8285/src/ir_drv_ctrl.cpp
rename to src/ir_drv_ctrl.cpp
diff --git a/esp8285/src/ir_drv_ctrl.h b/src/ir_drv_ctrl.h
similarity index 100%
rename from esp8285/src/ir_drv_ctrl.h
rename to src/ir_drv_ctrl.h
diff --git a/esp8285/src/iris_client.cpp b/src/iris_client.cpp
similarity index 100%
rename from esp8285/src/iris_client.cpp
rename to src/iris_client.cpp
diff --git a/esp8285/src/iris_client.h b/src/iris_client.h
similarity index 100%
rename from esp8285/src/iris_client.h
rename to src/iris_client.h
diff --git a/esp8285/src/iris_kit.cpp b/src/iris_kit.cpp
similarity index 100%
rename from esp8285/src/iris_kit.cpp
rename to src/iris_kit.cpp
diff --git a/esp8285/src/iris_kit.h b/src/iris_kit.h
similarity index 100%
rename from esp8285/src/iris_kit.h
rename to src/iris_kit.h
diff --git a/esp8285/src/serials.h b/src/serials.h
similarity index 100%
rename from esp8285/src/serials.h
rename to src/serials.h
diff --git a/esp8285/src/user_settings.cpp b/src/user_settings.cpp
similarity index 100%
rename from esp8285/src/user_settings.cpp
rename to src/user_settings.cpp
diff --git a/esp8285/src/user_settings.h b/src/user_settings.h
similarity index 100%
rename from esp8285/src/user_settings.h
rename to src/user_settings.h
diff --git a/esp8285/src/utils.cpp b/src/utils.cpp
similarity index 100%
rename from esp8285/src/utils.cpp
rename to src/utils.cpp
diff --git a/esp8285/src/utils.h b/src/utils.h
similarity index 100%
rename from esp8285/src/utils.h
rename to src/utils.h