diff --git a/examples/README.md b/examples/README.md
index fcd3826f78..191b5286b1 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -15,6 +15,7 @@ The examples are grouped into subdirectories by category. Each category director
 * `ethernet` Ethernet network examples.
 * `get-started` Simple examples with minimal functionality. Good start point for beginners.
 * `mesh` Wi-Fi Mesh examples.
+* `network` Examples related to general network environment, test & analysis.
 * `openthread` OpenThread examples.
 * `peripherals` Examples showing driver functionality for the various onboard ESP32 peripherals.
 * `protocols` Examples showing network protocol interactions.
diff --git a/examples/network/README.md b/examples/network/README.md
new file mode 100644
index 0000000000..174ac4b60a
--- /dev/null
+++ b/examples/network/README.md
@@ -0,0 +1,5 @@
+# Network Examples
+
+Contains examples related to general network environment, test & analysis.
+
+See the [README.md](../README.md) file in the upper level [examples](../) directory for more information about examples.
diff --git a/examples/system/network_tests/CMakeLists.txt b/examples/network/network_tests/CMakeLists.txt
similarity index 100%
rename from examples/system/network_tests/CMakeLists.txt
rename to examples/network/network_tests/CMakeLists.txt
diff --git a/examples/system/network_tests/Makefile b/examples/network/network_tests/Makefile
similarity index 100%
rename from examples/system/network_tests/Makefile
rename to examples/network/network_tests/Makefile
diff --git a/examples/system/network_tests/README.md b/examples/network/network_tests/README.md
similarity index 100%
rename from examples/system/network_tests/README.md
rename to examples/network/network_tests/README.md
diff --git a/examples/system/network_tests/main/CMakeLists.txt b/examples/network/network_tests/main/CMakeLists.txt
similarity index 100%
rename from examples/system/network_tests/main/CMakeLists.txt
rename to examples/network/network_tests/main/CMakeLists.txt
diff --git a/examples/system/network_tests/main/component.mk b/examples/network/network_tests/main/component.mk
similarity index 100%
rename from examples/system/network_tests/main/component.mk
rename to examples/network/network_tests/main/component.mk
diff --git a/examples/system/network_tests/main/net_suite.c b/examples/network/network_tests/main/net_suite.c
similarity index 100%
rename from examples/system/network_tests/main/net_suite.c
rename to examples/network/network_tests/main/net_suite.c
diff --git a/examples/system/network_tests/main/stdinout.c b/examples/network/network_tests/main/stdinout.c
similarity index 100%
rename from examples/system/network_tests/main/stdinout.c
rename to examples/network/network_tests/main/stdinout.c
diff --git a/examples/system/network_tests/main/stdinout.h b/examples/network/network_tests/main/stdinout.h
similarity index 100%
rename from examples/system/network_tests/main/stdinout.h
rename to examples/network/network_tests/main/stdinout.h
diff --git a/examples/wifi/simple_sniffer/CMakeLists.txt b/examples/network/simple_sniffer/CMakeLists.txt
similarity index 100%
rename from examples/wifi/simple_sniffer/CMakeLists.txt
rename to examples/network/simple_sniffer/CMakeLists.txt
diff --git a/examples/wifi/simple_sniffer/Makefile b/examples/network/simple_sniffer/Makefile
similarity index 100%
rename from examples/wifi/simple_sniffer/Makefile
rename to examples/network/simple_sniffer/Makefile
diff --git a/examples/wifi/simple_sniffer/README.md b/examples/network/simple_sniffer/README.md
similarity index 100%
rename from examples/wifi/simple_sniffer/README.md
rename to examples/network/simple_sniffer/README.md
diff --git a/examples/wifi/simple_sniffer/components/pcap/CMakeLists.txt b/examples/network/simple_sniffer/components/pcap/CMakeLists.txt
similarity index 100%
rename from examples/wifi/simple_sniffer/components/pcap/CMakeLists.txt
rename to examples/network/simple_sniffer/components/pcap/CMakeLists.txt
diff --git a/examples/wifi/simple_sniffer/components/pcap/component.mk b/examples/network/simple_sniffer/components/pcap/component.mk
similarity index 100%
rename from examples/wifi/simple_sniffer/components/pcap/component.mk
rename to examples/network/simple_sniffer/components/pcap/component.mk
diff --git a/examples/wifi/simple_sniffer/components/pcap/pcap.c b/examples/network/simple_sniffer/components/pcap/pcap.c
similarity index 100%
rename from examples/wifi/simple_sniffer/components/pcap/pcap.c
rename to examples/network/simple_sniffer/components/pcap/pcap.c
diff --git a/examples/wifi/simple_sniffer/components/pcap/pcap.h b/examples/network/simple_sniffer/components/pcap/pcap.h
similarity index 100%
rename from examples/wifi/simple_sniffer/components/pcap/pcap.h
rename to examples/network/simple_sniffer/components/pcap/pcap.h
diff --git a/examples/wifi/simple_sniffer/main/CMakeLists.txt b/examples/network/simple_sniffer/main/CMakeLists.txt
similarity index 100%
rename from examples/wifi/simple_sniffer/main/CMakeLists.txt
rename to examples/network/simple_sniffer/main/CMakeLists.txt
diff --git a/examples/wifi/simple_sniffer/main/Kconfig.projbuild b/examples/network/simple_sniffer/main/Kconfig.projbuild
similarity index 100%
rename from examples/wifi/simple_sniffer/main/Kconfig.projbuild
rename to examples/network/simple_sniffer/main/Kconfig.projbuild
diff --git a/examples/wifi/simple_sniffer/main/cmd_sniffer.c b/examples/network/simple_sniffer/main/cmd_sniffer.c
similarity index 100%
rename from examples/wifi/simple_sniffer/main/cmd_sniffer.c
rename to examples/network/simple_sniffer/main/cmd_sniffer.c
diff --git a/examples/wifi/simple_sniffer/main/cmd_sniffer.h b/examples/network/simple_sniffer/main/cmd_sniffer.h
similarity index 100%
rename from examples/wifi/simple_sniffer/main/cmd_sniffer.h
rename to examples/network/simple_sniffer/main/cmd_sniffer.h
diff --git a/examples/wifi/simple_sniffer/main/component.mk b/examples/network/simple_sniffer/main/component.mk
similarity index 100%
rename from examples/wifi/simple_sniffer/main/component.mk
rename to examples/network/simple_sniffer/main/component.mk
diff --git a/examples/wifi/simple_sniffer/main/simple_sniffer_example_main.c b/examples/network/simple_sniffer/main/simple_sniffer_example_main.c
similarity index 100%
rename from examples/wifi/simple_sniffer/main/simple_sniffer_example_main.c
rename to examples/network/simple_sniffer/main/simple_sniffer_example_main.c
diff --git a/examples/wifi/simple_sniffer/partitions_example.csv b/examples/network/simple_sniffer/partitions_example.csv
similarity index 100%
rename from examples/wifi/simple_sniffer/partitions_example.csv
rename to examples/network/simple_sniffer/partitions_example.csv
diff --git a/examples/wifi/simple_sniffer/sdkconfig.defaults b/examples/network/simple_sniffer/sdkconfig.defaults
similarity index 100%
rename from examples/wifi/simple_sniffer/sdkconfig.defaults
rename to examples/network/simple_sniffer/sdkconfig.defaults
diff --git a/examples/wifi/simple_sniffer/sniffer-esp32-pcap.png b/examples/network/simple_sniffer/sniffer-esp32-pcap.png
similarity index 100%
rename from examples/wifi/simple_sniffer/sniffer-esp32-pcap.png
rename to examples/network/simple_sniffer/sniffer-esp32-pcap.png
diff --git a/examples/wifi/README.md b/examples/wifi/README.md
index d425c186de..f40ecfa8b2 100644
--- a/examples/wifi/README.md
+++ b/examples/wifi/README.md
@@ -14,7 +14,6 @@ The examples are grouped into sub-directories by category. Each category directo
 * `power_save` contains a how to use power save mode of Wi-Fi.
 * `roaming` contains a example using 802.11k and 802.11v APIs.
 * `scan` shows how to scan for all the available APs.
-* `simple_sniffer` demonstrates basic usage of WiFi sniffer mode by saving packets into SD card with pcap format.
 * `smart_config` shows how ESP connects to a target AP with ESPTOUCH.
 * `wifi_easy_connect` shows how to configure an ESP device as an enrollee using Device Provisioning Protocol (DPP).
 * `wpa2_enterprise` connects to AP with WPA2 enterprise encryption.