diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index f1a983af..e5e9fb2d 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -300,11 +300,8 @@ jobs:
     - uses: actions/checkout@v4
       with: { fetch-depth: 2 }
     - run: echo # nothing specific to install or do
-    - run: make -C examples/arduino arduino-xiao
-# TODO():    - run: make -C examples/arduino arduino-esp32
-# TODO():    - run: make -C examples/arduino arduino-teensy41
-#   - run: make -C examples/arduino arduino-nano
-    - run: make -C examples/arduino clean
+    - run: make -C test/arduino
+    - run: make -C test/arduino cleanall
 
 
 #  wizard_examples:
diff --git a/examples/arduino/Makefile b/examples/arduino/Makefile
deleted file mode 100644
index bebf4498..00000000
--- a/examples/arduino/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-
-all:
-example:
-	true
-
-arduino: ENV = -v $(CWD):/root
-arduino:
-	curl -sL http://downloads.arduino.cc/arduino-1.8.19-linux64.tar.xz | unxz | tar -xf -
-	mv arduino-* $@
-
-arduino-xiao-board:
-	./arduino/arduino --pref "boardsmanager.additional.urls=https://files.seeedstudio.com/arduino/package_seeeduino_boards_index.json" --save-prefs
-	./arduino/arduino --pref "compiler.warning_level=all" --save-prefs
-	./arduino/arduino --install-boards Seeeduino:samd
-
-arduino-xiao: arduino arduino-xiao-board
-	cd sim800-mqtt && ../arduino/arduino --verbose --verify --board Seeeduino:samd:seeed_XIAO_m0 sim800-mqtt.ino
-	cd w5500-http && ../arduino/arduino --verbose --verify --board Seeeduino:samd:seeed_XIAO_m0 w5500-http.ino
-	cd w5500-mqtt && ../arduino/arduino --verbose --verify --board Seeeduino:samd:seeed_XIAO_m0 w5500-mqtt.ino
-
-arduino-nano: arduino
-	cd w5500-http && ../arduino/arduino --pref compiler.cpp.extra_flags=-DMG_ENABLE_LOG=0 --verbose --verify --board arduino:avr:nano w5500-http.ino
-	cd w5500-mqtt && ../arduino/arduino --pref compiler.cpp.extra_flags=-DMG_ENABLE_LOG=0 --verbose --verify --board arduino:avr:nano w5500-mqtt.ino
-
-arduino-esp32: arduino
-#	cd esp32-http && ../arduino/arduino --verbose --verify --board  esp32-http.ino
-# 	esp32-mqtt
-
-arduino-teensy41: arduino
-#	cd teensy41-http && ../arduino/arduino --verbose --verify --board  teensy41-http.ino
-
-
-
-
-
-
-clean:
-	rm -rf arduino 
-
-cleanall: clean		#otherwise some parts of xiao-board installation will fail as already installed
-	rm -rf ~/.arduino15 ~/.oracle_jre_usage
diff --git a/examples/arduino/esp32-http/mongoose.c b/examples/arduino/esp32-http/mongoose.c
deleted file mode 120000
index 5e522bbc..00000000
--- a/examples/arduino/esp32-http/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../mongoose.c
\ No newline at end of file
diff --git a/examples/arduino/esp32-http/mongoose.h b/examples/arduino/esp32-http/mongoose.h
deleted file mode 120000
index ee4ac823..00000000
--- a/examples/arduino/esp32-http/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../mongoose.h
\ No newline at end of file
diff --git a/examples/arduino/esp32-mqtt/mongoose.c b/examples/arduino/esp32-mqtt/mongoose.c
deleted file mode 120000
index 5e522bbc..00000000
--- a/examples/arduino/esp32-mqtt/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../mongoose.c
\ No newline at end of file
diff --git a/examples/arduino/esp32-mqtt/mongoose.h b/examples/arduino/esp32-mqtt/mongoose.h
deleted file mode 120000
index ee4ac823..00000000
--- a/examples/arduino/esp32-mqtt/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../mongoose.h
\ No newline at end of file
diff --git a/examples/arduino/sim800-mqtt/mongoose.c b/examples/arduino/sim800-mqtt/mongoose.c
deleted file mode 120000
index 5e522bbc..00000000
--- a/examples/arduino/sim800-mqtt/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../mongoose.c
\ No newline at end of file
diff --git a/examples/arduino/sim800-mqtt/mongoose.h b/examples/arduino/sim800-mqtt/mongoose.h
deleted file mode 120000
index ee4ac823..00000000
--- a/examples/arduino/sim800-mqtt/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../mongoose.h
\ No newline at end of file
diff --git a/examples/arduino/teensy41-http/mongoose.c b/examples/arduino/teensy41-http/mongoose.c
deleted file mode 120000
index 5e522bbc..00000000
--- a/examples/arduino/teensy41-http/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../mongoose.c
\ No newline at end of file
diff --git a/examples/arduino/teensy41-http/mongoose.h b/examples/arduino/teensy41-http/mongoose.h
deleted file mode 120000
index ee4ac823..00000000
--- a/examples/arduino/teensy41-http/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../mongoose.h
\ No newline at end of file
diff --git a/examples/arduino/w5500-http/mongoose.c b/examples/arduino/w5500-http/mongoose.c
deleted file mode 120000
index 5e522bbc..00000000
--- a/examples/arduino/w5500-http/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../mongoose.c
\ No newline at end of file
diff --git a/examples/arduino/w5500-http/mongoose.h b/examples/arduino/w5500-http/mongoose.h
deleted file mode 120000
index ee4ac823..00000000
--- a/examples/arduino/w5500-http/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../mongoose.h
\ No newline at end of file
diff --git a/examples/arduino/w5500-mqtt/mongoose.c b/examples/arduino/w5500-mqtt/mongoose.c
deleted file mode 120000
index 5e522bbc..00000000
--- a/examples/arduino/w5500-mqtt/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../mongoose.c
\ No newline at end of file
diff --git a/examples/arduino/w5500-mqtt/mongoose.h b/examples/arduino/w5500-mqtt/mongoose.h
deleted file mode 120000
index ee4ac823..00000000
--- a/examples/arduino/w5500-mqtt/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../mongoose.h
\ No newline at end of file
diff --git a/test/arduino/Makefile b/test/arduino/Makefile
new file mode 100644
index 00000000..c011002c
--- /dev/null
+++ b/test/arduino/Makefile
@@ -0,0 +1,48 @@
+PROJECTS ?= arduino-xiao arduino-nano #arduino-esp32 arduino-teensy41
+ROOT ?= $(realpath $(CURDIR)/../..)
+ARD ?= $(realpath $(CURDIR))
+
+all: $(PROJECTS)
+	echo 
+
+arduino: ENV = -v $(CWD):/root
+arduino:
+	curl -sL http://downloads.arduino.cc/arduino-1.8.19-linux64.tar.xz | unxz | tar -xf -
+	mv arduino-* $@
+	./arduino/arduino --pref "compiler.warning_level=all" --save-prefs
+
+arduino-xiao-board:
+	./arduino/arduino --pref "boardsmanager.additional.urls=https://files.seeedstudio.com/arduino/package_seeeduino_boards_index.json" --save-prefs
+	./arduino/arduino --install-boards Seeeduino:samd
+
+#esp32-board:
+#	./arduino/arduino --pref "boardsmanager.additional.urls=https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json" --save-prefs
+#	./arduino/arduino --install-boards esp32:esp32
+#
+#teensy-board:
+#	./arduino/arduino --pref "boardsmanager.additional.urls=https://www.pjrc.com/teensy/package_teensy_index.json" --save-prefs
+#	./arduino/arduino --install-boards teensy:avr
+
+arduino-xiao: arduino arduino-xiao-board
+	cd $(ROOT)/tutorials/mqtt/mqtt-client/arduino/sim800 && $(ARD)/arduino/arduino --verbose --verify --board Seeeduino:samd:seeed_XIAO_m0 sim800-mqtt.ino
+	cd $(ROOT)/tutorials/http/http-server/arduino/w5500 &&  $(ARD)/arduino/arduino --verbose --verify --board Seeeduino:samd:seeed_XIAO_m0 w5500-http.ino
+	cd $(ROOT)/tutorials/mqtt/mqtt-client/arduino/w5500 &&  $(ARD)/arduino/arduino --verbose --verify --board Seeeduino:samd:seeed_XIAO_m0 w5500-mqtt.ino
+
+arduino-nano: arduino
+	cd $(ROOT)/tutorials/http/http-server/arduino/w5500 && $(ARD)/arduino/arduino --pref compiler.cpp.extra_flags=-DMG_ENABLE_LOG=0 --verbose --verify --board arduino:avr:nano w5500-http.ino
+	cd $(ROOT)/tutorials/mqtt/mqtt-client/arduino/w5500 && $(ARD)/arduino/arduino --pref compiler.cpp.extra_flags=-DMG_ENABLE_LOG=0 --verbose --verify --board arduino:avr:nano w5500-mqtt.ino
+
+#arduino-esp32: arduino esp32-board
+#	cd $(ROOT)/tutorials/http/http-server/arduino/esp32 && $(ARD)/arduino/arduino --verbose --verify --board esp32-http.ino
+#	cd $(ROOT)/tutorials/mqtt/mqtt-client/arduino/esp32 && $(ARD)/arduino/arduino --verbose --verify --board esp32-mqtt.ino
+#
+#arduino-teensy41: arduino teensy-board
+#	cd $(ROOT)/tutorials/http/http-server/arduino/teensy41 && $(ARD)/arduino/arduino --verbose --verify --board teensy41-http.ino
+
+
+
+clean:
+	rm -rf arduino 
+
+cleanall: clean		#otherwise some parts of xiao-board installation will fail as already installed
+	rm -rf ~/.arduino* ~/.oracle_jre_usage
diff --git a/examples/arduino/esp32-http/esp32-http.ino b/tutorials/http/http-server/arduino/esp32/esp32-http.ino
similarity index 100%
rename from examples/arduino/esp32-http/esp32-http.ino
rename to tutorials/http/http-server/arduino/esp32/esp32-http.ino
diff --git a/tutorials/http/http-server/arduino/esp32/mongoose.c b/tutorials/http/http-server/arduino/esp32/mongoose.c
new file mode 120000
index 00000000..fe5764e5
--- /dev/null
+++ b/tutorials/http/http-server/arduino/esp32/mongoose.c
@@ -0,0 +1 @@
+../../../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/http/http-server/arduino/esp32/mongoose.h b/tutorials/http/http-server/arduino/esp32/mongoose.h
new file mode 120000
index 00000000..4cd6a2b4
--- /dev/null
+++ b/tutorials/http/http-server/arduino/esp32/mongoose.h
@@ -0,0 +1 @@
+../../../../../mongoose.h
\ No newline at end of file
diff --git a/examples/arduino/esp32-http/mongoose_config.h b/tutorials/http/http-server/arduino/esp32/mongoose_config.h
similarity index 100%
rename from examples/arduino/esp32-http/mongoose_config.h
rename to tutorials/http/http-server/arduino/esp32/mongoose_config.h
diff --git a/tutorials/http/http-server/arduino/teensy41/mongoose.c b/tutorials/http/http-server/arduino/teensy41/mongoose.c
new file mode 120000
index 00000000..fe5764e5
--- /dev/null
+++ b/tutorials/http/http-server/arduino/teensy41/mongoose.c
@@ -0,0 +1 @@
+../../../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/http/http-server/arduino/teensy41/mongoose.h b/tutorials/http/http-server/arduino/teensy41/mongoose.h
new file mode 120000
index 00000000..4cd6a2b4
--- /dev/null
+++ b/tutorials/http/http-server/arduino/teensy41/mongoose.h
@@ -0,0 +1 @@
+../../../../../mongoose.h
\ No newline at end of file
diff --git a/examples/arduino/teensy41-http/mongoose_config.h b/tutorials/http/http-server/arduino/teensy41/mongoose_config.h
similarity index 100%
rename from examples/arduino/teensy41-http/mongoose_config.h
rename to tutorials/http/http-server/arduino/teensy41/mongoose_config.h
diff --git a/examples/arduino/teensy41-http/net.c b/tutorials/http/http-server/arduino/teensy41/net.c
similarity index 100%
rename from examples/arduino/teensy41-http/net.c
rename to tutorials/http/http-server/arduino/teensy41/net.c
diff --git a/examples/arduino/teensy41-http/net.h b/tutorials/http/http-server/arduino/teensy41/net.h
similarity index 100%
rename from examples/arduino/teensy41-http/net.h
rename to tutorials/http/http-server/arduino/teensy41/net.h
diff --git a/examples/arduino/teensy41-http/packed_fs.c b/tutorials/http/http-server/arduino/teensy41/packed_fs.c
similarity index 100%
rename from examples/arduino/teensy41-http/packed_fs.c
rename to tutorials/http/http-server/arduino/teensy41/packed_fs.c
diff --git a/examples/arduino/teensy41-http/teensy41-http.ino b/tutorials/http/http-server/arduino/teensy41/teensy41-http.ino
similarity index 100%
rename from examples/arduino/teensy41-http/teensy41-http.ino
rename to tutorials/http/http-server/arduino/teensy41/teensy41-http.ino
diff --git a/tutorials/http/http-server/arduino/w5500/mongoose.c b/tutorials/http/http-server/arduino/w5500/mongoose.c
new file mode 120000
index 00000000..fe5764e5
--- /dev/null
+++ b/tutorials/http/http-server/arduino/w5500/mongoose.c
@@ -0,0 +1 @@
+../../../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/http/http-server/arduino/w5500/mongoose.h b/tutorials/http/http-server/arduino/w5500/mongoose.h
new file mode 120000
index 00000000..4cd6a2b4
--- /dev/null
+++ b/tutorials/http/http-server/arduino/w5500/mongoose.h
@@ -0,0 +1 @@
+../../../../../mongoose.h
\ No newline at end of file
diff --git a/examples/arduino/w5500-http/mongoose_config.h b/tutorials/http/http-server/arduino/w5500/mongoose_config.h
similarity index 100%
rename from examples/arduino/w5500-http/mongoose_config.h
rename to tutorials/http/http-server/arduino/w5500/mongoose_config.h
diff --git a/examples/arduino/w5500-http/w5500-http.ino b/tutorials/http/http-server/arduino/w5500/w5500-http.ino
similarity index 100%
rename from examples/arduino/w5500-http/w5500-http.ino
rename to tutorials/http/http-server/arduino/w5500/w5500-http.ino
diff --git a/examples/arduino/esp32-mqtt/esp32-mqtt.ino b/tutorials/mqtt/mqtt-client/arduino/esp32/esp32-mqtt.ino
similarity index 100%
rename from examples/arduino/esp32-mqtt/esp32-mqtt.ino
rename to tutorials/mqtt/mqtt-client/arduino/esp32/esp32-mqtt.ino
diff --git a/tutorials/mqtt/mqtt-client/arduino/esp32/mongoose.c b/tutorials/mqtt/mqtt-client/arduino/esp32/mongoose.c
new file mode 120000
index 00000000..fe5764e5
--- /dev/null
+++ b/tutorials/mqtt/mqtt-client/arduino/esp32/mongoose.c
@@ -0,0 +1 @@
+../../../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/mqtt/mqtt-client/arduino/esp32/mongoose.h b/tutorials/mqtt/mqtt-client/arduino/esp32/mongoose.h
new file mode 120000
index 00000000..4cd6a2b4
--- /dev/null
+++ b/tutorials/mqtt/mqtt-client/arduino/esp32/mongoose.h
@@ -0,0 +1 @@
+../../../../../mongoose.h
\ No newline at end of file
diff --git a/examples/arduino/esp32-mqtt/mongoose_config.h b/tutorials/mqtt/mqtt-client/arduino/esp32/mongoose_config.h
similarity index 100%
rename from examples/arduino/esp32-mqtt/mongoose_config.h
rename to tutorials/mqtt/mqtt-client/arduino/esp32/mongoose_config.h
diff --git a/tutorials/mqtt/mqtt-client/arduino/sim800/mongoose.c b/tutorials/mqtt/mqtt-client/arduino/sim800/mongoose.c
new file mode 120000
index 00000000..fe5764e5
--- /dev/null
+++ b/tutorials/mqtt/mqtt-client/arduino/sim800/mongoose.c
@@ -0,0 +1 @@
+../../../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/mqtt/mqtt-client/arduino/sim800/mongoose.h b/tutorials/mqtt/mqtt-client/arduino/sim800/mongoose.h
new file mode 120000
index 00000000..4cd6a2b4
--- /dev/null
+++ b/tutorials/mqtt/mqtt-client/arduino/sim800/mongoose.h
@@ -0,0 +1 @@
+../../../../../mongoose.h
\ No newline at end of file
diff --git a/examples/arduino/sim800-mqtt/mongoose_config.h b/tutorials/mqtt/mqtt-client/arduino/sim800/mongoose_config.h
similarity index 100%
rename from examples/arduino/sim800-mqtt/mongoose_config.h
rename to tutorials/mqtt/mqtt-client/arduino/sim800/mongoose_config.h
diff --git a/examples/arduino/sim800-mqtt/sim800-mqtt.ino b/tutorials/mqtt/mqtt-client/arduino/sim800/sim800-mqtt.ino
similarity index 100%
rename from examples/arduino/sim800-mqtt/sim800-mqtt.ino
rename to tutorials/mqtt/mqtt-client/arduino/sim800/sim800-mqtt.ino
diff --git a/tutorials/mqtt/mqtt-client/arduino/w5500/mongoose.c b/tutorials/mqtt/mqtt-client/arduino/w5500/mongoose.c
new file mode 120000
index 00000000..fe5764e5
--- /dev/null
+++ b/tutorials/mqtt/mqtt-client/arduino/w5500/mongoose.c
@@ -0,0 +1 @@
+../../../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/mqtt/mqtt-client/arduino/w5500/mongoose.h b/tutorials/mqtt/mqtt-client/arduino/w5500/mongoose.h
new file mode 120000
index 00000000..4cd6a2b4
--- /dev/null
+++ b/tutorials/mqtt/mqtt-client/arduino/w5500/mongoose.h
@@ -0,0 +1 @@
+../../../../../mongoose.h
\ No newline at end of file
diff --git a/examples/arduino/w5500-mqtt/mongoose_config.h b/tutorials/mqtt/mqtt-client/arduino/w5500/mongoose_config.h
similarity index 100%
rename from examples/arduino/w5500-mqtt/mongoose_config.h
rename to tutorials/mqtt/mqtt-client/arduino/w5500/mongoose_config.h
diff --git a/examples/arduino/w5500-mqtt/w5500-mqtt.ino b/tutorials/mqtt/mqtt-client/arduino/w5500/w5500-mqtt.ino
similarity index 100%
rename from examples/arduino/w5500-mqtt/w5500-mqtt.ino
rename to tutorials/mqtt/mqtt-client/arduino/w5500/w5500-mqtt.ino