From e337b6360431d2ffb493190dd1a1762267464071 Mon Sep 17 00:00:00 2001
From: "pedro.minatel" <pedro.minatel@espressif.com>
Date: Tue, 2 Nov 2021 12:10:04 +0000
Subject: [PATCH 1/5] examples: WiFi and Ethernet examples organization

---
 .../WiFi/examples/{ => Ethernet}/ETH_LAN8720/.skip.esp32s2      | 0
 .../WiFi/examples/{ => Ethernet}/ETH_LAN8720/ETH_LAN8720.ino    | 0
 libraries/WiFi/examples/{ => Ethernet}/ETH_TLK110/.skip.esp32s2 | 0
 .../WiFi/examples/{ => Ethernet}/ETH_TLK110/ETH_TLK110.ino      | 0
 .../examples/{ => WiFi}/FTM/FTM_Initiator/FTM_Initiator.ino     | 0
 libraries/WiFi/examples/{ => WiFi}/FTM/FTM_Initiator/README.md  | 0
 .../examples/{ => WiFi}/FTM/FTM_Responder/FTM_Responder.ino     | 0
 libraries/WiFi/examples/{ => WiFi}/FTM/FTM_Responder/README.md  | 0
 .../examples/{ => WiFi}/SimpleWiFiServer/SimpleWiFiServer.ino   | 0
 libraries/WiFi/examples/{ => WiFi}/WPS/README.md                | 0
 libraries/WiFi/examples/{ => WiFi}/WPS/WPS.ino                  | 0
 .../examples/{ => WiFi}/WiFiAccessPoint/WiFiAccessPoint.ino     | 0
 .../WiFi/examples/{ => WiFi}/WiFiBlueToothSwitch/.skip.esp32s2  | 0
 .../{ => WiFi}/WiFiBlueToothSwitch/WiFiBlueToothSwitch.ino      | 0
 libraries/WiFi/examples/{ => WiFi}/WiFiClient/WiFiClient.ino    | 0
 .../examples/{ => WiFi}/WiFiClientBasic/WiFiClientBasic.ino     | 0
 .../WiFi/examples/{ => WiFi}/WiFiClientEnterprise/README.md     | 0
 .../{ => WiFi}/WiFiClientEnterprise/WiFiClientEnterprise.ino    | 0
 .../examples/{ => WiFi}/WiFiClientEvents/WiFiClientEvents.ino   | 0
 .../{ => WiFi}/WiFiClientStaticIP/WiFiClientStaticIP.ino        | 0
 libraries/WiFi/examples/{ => WiFi}/WiFiIPv6/WiFiIPv6.ino        | 0
 libraries/WiFi/examples/{ => WiFi}/WiFiMulti/WiFiMulti.ino      | 0
 libraries/WiFi/examples/{ => WiFi}/WiFiScan/README.md           | 0
 libraries/WiFi/examples/{ => WiFi}/WiFiScan/WiFiScan.ino        | 0
 .../examples/{ => WiFi}/WiFiSmartConfig/WiFiSmartConfig.ino     | 0
 .../{ => WiFi}/WiFiTelnetToSerial/WiFiTelnetToSerial.ino        | 0
 .../WiFi/examples/{ => WiFi}/WiFiUDPClient/WiFiUDPClient.ino    | 0
 libraries/WiFi/examples/{ => WiFi}/WiFiUDPClient/udp_server.py  | 0
 libraries/WiFi/examples/{ => WiFi}/WiFiUDPClient/udp_server.rb  | 0
 libraries/WiFi/library.properties                               | 2 +-
 30 files changed, 1 insertion(+), 1 deletion(-)
 rename libraries/WiFi/examples/{ => Ethernet}/ETH_LAN8720/.skip.esp32s2 (100%)
 rename libraries/WiFi/examples/{ => Ethernet}/ETH_LAN8720/ETH_LAN8720.ino (100%)
 rename libraries/WiFi/examples/{ => Ethernet}/ETH_TLK110/.skip.esp32s2 (100%)
 rename libraries/WiFi/examples/{ => Ethernet}/ETH_TLK110/ETH_TLK110.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/FTM/FTM_Initiator/FTM_Initiator.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/FTM/FTM_Initiator/README.md (100%)
 rename libraries/WiFi/examples/{ => WiFi}/FTM/FTM_Responder/FTM_Responder.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/FTM/FTM_Responder/README.md (100%)
 rename libraries/WiFi/examples/{ => WiFi}/SimpleWiFiServer/SimpleWiFiServer.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WPS/README.md (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WPS/WPS.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiAccessPoint/WiFiAccessPoint.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiBlueToothSwitch/.skip.esp32s2 (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiBlueToothSwitch/WiFiBlueToothSwitch.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiClient/WiFiClient.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiClientBasic/WiFiClientBasic.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiClientEnterprise/README.md (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiClientEnterprise/WiFiClientEnterprise.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiClientEvents/WiFiClientEvents.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiClientStaticIP/WiFiClientStaticIP.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiIPv6/WiFiIPv6.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiMulti/WiFiMulti.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiScan/README.md (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiScan/WiFiScan.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiSmartConfig/WiFiSmartConfig.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiTelnetToSerial/WiFiTelnetToSerial.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiUDPClient/WiFiUDPClient.ino (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiUDPClient/udp_server.py (100%)
 rename libraries/WiFi/examples/{ => WiFi}/WiFiUDPClient/udp_server.rb (100%)

diff --git a/libraries/WiFi/examples/ETH_LAN8720/.skip.esp32s2 b/libraries/WiFi/examples/Ethernet/ETH_LAN8720/.skip.esp32s2
similarity index 100%
rename from libraries/WiFi/examples/ETH_LAN8720/.skip.esp32s2
rename to libraries/WiFi/examples/Ethernet/ETH_LAN8720/.skip.esp32s2
diff --git a/libraries/WiFi/examples/ETH_LAN8720/ETH_LAN8720.ino b/libraries/WiFi/examples/Ethernet/ETH_LAN8720/ETH_LAN8720.ino
similarity index 100%
rename from libraries/WiFi/examples/ETH_LAN8720/ETH_LAN8720.ino
rename to libraries/WiFi/examples/Ethernet/ETH_LAN8720/ETH_LAN8720.ino
diff --git a/libraries/WiFi/examples/ETH_TLK110/.skip.esp32s2 b/libraries/WiFi/examples/Ethernet/ETH_TLK110/.skip.esp32s2
similarity index 100%
rename from libraries/WiFi/examples/ETH_TLK110/.skip.esp32s2
rename to libraries/WiFi/examples/Ethernet/ETH_TLK110/.skip.esp32s2
diff --git a/libraries/WiFi/examples/ETH_TLK110/ETH_TLK110.ino b/libraries/WiFi/examples/Ethernet/ETH_TLK110/ETH_TLK110.ino
similarity index 100%
rename from libraries/WiFi/examples/ETH_TLK110/ETH_TLK110.ino
rename to libraries/WiFi/examples/Ethernet/ETH_TLK110/ETH_TLK110.ino
diff --git a/libraries/WiFi/examples/FTM/FTM_Initiator/FTM_Initiator.ino b/libraries/WiFi/examples/WiFi/FTM/FTM_Initiator/FTM_Initiator.ino
similarity index 100%
rename from libraries/WiFi/examples/FTM/FTM_Initiator/FTM_Initiator.ino
rename to libraries/WiFi/examples/WiFi/FTM/FTM_Initiator/FTM_Initiator.ino
diff --git a/libraries/WiFi/examples/FTM/FTM_Initiator/README.md b/libraries/WiFi/examples/WiFi/FTM/FTM_Initiator/README.md
similarity index 100%
rename from libraries/WiFi/examples/FTM/FTM_Initiator/README.md
rename to libraries/WiFi/examples/WiFi/FTM/FTM_Initiator/README.md
diff --git a/libraries/WiFi/examples/FTM/FTM_Responder/FTM_Responder.ino b/libraries/WiFi/examples/WiFi/FTM/FTM_Responder/FTM_Responder.ino
similarity index 100%
rename from libraries/WiFi/examples/FTM/FTM_Responder/FTM_Responder.ino
rename to libraries/WiFi/examples/WiFi/FTM/FTM_Responder/FTM_Responder.ino
diff --git a/libraries/WiFi/examples/FTM/FTM_Responder/README.md b/libraries/WiFi/examples/WiFi/FTM/FTM_Responder/README.md
similarity index 100%
rename from libraries/WiFi/examples/FTM/FTM_Responder/README.md
rename to libraries/WiFi/examples/WiFi/FTM/FTM_Responder/README.md
diff --git a/libraries/WiFi/examples/SimpleWiFiServer/SimpleWiFiServer.ino b/libraries/WiFi/examples/WiFi/SimpleWiFiServer/SimpleWiFiServer.ino
similarity index 100%
rename from libraries/WiFi/examples/SimpleWiFiServer/SimpleWiFiServer.ino
rename to libraries/WiFi/examples/WiFi/SimpleWiFiServer/SimpleWiFiServer.ino
diff --git a/libraries/WiFi/examples/WPS/README.md b/libraries/WiFi/examples/WiFi/WPS/README.md
similarity index 100%
rename from libraries/WiFi/examples/WPS/README.md
rename to libraries/WiFi/examples/WiFi/WPS/README.md
diff --git a/libraries/WiFi/examples/WPS/WPS.ino b/libraries/WiFi/examples/WiFi/WPS/WPS.ino
similarity index 100%
rename from libraries/WiFi/examples/WPS/WPS.ino
rename to libraries/WiFi/examples/WiFi/WPS/WPS.ino
diff --git a/libraries/WiFi/examples/WiFiAccessPoint/WiFiAccessPoint.ino b/libraries/WiFi/examples/WiFi/WiFiAccessPoint/WiFiAccessPoint.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFiAccessPoint/WiFiAccessPoint.ino
rename to libraries/WiFi/examples/WiFi/WiFiAccessPoint/WiFiAccessPoint.ino
diff --git a/libraries/WiFi/examples/WiFiBlueToothSwitch/.skip.esp32s2 b/libraries/WiFi/examples/WiFi/WiFiBlueToothSwitch/.skip.esp32s2
similarity index 100%
rename from libraries/WiFi/examples/WiFiBlueToothSwitch/.skip.esp32s2
rename to libraries/WiFi/examples/WiFi/WiFiBlueToothSwitch/.skip.esp32s2
diff --git a/libraries/WiFi/examples/WiFiBlueToothSwitch/WiFiBlueToothSwitch.ino b/libraries/WiFi/examples/WiFi/WiFiBlueToothSwitch/WiFiBlueToothSwitch.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFiBlueToothSwitch/WiFiBlueToothSwitch.ino
rename to libraries/WiFi/examples/WiFi/WiFiBlueToothSwitch/WiFiBlueToothSwitch.ino
diff --git a/libraries/WiFi/examples/WiFiClient/WiFiClient.ino b/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFiClient/WiFiClient.ino
rename to libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino
diff --git a/libraries/WiFi/examples/WiFiClientBasic/WiFiClientBasic.ino b/libraries/WiFi/examples/WiFi/WiFiClientBasic/WiFiClientBasic.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFiClientBasic/WiFiClientBasic.ino
rename to libraries/WiFi/examples/WiFi/WiFiClientBasic/WiFiClientBasic.ino
diff --git a/libraries/WiFi/examples/WiFiClientEnterprise/README.md b/libraries/WiFi/examples/WiFi/WiFiClientEnterprise/README.md
similarity index 100%
rename from libraries/WiFi/examples/WiFiClientEnterprise/README.md
rename to libraries/WiFi/examples/WiFi/WiFiClientEnterprise/README.md
diff --git a/libraries/WiFi/examples/WiFiClientEnterprise/WiFiClientEnterprise.ino b/libraries/WiFi/examples/WiFi/WiFiClientEnterprise/WiFiClientEnterprise.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFiClientEnterprise/WiFiClientEnterprise.ino
rename to libraries/WiFi/examples/WiFi/WiFiClientEnterprise/WiFiClientEnterprise.ino
diff --git a/libraries/WiFi/examples/WiFiClientEvents/WiFiClientEvents.ino b/libraries/WiFi/examples/WiFi/WiFiClientEvents/WiFiClientEvents.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFiClientEvents/WiFiClientEvents.ino
rename to libraries/WiFi/examples/WiFi/WiFiClientEvents/WiFiClientEvents.ino
diff --git a/libraries/WiFi/examples/WiFiClientStaticIP/WiFiClientStaticIP.ino b/libraries/WiFi/examples/WiFi/WiFiClientStaticIP/WiFiClientStaticIP.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFiClientStaticIP/WiFiClientStaticIP.ino
rename to libraries/WiFi/examples/WiFi/WiFiClientStaticIP/WiFiClientStaticIP.ino
diff --git a/libraries/WiFi/examples/WiFiIPv6/WiFiIPv6.ino b/libraries/WiFi/examples/WiFi/WiFiIPv6/WiFiIPv6.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFiIPv6/WiFiIPv6.ino
rename to libraries/WiFi/examples/WiFi/WiFiIPv6/WiFiIPv6.ino
diff --git a/libraries/WiFi/examples/WiFiMulti/WiFiMulti.ino b/libraries/WiFi/examples/WiFi/WiFiMulti/WiFiMulti.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFiMulti/WiFiMulti.ino
rename to libraries/WiFi/examples/WiFi/WiFiMulti/WiFiMulti.ino
diff --git a/libraries/WiFi/examples/WiFiScan/README.md b/libraries/WiFi/examples/WiFi/WiFiScan/README.md
similarity index 100%
rename from libraries/WiFi/examples/WiFiScan/README.md
rename to libraries/WiFi/examples/WiFi/WiFiScan/README.md
diff --git a/libraries/WiFi/examples/WiFiScan/WiFiScan.ino b/libraries/WiFi/examples/WiFi/WiFiScan/WiFiScan.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFiScan/WiFiScan.ino
rename to libraries/WiFi/examples/WiFi/WiFiScan/WiFiScan.ino
diff --git a/libraries/WiFi/examples/WiFiSmartConfig/WiFiSmartConfig.ino b/libraries/WiFi/examples/WiFi/WiFiSmartConfig/WiFiSmartConfig.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFiSmartConfig/WiFiSmartConfig.ino
rename to libraries/WiFi/examples/WiFi/WiFiSmartConfig/WiFiSmartConfig.ino
diff --git a/libraries/WiFi/examples/WiFiTelnetToSerial/WiFiTelnetToSerial.ino b/libraries/WiFi/examples/WiFi/WiFiTelnetToSerial/WiFiTelnetToSerial.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFiTelnetToSerial/WiFiTelnetToSerial.ino
rename to libraries/WiFi/examples/WiFi/WiFiTelnetToSerial/WiFiTelnetToSerial.ino
diff --git a/libraries/WiFi/examples/WiFiUDPClient/WiFiUDPClient.ino b/libraries/WiFi/examples/WiFi/WiFiUDPClient/WiFiUDPClient.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFiUDPClient/WiFiUDPClient.ino
rename to libraries/WiFi/examples/WiFi/WiFiUDPClient/WiFiUDPClient.ino
diff --git a/libraries/WiFi/examples/WiFiUDPClient/udp_server.py b/libraries/WiFi/examples/WiFi/WiFiUDPClient/udp_server.py
similarity index 100%
rename from libraries/WiFi/examples/WiFiUDPClient/udp_server.py
rename to libraries/WiFi/examples/WiFi/WiFiUDPClient/udp_server.py
diff --git a/libraries/WiFi/examples/WiFiUDPClient/udp_server.rb b/libraries/WiFi/examples/WiFi/WiFiUDPClient/udp_server.rb
similarity index 100%
rename from libraries/WiFi/examples/WiFiUDPClient/udp_server.rb
rename to libraries/WiFi/examples/WiFi/WiFiUDPClient/udp_server.rb
diff --git a/libraries/WiFi/library.properties b/libraries/WiFi/library.properties
index d2c878c7015..8aa3af746df 100644
--- a/libraries/WiFi/library.properties
+++ b/libraries/WiFi/library.properties
@@ -1,4 +1,4 @@
-name=WiFi
+name=WiFi and Ethernet
 version=2.0.0
 author=Hristo Gochkov
 maintainer=Hristo Gochkov <hristo@espressif.com>

From e450faf96761a5b4c540b15cdb1a9828c0a1aaab Mon Sep 17 00:00:00 2001
From: "pedro.minatel" <pedro.minatel@espressif.com>
Date: Tue, 2 Nov 2021 12:25:50 +0000
Subject: [PATCH 2/5] examples: Change on CI scripts to include new folder

---
 .github/scripts/on-push.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/scripts/on-push.sh b/.github/scripts/on-push.sh
index e7d0d0af047..67830c7d27c 100755
--- a/.github/scripts/on-push.sh
+++ b/.github/scripts/on-push.sh
@@ -44,7 +44,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
 	elif [ "$OS_IS_MACOS" == "1" ]; then
-		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
+		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \
@@ -61,7 +61,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then
     TARGET="esp32s2"
 	FQBN="espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app"
 	if [ "$OS_IS_WINDOWS" == "1" ]; then
-		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
+		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
 	elif [ "$OS_IS_MACOS" == "1" ]; then
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
@@ -74,10 +74,10 @@ if [ "$BUILD_PIO" -eq 0 ]; then
     TARGET="esp32c3"
 	FQBN="espressif:esp32:esp32c3:PartitionScheme=huge_app"
 	if [ "$OS_IS_WINDOWS" == "1" ]; then
-		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
+		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
 	elif [ "$OS_IS_MACOS" == "1" ]; then
-		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
+		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
 	else
 		build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
@@ -87,7 +87,7 @@ else
 	# PlatformIO ESP32 Test
 	BOARD="esp32dev"
     OPTIONS="board_build.partitions = huge_app.csv"
-	build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
+	build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
 	build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino" && \
 	build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino" && \
 	build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \
@@ -95,10 +95,10 @@ else
 	
 	# PlatformIO ESP32 Test
     # OPTIONS="board_build.mcu = esp32s2"
-    # build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
+    # build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
     # build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
 
-    python -m platformio ci --board "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.mcu = esp32s2" --project-option="board_build.partitions = huge_app.csv"
+    python -m platformio ci --board "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient" --project-option="board_build.mcu = esp32s2" --project-option="board_build.partitions = huge_app.csv"
     
 	#build_pio_sketches "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries"
 fi

From b33c17caee4f998fb0b4f0b64b2506a39fdfac74 Mon Sep 17 00:00:00 2001
From: Pedro Minatel <pminatel@gmail.com>
Date: Tue, 2 Nov 2021 23:35:37 +0000
Subject: [PATCH 3/5] Library name reverted to WiFi

---
 libraries/WiFi/library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/WiFi/library.properties b/libraries/WiFi/library.properties
index 8aa3af746df..d2c878c7015 100644
--- a/libraries/WiFi/library.properties
+++ b/libraries/WiFi/library.properties
@@ -1,4 +1,4 @@
-name=WiFi and Ethernet
+name=WiFi
 version=2.0.0
 author=Hristo Gochkov
 maintainer=Hristo Gochkov <hristo@espressif.com>

From c58c2a2e1e6b3aad1eca8cc5ed83df7c4b6ea128 Mon Sep 17 00:00:00 2001
From: "pedro.minatel" <pedro.minatel@espressif.com>
Date: Thu, 4 Nov 2021 12:25:35 +0000
Subject: [PATCH 4/5] examples: WiFi and Ethernet examples organization in a
 new folder

---
 .github/scripts/on-push.sh                         | 14 +++++++-------
 .../examples}/ETH_LAN8720/.skip.esp32s2            |  0
 .../examples}/ETH_LAN8720/ETH_LAN8720.ino          |  0
 .../examples}/ETH_TLK110/.skip.esp32s2             |  0
 .../examples}/ETH_TLK110/ETH_TLK110.ino            |  0
 libraries/Ethernet/library.properties              |  9 +++++++++
 libraries/Ethernet/src/dummy.h                     |  2 ++
 .../{WiFi => }/FTM/FTM_Initiator/FTM_Initiator.ino |  0
 .../{WiFi => }/FTM/FTM_Initiator/README.md         |  0
 .../{WiFi => }/FTM/FTM_Responder/FTM_Responder.ino |  0
 .../{WiFi => }/FTM/FTM_Responder/README.md         |  0
 .../SimpleWiFiServer/SimpleWiFiServer.ino          |  0
 libraries/WiFi/examples/{WiFi => }/WPS/README.md   |  0
 libraries/WiFi/examples/{WiFi => }/WPS/WPS.ino     |  0
 .../{WiFi => }/WiFiAccessPoint/WiFiAccessPoint.ino |  0
 .../{WiFi => }/WiFiBlueToothSwitch/.skip.esp32s2   |  0
 .../WiFiBlueToothSwitch/WiFiBlueToothSwitch.ino    |  0
 .../examples/{WiFi => }/WiFiClient/WiFiClient.ino  |  0
 .../{WiFi => }/WiFiClientBasic/WiFiClientBasic.ino |  0
 .../{WiFi => }/WiFiClientEnterprise/README.md      |  0
 .../WiFiClientEnterprise/WiFiClientEnterprise.ino  |  0
 .../WiFiClientEvents/WiFiClientEvents.ino          |  0
 .../WiFiClientStaticIP/WiFiClientStaticIP.ino      |  0
 .../WiFi/examples/{WiFi => }/WiFiIPv6/WiFiIPv6.ino |  0
 .../examples/{WiFi => }/WiFiMulti/WiFiMulti.ino    |  0
 .../WiFi/examples/{WiFi => }/WiFiScan/README.md    |  0
 .../WiFi/examples/{WiFi => }/WiFiScan/WiFiScan.ino |  0
 .../{WiFi => }/WiFiSmartConfig/WiFiSmartConfig.ino |  0
 .../WiFiTelnetToSerial/WiFiTelnetToSerial.ino      |  0
 .../{WiFi => }/WiFiUDPClient/WiFiUDPClient.ino     |  0
 .../{WiFi => }/WiFiUDPClient/udp_server.py         |  0
 .../{WiFi => }/WiFiUDPClient/udp_server.rb         |  0
 32 files changed, 18 insertions(+), 7 deletions(-)
 rename libraries/{WiFi/examples/Ethernet => Ethernet/examples}/ETH_LAN8720/.skip.esp32s2 (100%)
 rename libraries/{WiFi/examples/Ethernet => Ethernet/examples}/ETH_LAN8720/ETH_LAN8720.ino (100%)
 rename libraries/{WiFi/examples/Ethernet => Ethernet/examples}/ETH_TLK110/.skip.esp32s2 (100%)
 rename libraries/{WiFi/examples/Ethernet => Ethernet/examples}/ETH_TLK110/ETH_TLK110.ino (100%)
 create mode 100644 libraries/Ethernet/library.properties
 create mode 100644 libraries/Ethernet/src/dummy.h
 rename libraries/WiFi/examples/{WiFi => }/FTM/FTM_Initiator/FTM_Initiator.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/FTM/FTM_Initiator/README.md (100%)
 rename libraries/WiFi/examples/{WiFi => }/FTM/FTM_Responder/FTM_Responder.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/FTM/FTM_Responder/README.md (100%)
 rename libraries/WiFi/examples/{WiFi => }/SimpleWiFiServer/SimpleWiFiServer.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WPS/README.md (100%)
 rename libraries/WiFi/examples/{WiFi => }/WPS/WPS.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiAccessPoint/WiFiAccessPoint.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiBlueToothSwitch/.skip.esp32s2 (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiBlueToothSwitch/WiFiBlueToothSwitch.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiClient/WiFiClient.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiClientBasic/WiFiClientBasic.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiClientEnterprise/README.md (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiClientEnterprise/WiFiClientEnterprise.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiClientEvents/WiFiClientEvents.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiClientStaticIP/WiFiClientStaticIP.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiIPv6/WiFiIPv6.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiMulti/WiFiMulti.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiScan/README.md (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiScan/WiFiScan.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiSmartConfig/WiFiSmartConfig.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiTelnetToSerial/WiFiTelnetToSerial.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiUDPClient/WiFiUDPClient.ino (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiUDPClient/udp_server.py (100%)
 rename libraries/WiFi/examples/{WiFi => }/WiFiUDPClient/udp_server.rb (100%)

diff --git a/.github/scripts/on-push.sh b/.github/scripts/on-push.sh
index 67830c7d27c..e7d0d0af047 100755
--- a/.github/scripts/on-push.sh
+++ b/.github/scripts/on-push.sh
@@ -44,7 +44,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
 	elif [ "$OS_IS_MACOS" == "1" ]; then
-		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
+		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \
@@ -61,7 +61,7 @@ if [ "$BUILD_PIO" -eq 0 ]; then
     TARGET="esp32s2"
 	FQBN="espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app"
 	if [ "$OS_IS_WINDOWS" == "1" ]; then
-		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
+		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
 	elif [ "$OS_IS_MACOS" == "1" ]; then
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
@@ -74,10 +74,10 @@ if [ "$BUILD_PIO" -eq 0 ]; then
     TARGET="esp32c3"
 	FQBN="espressif:esp32:esp32c3:PartitionScheme=huge_app"
 	if [ "$OS_IS_WINDOWS" == "1" ]; then
-		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
+		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
 	elif [ "$OS_IS_MACOS" == "1" ]; then
-		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
+		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
 		build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
 	else
 		build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
@@ -87,7 +87,7 @@ else
 	# PlatformIO ESP32 Test
 	BOARD="esp32dev"
     OPTIONS="board_build.partitions = huge_app.csv"
-	build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
+	build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
 	build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino" && \
 	build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino" && \
 	build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \
@@ -95,10 +95,10 @@ else
 	
 	# PlatformIO ESP32 Test
     # OPTIONS="board_build.mcu = esp32s2"
-    # build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino" && \
+    # build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
     # build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
 
-    python -m platformio ci --board "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFi/WiFiClient" --project-option="board_build.mcu = esp32s2" --project-option="board_build.partitions = huge_app.csv"
+    python -m platformio ci --board "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.mcu = esp32s2" --project-option="board_build.partitions = huge_app.csv"
     
 	#build_pio_sketches "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries"
 fi
diff --git a/libraries/WiFi/examples/Ethernet/ETH_LAN8720/.skip.esp32s2 b/libraries/Ethernet/examples/ETH_LAN8720/.skip.esp32s2
similarity index 100%
rename from libraries/WiFi/examples/Ethernet/ETH_LAN8720/.skip.esp32s2
rename to libraries/Ethernet/examples/ETH_LAN8720/.skip.esp32s2
diff --git a/libraries/WiFi/examples/Ethernet/ETH_LAN8720/ETH_LAN8720.ino b/libraries/Ethernet/examples/ETH_LAN8720/ETH_LAN8720.ino
similarity index 100%
rename from libraries/WiFi/examples/Ethernet/ETH_LAN8720/ETH_LAN8720.ino
rename to libraries/Ethernet/examples/ETH_LAN8720/ETH_LAN8720.ino
diff --git a/libraries/WiFi/examples/Ethernet/ETH_TLK110/.skip.esp32s2 b/libraries/Ethernet/examples/ETH_TLK110/.skip.esp32s2
similarity index 100%
rename from libraries/WiFi/examples/Ethernet/ETH_TLK110/.skip.esp32s2
rename to libraries/Ethernet/examples/ETH_TLK110/.skip.esp32s2
diff --git a/libraries/WiFi/examples/Ethernet/ETH_TLK110/ETH_TLK110.ino b/libraries/Ethernet/examples/ETH_TLK110/ETH_TLK110.ino
similarity index 100%
rename from libraries/WiFi/examples/Ethernet/ETH_TLK110/ETH_TLK110.ino
rename to libraries/Ethernet/examples/ETH_TLK110/ETH_TLK110.ino
diff --git a/libraries/Ethernet/library.properties b/libraries/Ethernet/library.properties
new file mode 100644
index 00000000000..c32adf1a7ea
--- /dev/null
+++ b/libraries/Ethernet/library.properties
@@ -0,0 +1,9 @@
+name=Ethernet
+version=2.0.0
+author=Hristo Gochkov
+maintainer=Hristo Gochkov <hristo@espressif.com>
+sentence=Enables network connection (local and Internet) using the ESP32 Ethernet.
+paragraph=With this library you can instantiate Servers, Clients and send/receive UDP packets through Ethernet. The IP address can be assigned statically or through a DHCP. The library can also manage DNS.
+category=Communication
+url=
+architectures=esp32
diff --git a/libraries/Ethernet/src/dummy.h b/libraries/Ethernet/src/dummy.h
new file mode 100644
index 00000000000..d8a140eda61
--- /dev/null
+++ b/libraries/Ethernet/src/dummy.h
@@ -0,0 +1,2 @@
+// This file is here only to silence warnings from Arduino IDE
+// Currently IDE doesn't support no-code libraries, like this collection of example sketches.
diff --git a/libraries/WiFi/examples/WiFi/FTM/FTM_Initiator/FTM_Initiator.ino b/libraries/WiFi/examples/FTM/FTM_Initiator/FTM_Initiator.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/FTM/FTM_Initiator/FTM_Initiator.ino
rename to libraries/WiFi/examples/FTM/FTM_Initiator/FTM_Initiator.ino
diff --git a/libraries/WiFi/examples/WiFi/FTM/FTM_Initiator/README.md b/libraries/WiFi/examples/FTM/FTM_Initiator/README.md
similarity index 100%
rename from libraries/WiFi/examples/WiFi/FTM/FTM_Initiator/README.md
rename to libraries/WiFi/examples/FTM/FTM_Initiator/README.md
diff --git a/libraries/WiFi/examples/WiFi/FTM/FTM_Responder/FTM_Responder.ino b/libraries/WiFi/examples/FTM/FTM_Responder/FTM_Responder.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/FTM/FTM_Responder/FTM_Responder.ino
rename to libraries/WiFi/examples/FTM/FTM_Responder/FTM_Responder.ino
diff --git a/libraries/WiFi/examples/WiFi/FTM/FTM_Responder/README.md b/libraries/WiFi/examples/FTM/FTM_Responder/README.md
similarity index 100%
rename from libraries/WiFi/examples/WiFi/FTM/FTM_Responder/README.md
rename to libraries/WiFi/examples/FTM/FTM_Responder/README.md
diff --git a/libraries/WiFi/examples/WiFi/SimpleWiFiServer/SimpleWiFiServer.ino b/libraries/WiFi/examples/SimpleWiFiServer/SimpleWiFiServer.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/SimpleWiFiServer/SimpleWiFiServer.ino
rename to libraries/WiFi/examples/SimpleWiFiServer/SimpleWiFiServer.ino
diff --git a/libraries/WiFi/examples/WiFi/WPS/README.md b/libraries/WiFi/examples/WPS/README.md
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WPS/README.md
rename to libraries/WiFi/examples/WPS/README.md
diff --git a/libraries/WiFi/examples/WiFi/WPS/WPS.ino b/libraries/WiFi/examples/WPS/WPS.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WPS/WPS.ino
rename to libraries/WiFi/examples/WPS/WPS.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiAccessPoint/WiFiAccessPoint.ino b/libraries/WiFi/examples/WiFiAccessPoint/WiFiAccessPoint.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiAccessPoint/WiFiAccessPoint.ino
rename to libraries/WiFi/examples/WiFiAccessPoint/WiFiAccessPoint.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiBlueToothSwitch/.skip.esp32s2 b/libraries/WiFi/examples/WiFiBlueToothSwitch/.skip.esp32s2
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiBlueToothSwitch/.skip.esp32s2
rename to libraries/WiFi/examples/WiFiBlueToothSwitch/.skip.esp32s2
diff --git a/libraries/WiFi/examples/WiFi/WiFiBlueToothSwitch/WiFiBlueToothSwitch.ino b/libraries/WiFi/examples/WiFiBlueToothSwitch/WiFiBlueToothSwitch.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiBlueToothSwitch/WiFiBlueToothSwitch.ino
rename to libraries/WiFi/examples/WiFiBlueToothSwitch/WiFiBlueToothSwitch.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino b/libraries/WiFi/examples/WiFiClient/WiFiClient.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiClient/WiFiClient.ino
rename to libraries/WiFi/examples/WiFiClient/WiFiClient.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiClientBasic/WiFiClientBasic.ino b/libraries/WiFi/examples/WiFiClientBasic/WiFiClientBasic.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiClientBasic/WiFiClientBasic.ino
rename to libraries/WiFi/examples/WiFiClientBasic/WiFiClientBasic.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiClientEnterprise/README.md b/libraries/WiFi/examples/WiFiClientEnterprise/README.md
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiClientEnterprise/README.md
rename to libraries/WiFi/examples/WiFiClientEnterprise/README.md
diff --git a/libraries/WiFi/examples/WiFi/WiFiClientEnterprise/WiFiClientEnterprise.ino b/libraries/WiFi/examples/WiFiClientEnterprise/WiFiClientEnterprise.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiClientEnterprise/WiFiClientEnterprise.ino
rename to libraries/WiFi/examples/WiFiClientEnterprise/WiFiClientEnterprise.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiClientEvents/WiFiClientEvents.ino b/libraries/WiFi/examples/WiFiClientEvents/WiFiClientEvents.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiClientEvents/WiFiClientEvents.ino
rename to libraries/WiFi/examples/WiFiClientEvents/WiFiClientEvents.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiClientStaticIP/WiFiClientStaticIP.ino b/libraries/WiFi/examples/WiFiClientStaticIP/WiFiClientStaticIP.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiClientStaticIP/WiFiClientStaticIP.ino
rename to libraries/WiFi/examples/WiFiClientStaticIP/WiFiClientStaticIP.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiIPv6/WiFiIPv6.ino b/libraries/WiFi/examples/WiFiIPv6/WiFiIPv6.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiIPv6/WiFiIPv6.ino
rename to libraries/WiFi/examples/WiFiIPv6/WiFiIPv6.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiMulti/WiFiMulti.ino b/libraries/WiFi/examples/WiFiMulti/WiFiMulti.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiMulti/WiFiMulti.ino
rename to libraries/WiFi/examples/WiFiMulti/WiFiMulti.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiScan/README.md b/libraries/WiFi/examples/WiFiScan/README.md
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiScan/README.md
rename to libraries/WiFi/examples/WiFiScan/README.md
diff --git a/libraries/WiFi/examples/WiFi/WiFiScan/WiFiScan.ino b/libraries/WiFi/examples/WiFiScan/WiFiScan.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiScan/WiFiScan.ino
rename to libraries/WiFi/examples/WiFiScan/WiFiScan.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiSmartConfig/WiFiSmartConfig.ino b/libraries/WiFi/examples/WiFiSmartConfig/WiFiSmartConfig.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiSmartConfig/WiFiSmartConfig.ino
rename to libraries/WiFi/examples/WiFiSmartConfig/WiFiSmartConfig.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiTelnetToSerial/WiFiTelnetToSerial.ino b/libraries/WiFi/examples/WiFiTelnetToSerial/WiFiTelnetToSerial.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiTelnetToSerial/WiFiTelnetToSerial.ino
rename to libraries/WiFi/examples/WiFiTelnetToSerial/WiFiTelnetToSerial.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiUDPClient/WiFiUDPClient.ino b/libraries/WiFi/examples/WiFiUDPClient/WiFiUDPClient.ino
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiUDPClient/WiFiUDPClient.ino
rename to libraries/WiFi/examples/WiFiUDPClient/WiFiUDPClient.ino
diff --git a/libraries/WiFi/examples/WiFi/WiFiUDPClient/udp_server.py b/libraries/WiFi/examples/WiFiUDPClient/udp_server.py
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiUDPClient/udp_server.py
rename to libraries/WiFi/examples/WiFiUDPClient/udp_server.py
diff --git a/libraries/WiFi/examples/WiFi/WiFiUDPClient/udp_server.rb b/libraries/WiFi/examples/WiFiUDPClient/udp_server.rb
similarity index 100%
rename from libraries/WiFi/examples/WiFi/WiFiUDPClient/udp_server.rb
rename to libraries/WiFi/examples/WiFiUDPClient/udp_server.rb

From 609d7ceecd0a11ad3f38f151cfc97c2da98bb226 Mon Sep 17 00:00:00 2001
From: "pedro.minatel" <pedro.minatel@espressif.com>
Date: Thu, 4 Nov 2021 13:43:27 +0100
Subject: [PATCH 5/5] examples: Eth files moved from WiFi to Ethernet lib and
 CMakeLists updated

---
 CMakeLists.txt                           | 2 +-
 libraries/{WiFi => Ethernet}/src/ETH.cpp | 0
 libraries/{WiFi => Ethernet}/src/ETH.h   | 0
 libraries/Ethernet/src/dummy.h           | 2 --
 4 files changed, 1 insertion(+), 3 deletions(-)
 rename libraries/{WiFi => Ethernet}/src/ETH.cpp (100%)
 rename libraries/{WiFi => Ethernet}/src/ETH.h (100%)
 delete mode 100644 libraries/Ethernet/src/dummy.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d70ac76938d..895ac421315 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,7 @@ set(LIBRARY_SRCS
   libraries/DNSServer/src/DNSServer.cpp
   libraries/EEPROM/src/EEPROM.cpp
   libraries/ESPmDNS/src/ESPmDNS.cpp
+  libraries/Ethernet/src/ETH.cpp
   libraries/FFat/src/FFat.cpp
   libraries/FS/src/FS.cpp
   libraries/FS/src/vfs_api.cpp
@@ -91,7 +92,6 @@ set(LIBRARY_SRCS
   libraries/WebServer/src/detail/mimetable.cpp
   libraries/WiFiClientSecure/src/ssl_client.cpp
   libraries/WiFiClientSecure/src/WiFiClientSecure.cpp
-  libraries/WiFi/src/ETH.cpp
   libraries/WiFi/src/WiFiAP.cpp
   libraries/WiFi/src/WiFiClient.cpp
   libraries/WiFi/src/WiFi.cpp
diff --git a/libraries/WiFi/src/ETH.cpp b/libraries/Ethernet/src/ETH.cpp
similarity index 100%
rename from libraries/WiFi/src/ETH.cpp
rename to libraries/Ethernet/src/ETH.cpp
diff --git a/libraries/WiFi/src/ETH.h b/libraries/Ethernet/src/ETH.h
similarity index 100%
rename from libraries/WiFi/src/ETH.h
rename to libraries/Ethernet/src/ETH.h
diff --git a/libraries/Ethernet/src/dummy.h b/libraries/Ethernet/src/dummy.h
deleted file mode 100644
index d8a140eda61..00000000000
--- a/libraries/Ethernet/src/dummy.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// This file is here only to silence warnings from Arduino IDE
-// Currently IDE doesn't support no-code libraries, like this collection of example sketches.