diff --git a/examples/http-client/README.md b/examples/http-client/README.md
deleted file mode 100644
index feaf79db..00000000
--- a/examples/http-client/README.md
+++ /dev/null
@@ -1 +0,0 @@
-See detailed tutorial at https://mongoose.ws/tutorials/http-client/
diff --git a/examples/http-client/certs/ca.pem b/examples/http-client/certs/ca.pem
deleted file mode 120000
index f1db4c57..00000000
--- a/examples/http-client/certs/ca.pem
+++ /dev/null
@@ -1 +0,0 @@
-../../../test/data/ca.pem
\ No newline at end of file
diff --git a/examples/http-client/mongoose.c b/examples/http-client/mongoose.c
deleted file mode 120000
index 8ef6e62d..00000000
--- a/examples/http-client/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.c
\ No newline at end of file
diff --git a/examples/http-client/mongoose.h b/examples/http-client/mongoose.h
deleted file mode 120000
index 488ef358..00000000
--- a/examples/http-client/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.h
\ No newline at end of file
diff --git a/examples/http-proxy-client/README.md b/examples/http-proxy-client/README.md
deleted file mode 100644
index b590977a..00000000
--- a/examples/http-proxy-client/README.md
+++ /dev/null
@@ -1 +0,0 @@
-See detailed tutorial at https://mongoose.ws/tutorials/http-proxy-client/ 
diff --git a/examples/http-proxy-client/mongoose.c b/examples/http-proxy-client/mongoose.c
deleted file mode 120000
index 8ef6e62d..00000000
--- a/examples/http-proxy-client/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.c
\ No newline at end of file
diff --git a/examples/http-proxy-client/mongoose.h b/examples/http-proxy-client/mongoose.h
deleted file mode 120000
index 488ef358..00000000
--- a/examples/http-proxy-client/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.h
\ No newline at end of file
diff --git a/examples/http-reverse-proxy/README.md b/examples/http-reverse-proxy/README.md
deleted file mode 100644
index fd4962fe..00000000
--- a/examples/http-reverse-proxy/README.md
+++ /dev/null
@@ -1 +0,0 @@
-See detailed tutorial at https://mongoose.ws/tutorials/http-reverse-proxy/
diff --git a/examples/http-reverse-proxy/mongoose.c b/examples/http-reverse-proxy/mongoose.c
deleted file mode 120000
index 8ef6e62d..00000000
--- a/examples/http-reverse-proxy/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.c
\ No newline at end of file
diff --git a/examples/http-reverse-proxy/mongoose.h b/examples/http-reverse-proxy/mongoose.h
deleted file mode 120000
index 488ef358..00000000
--- a/examples/http-reverse-proxy/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.h
\ No newline at end of file
diff --git a/examples/http-streaming-client/mongoose.c b/examples/http-streaming-client/mongoose.c
deleted file mode 120000
index 8ef6e62d..00000000
--- a/examples/http-streaming-client/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.c
\ No newline at end of file
diff --git a/examples/http-streaming-client/mongoose.h b/examples/http-streaming-client/mongoose.h
deleted file mode 120000
index 488ef358..00000000
--- a/examples/http-streaming-client/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.h
\ No newline at end of file
diff --git a/examples/mqtt-client-aws-iot/mongoose.c b/examples/mqtt-client-aws-iot/mongoose.c
deleted file mode 120000
index 8ef6e62d..00000000
--- a/examples/mqtt-client-aws-iot/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.c
\ No newline at end of file
diff --git a/examples/mqtt-client-aws-iot/mongoose.h b/examples/mqtt-client-aws-iot/mongoose.h
deleted file mode 120000
index 488ef358..00000000
--- a/examples/mqtt-client-aws-iot/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.h
\ No newline at end of file
diff --git a/examples/mqtt-client-aws-iot/packed_fs.c b/examples/mqtt-client-aws-iot/packed_fs.c
deleted file mode 120000
index 3da43a3c..00000000
--- a/examples/mqtt-client-aws-iot/packed_fs.c
+++ /dev/null
@@ -1 +0,0 @@
-../http-client/packed_fs.c
\ No newline at end of file
diff --git a/examples/mqtt-client/README.md b/examples/mqtt-client/README.md
deleted file mode 100644
index c217fb3c..00000000
--- a/examples/mqtt-client/README.md
+++ /dev/null
@@ -1 +0,0 @@
-See detailed tutorial at https://mongoose.ws/tutorials/mqtt-client/
diff --git a/examples/mqtt-client/mongoose.c b/examples/mqtt-client/mongoose.c
deleted file mode 120000
index 8ef6e62d..00000000
--- a/examples/mqtt-client/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.c
\ No newline at end of file
diff --git a/examples/mqtt-client/mongoose.h b/examples/mqtt-client/mongoose.h
deleted file mode 120000
index 488ef358..00000000
--- a/examples/mqtt-client/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.h
\ No newline at end of file
diff --git a/examples/mqtt-client/packed_fs.c b/examples/mqtt-client/packed_fs.c
deleted file mode 120000
index 3da43a3c..00000000
--- a/examples/mqtt-client/packed_fs.c
+++ /dev/null
@@ -1 +0,0 @@
-../http-client/packed_fs.c
\ No newline at end of file
diff --git a/examples/mqtt-over-ws-client/README.md b/examples/mqtt-over-ws-client/README.md
deleted file mode 100644
index f94cf3c7..00000000
--- a/examples/mqtt-over-ws-client/README.md
+++ /dev/null
@@ -1 +0,0 @@
-See detailed tutorial at https://mongoose.ws/tutorials/mqtt-over-ws-client/
diff --git a/examples/mqtt-over-ws-client/mongoose.c b/examples/mqtt-over-ws-client/mongoose.c
deleted file mode 120000
index 8ef6e62d..00000000
--- a/examples/mqtt-over-ws-client/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.c
\ No newline at end of file
diff --git a/examples/mqtt-over-ws-client/mongoose.h b/examples/mqtt-over-ws-client/mongoose.h
deleted file mode 120000
index 488ef358..00000000
--- a/examples/mqtt-over-ws-client/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.h
\ No newline at end of file
diff --git a/examples/mqtt-over-ws-client/packed_fs.c b/examples/mqtt-over-ws-client/packed_fs.c
deleted file mode 120000
index 3da43a3c..00000000
--- a/examples/mqtt-over-ws-client/packed_fs.c
+++ /dev/null
@@ -1 +0,0 @@
-../http-client/packed_fs.c
\ No newline at end of file
diff --git a/examples/mqtt-server/README.md b/examples/mqtt-server/README.md
deleted file mode 100644
index c1c795c1..00000000
--- a/examples/mqtt-server/README.md
+++ /dev/null
@@ -1 +0,0 @@
-See detailed tutorial at https://mongoose.ws/tutorials/mqtt-server/
diff --git a/examples/mqtt-server/mongoose.c b/examples/mqtt-server/mongoose.c
deleted file mode 120000
index 8ef6e62d..00000000
--- a/examples/mqtt-server/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.c
\ No newline at end of file
diff --git a/examples/mqtt-server/mongoose.h b/examples/mqtt-server/mongoose.h
deleted file mode 120000
index 488ef358..00000000
--- a/examples/mqtt-server/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.h
\ No newline at end of file
diff --git a/examples/smtp-client/mongoose.c b/examples/smtp-client/mongoose.c
deleted file mode 120000
index 8ef6e62d..00000000
--- a/examples/smtp-client/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.c
\ No newline at end of file
diff --git a/examples/smtp-client/mongoose.h b/examples/smtp-client/mongoose.h
deleted file mode 120000
index 488ef358..00000000
--- a/examples/smtp-client/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.h
\ No newline at end of file
diff --git a/examples/smtp-client/packed_fs.c b/examples/smtp-client/packed_fs.c
deleted file mode 120000
index 3da43a3c..00000000
--- a/examples/smtp-client/packed_fs.c
+++ /dev/null
@@ -1 +0,0 @@
-../http-client/packed_fs.c
\ No newline at end of file
diff --git a/examples/http-client/Makefile b/tutorials/http/http-client/Makefile
similarity index 97%
rename from examples/http-client/Makefile
rename to tutorials/http/http-client/Makefile
index 47fcf421..a052361f 100644
--- a/examples/http-client/Makefile
+++ b/tutorials/http/http-client/Makefile
@@ -29,7 +29,7 @@ clean:                    # Cleanup. Delete built program and all build artifact
 
 # Generate packed filesystem for serving cert
 packed_fs.c: $(wildcard certs/*) Makefile
-	$(CC) ../../test/pack.c -o $(PACK)
+	$(CC) ../../../test/pack.c -o $(PACK)
 	$(PACK) $(wildcard certs/*) > $@
 
 # see https://mongoose.ws/tutorials/tls/#how-to-build for TLS build options
diff --git a/tutorials/http/http-client/README.md b/tutorials/http/http-client/README.md
new file mode 100644
index 00000000..7157e855
--- /dev/null
+++ b/tutorials/http/http-client/README.md
@@ -0,0 +1 @@
+See detailed tutorial at https://mongoose.ws/tutorials/http/http-client/
diff --git a/tutorials/http/http-client/certs/ca.pem b/tutorials/http/http-client/certs/ca.pem
new file mode 120000
index 00000000..6110831e
--- /dev/null
+++ b/tutorials/http/http-client/certs/ca.pem
@@ -0,0 +1 @@
+../../../../test/data/ca.pem
\ No newline at end of file
diff --git a/examples/http-client/main.c b/tutorials/http/http-client/main.c
similarity index 100%
rename from examples/http-client/main.c
rename to tutorials/http/http-client/main.c
diff --git a/tutorials/http/http-client/mongoose.c b/tutorials/http/http-client/mongoose.c
new file mode 120000
index 00000000..5e522bbc
--- /dev/null
+++ b/tutorials/http/http-client/mongoose.c
@@ -0,0 +1 @@
+../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/http/http-client/mongoose.h b/tutorials/http/http-client/mongoose.h
new file mode 120000
index 00000000..ee4ac823
--- /dev/null
+++ b/tutorials/http/http-client/mongoose.h
@@ -0,0 +1 @@
+../../../mongoose.h
\ No newline at end of file
diff --git a/examples/http-client/packed_fs.c b/tutorials/http/http-client/packed_fs.c
similarity index 99%
rename from examples/http-client/packed_fs.c
rename to tutorials/http/http-client/packed_fs.c
index 350efa2c..7796ec8a 100644
--- a/examples/http-client/packed_fs.c
+++ b/tutorials/http/http-client/packed_fs.c
@@ -2556,7 +2556,7 @@ static const struct packed_file {
   size_t size;
   time_t mtime;
 } packed_files[] = {
-  {"/certs/ca.pem", v1, sizeof(v1), 1694162397},
+  {"/certs/ca.pem", v1, sizeof(v1), 1713395242},
   {NULL, NULL, 0, 0}
 };
 
diff --git a/examples/http-proxy-client/Makefile b/tutorials/http/http-proxy-client/Makefile
similarity index 100%
rename from examples/http-proxy-client/Makefile
rename to tutorials/http/http-proxy-client/Makefile
diff --git a/tutorials/http/http-proxy-client/README.md b/tutorials/http/http-proxy-client/README.md
new file mode 100644
index 00000000..6ad0fc5c
--- /dev/null
+++ b/tutorials/http/http-proxy-client/README.md
@@ -0,0 +1 @@
+See detailed tutorial at https://mongoose.ws/tutorials/http/http-proxy-client/ 
diff --git a/examples/http-proxy-client/main.c b/tutorials/http/http-proxy-client/main.c
similarity index 100%
rename from examples/http-proxy-client/main.c
rename to tutorials/http/http-proxy-client/main.c
diff --git a/tutorials/http/http-proxy-client/mongoose.c b/tutorials/http/http-proxy-client/mongoose.c
new file mode 120000
index 00000000..5e522bbc
--- /dev/null
+++ b/tutorials/http/http-proxy-client/mongoose.c
@@ -0,0 +1 @@
+../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/http/http-proxy-client/mongoose.h b/tutorials/http/http-proxy-client/mongoose.h
new file mode 120000
index 00000000..ee4ac823
--- /dev/null
+++ b/tutorials/http/http-proxy-client/mongoose.h
@@ -0,0 +1 @@
+../../../mongoose.h
\ No newline at end of file
diff --git a/examples/http-proxy-client/packed_fs.c b/tutorials/http/http-proxy-client/packed_fs.c
similarity index 100%
rename from examples/http-proxy-client/packed_fs.c
rename to tutorials/http/http-proxy-client/packed_fs.c
diff --git a/examples/http-reverse-proxy/Makefile b/tutorials/http/http-reverse-proxy/Makefile
similarity index 100%
rename from examples/http-reverse-proxy/Makefile
rename to tutorials/http/http-reverse-proxy/Makefile
diff --git a/tutorials/http/http-reverse-proxy/README.md b/tutorials/http/http-reverse-proxy/README.md
new file mode 100644
index 00000000..06a9ab06
--- /dev/null
+++ b/tutorials/http/http-reverse-proxy/README.md
@@ -0,0 +1 @@
+See detailed tutorial at https://mongoose.ws/tutorials/http/http-reverse-proxy/
diff --git a/examples/http-reverse-proxy/main.c b/tutorials/http/http-reverse-proxy/main.c
similarity index 100%
rename from examples/http-reverse-proxy/main.c
rename to tutorials/http/http-reverse-proxy/main.c
diff --git a/tutorials/http/http-reverse-proxy/mongoose.c b/tutorials/http/http-reverse-proxy/mongoose.c
new file mode 120000
index 00000000..5e522bbc
--- /dev/null
+++ b/tutorials/http/http-reverse-proxy/mongoose.c
@@ -0,0 +1 @@
+../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/http/http-reverse-proxy/mongoose.h b/tutorials/http/http-reverse-proxy/mongoose.h
new file mode 120000
index 00000000..ee4ac823
--- /dev/null
+++ b/tutorials/http/http-reverse-proxy/mongoose.h
@@ -0,0 +1 @@
+../../../mongoose.h
\ No newline at end of file
diff --git a/examples/http-reverse-proxy/packed_fs.c b/tutorials/http/http-reverse-proxy/packed_fs.c
similarity index 100%
rename from examples/http-reverse-proxy/packed_fs.c
rename to tutorials/http/http-reverse-proxy/packed_fs.c
diff --git a/examples/http-streaming-client/Makefile b/tutorials/http/http-streaming-client/Makefile
similarity index 100%
rename from examples/http-streaming-client/Makefile
rename to tutorials/http/http-streaming-client/Makefile
diff --git a/examples/http-streaming-client/main.c b/tutorials/http/http-streaming-client/main.c
similarity index 100%
rename from examples/http-streaming-client/main.c
rename to tutorials/http/http-streaming-client/main.c
diff --git a/tutorials/http/http-streaming-client/mongoose.c b/tutorials/http/http-streaming-client/mongoose.c
new file mode 120000
index 00000000..5e522bbc
--- /dev/null
+++ b/tutorials/http/http-streaming-client/mongoose.c
@@ -0,0 +1 @@
+../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/http/http-streaming-client/mongoose.h b/tutorials/http/http-streaming-client/mongoose.h
new file mode 120000
index 00000000..ee4ac823
--- /dev/null
+++ b/tutorials/http/http-streaming-client/mongoose.h
@@ -0,0 +1 @@
+../../../mongoose.h
\ No newline at end of file
diff --git a/examples/http-streaming-client/packed_fs.c b/tutorials/http/http-streaming-client/packed_fs.c
similarity index 100%
rename from examples/http-streaming-client/packed_fs.c
rename to tutorials/http/http-streaming-client/packed_fs.c
diff --git a/examples/mqtt-client-aws-iot/Makefile b/tutorials/mqtt/mqtt-client-aws-iot/Makefile
similarity index 100%
rename from examples/mqtt-client-aws-iot/Makefile
rename to tutorials/mqtt/mqtt-client-aws-iot/Makefile
diff --git a/examples/mqtt-client-aws-iot/README.md b/tutorials/mqtt/mqtt-client-aws-iot/README.md
similarity index 64%
rename from examples/mqtt-client-aws-iot/README.md
rename to tutorials/mqtt/mqtt-client-aws-iot/README.md
index 122bb27b..a313718b 100644
--- a/examples/mqtt-client-aws-iot/README.md
+++ b/tutorials/mqtt/mqtt-client-aws-iot/README.md
@@ -1,2 +1,2 @@
 - This example requires generating AWS and user credentials and downloading certificates
-- This example requires building with TLS support; before running, see detailed tutorial at https://mongoose.ws/tutorials/mqtt-client-aws-iot/
+- This example requires building with TLS support; before running, see detailed tutorial at https://mongoose.ws/tutorials/mqtt/mqtt-client-aws-iot/
diff --git a/examples/mqtt-client-aws-iot/main.c b/tutorials/mqtt/mqtt-client-aws-iot/main.c
similarity index 100%
rename from examples/mqtt-client-aws-iot/main.c
rename to tutorials/mqtt/mqtt-client-aws-iot/main.c
diff --git a/tutorials/mqtt/mqtt-client-aws-iot/mongoose.c b/tutorials/mqtt/mqtt-client-aws-iot/mongoose.c
new file mode 120000
index 00000000..5e522bbc
--- /dev/null
+++ b/tutorials/mqtt/mqtt-client-aws-iot/mongoose.c
@@ -0,0 +1 @@
+../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/mqtt/mqtt-client-aws-iot/mongoose.h b/tutorials/mqtt/mqtt-client-aws-iot/mongoose.h
new file mode 120000
index 00000000..ee4ac823
--- /dev/null
+++ b/tutorials/mqtt/mqtt-client-aws-iot/mongoose.h
@@ -0,0 +1 @@
+../../../mongoose.h
\ No newline at end of file
diff --git a/tutorials/mqtt/mqtt-client-aws-iot/packed_fs.c b/tutorials/mqtt/mqtt-client-aws-iot/packed_fs.c
new file mode 120000
index 00000000..5a635976
--- /dev/null
+++ b/tutorials/mqtt/mqtt-client-aws-iot/packed_fs.c
@@ -0,0 +1 @@
+../../http/http-client/packed_fs.c
\ No newline at end of file
diff --git a/examples/mqtt-client/Makefile b/tutorials/mqtt/mqtt-client/Makefile
similarity index 100%
rename from examples/mqtt-client/Makefile
rename to tutorials/mqtt/mqtt-client/Makefile
diff --git a/tutorials/mqtt/mqtt-client/README.md b/tutorials/mqtt/mqtt-client/README.md
new file mode 100644
index 00000000..dbab5efb
--- /dev/null
+++ b/tutorials/mqtt/mqtt-client/README.md
@@ -0,0 +1 @@
+See detailed tutorial at https://mongoose.ws/tutorials/mqtt/mqtt-client/
diff --git a/examples/mqtt-client/main.c b/tutorials/mqtt/mqtt-client/main.c
similarity index 100%
rename from examples/mqtt-client/main.c
rename to tutorials/mqtt/mqtt-client/main.c
diff --git a/tutorials/mqtt/mqtt-client/mongoose.c b/tutorials/mqtt/mqtt-client/mongoose.c
new file mode 120000
index 00000000..5e522bbc
--- /dev/null
+++ b/tutorials/mqtt/mqtt-client/mongoose.c
@@ -0,0 +1 @@
+../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/mqtt/mqtt-client/mongoose.h b/tutorials/mqtt/mqtt-client/mongoose.h
new file mode 120000
index 00000000..ee4ac823
--- /dev/null
+++ b/tutorials/mqtt/mqtt-client/mongoose.h
@@ -0,0 +1 @@
+../../../mongoose.h
\ No newline at end of file
diff --git a/tutorials/mqtt/mqtt-client/packed_fs.c b/tutorials/mqtt/mqtt-client/packed_fs.c
new file mode 120000
index 00000000..5a635976
--- /dev/null
+++ b/tutorials/mqtt/mqtt-client/packed_fs.c
@@ -0,0 +1 @@
+../../http/http-client/packed_fs.c
\ No newline at end of file
diff --git a/examples/mqtt-over-ws-client/Makefile b/tutorials/mqtt/mqtt-over-ws-client/Makefile
similarity index 100%
rename from examples/mqtt-over-ws-client/Makefile
rename to tutorials/mqtt/mqtt-over-ws-client/Makefile
diff --git a/tutorials/mqtt/mqtt-over-ws-client/README.md b/tutorials/mqtt/mqtt-over-ws-client/README.md
new file mode 100644
index 00000000..88b5d970
--- /dev/null
+++ b/tutorials/mqtt/mqtt-over-ws-client/README.md
@@ -0,0 +1 @@
+See detailed tutorial at https://mongoose.ws/tutorials/mqtt/mqtt-over-ws-client/
diff --git a/examples/mqtt-over-ws-client/main.c b/tutorials/mqtt/mqtt-over-ws-client/main.c
similarity index 100%
rename from examples/mqtt-over-ws-client/main.c
rename to tutorials/mqtt/mqtt-over-ws-client/main.c
diff --git a/tutorials/mqtt/mqtt-over-ws-client/mongoose.c b/tutorials/mqtt/mqtt-over-ws-client/mongoose.c
new file mode 120000
index 00000000..5e522bbc
--- /dev/null
+++ b/tutorials/mqtt/mqtt-over-ws-client/mongoose.c
@@ -0,0 +1 @@
+../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/mqtt/mqtt-over-ws-client/mongoose.h b/tutorials/mqtt/mqtt-over-ws-client/mongoose.h
new file mode 120000
index 00000000..ee4ac823
--- /dev/null
+++ b/tutorials/mqtt/mqtt-over-ws-client/mongoose.h
@@ -0,0 +1 @@
+../../../mongoose.h
\ No newline at end of file
diff --git a/tutorials/mqtt/mqtt-over-ws-client/packed_fs.c b/tutorials/mqtt/mqtt-over-ws-client/packed_fs.c
new file mode 120000
index 00000000..5a635976
--- /dev/null
+++ b/tutorials/mqtt/mqtt-over-ws-client/packed_fs.c
@@ -0,0 +1 @@
+../../http/http-client/packed_fs.c
\ No newline at end of file
diff --git a/examples/mqtt-server/Makefile b/tutorials/mqtt/mqtt-server/Makefile
similarity index 100%
rename from examples/mqtt-server/Makefile
rename to tutorials/mqtt/mqtt-server/Makefile
diff --git a/tutorials/mqtt/mqtt-server/README.md b/tutorials/mqtt/mqtt-server/README.md
new file mode 100644
index 00000000..e545a04c
--- /dev/null
+++ b/tutorials/mqtt/mqtt-server/README.md
@@ -0,0 +1 @@
+See detailed tutorial at https://mongoose.ws/tutorials/mqtt/mqtt-server/
diff --git a/examples/mqtt-server/main.c b/tutorials/mqtt/mqtt-server/main.c
similarity index 100%
rename from examples/mqtt-server/main.c
rename to tutorials/mqtt/mqtt-server/main.c
diff --git a/tutorials/mqtt/mqtt-server/mongoose.c b/tutorials/mqtt/mqtt-server/mongoose.c
new file mode 120000
index 00000000..5e522bbc
--- /dev/null
+++ b/tutorials/mqtt/mqtt-server/mongoose.c
@@ -0,0 +1 @@
+../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/mqtt/mqtt-server/mongoose.h b/tutorials/mqtt/mqtt-server/mongoose.h
new file mode 120000
index 00000000..ee4ac823
--- /dev/null
+++ b/tutorials/mqtt/mqtt-server/mongoose.h
@@ -0,0 +1 @@
+../../../mongoose.h
\ No newline at end of file
diff --git a/examples/smtp-client/Makefile b/tutorials/smtp/smtp-client/Makefile
similarity index 100%
rename from examples/smtp-client/Makefile
rename to tutorials/smtp/smtp-client/Makefile
diff --git a/examples/smtp-client/README.md b/tutorials/smtp/smtp-client/README.md
similarity index 55%
rename from examples/smtp-client/README.md
rename to tutorials/smtp/smtp-client/README.md
index aff0cf43..cc972a51 100644
--- a/examples/smtp-client/README.md
+++ b/tutorials/smtp/smtp-client/README.md
@@ -1,2 +1,2 @@
-- This example requires changing server name and user credentials on `main.c`
-- This example requires building with TLS support; before running, see detailed tutorial at https://mongoose.ws/tutorials/smtp-client/
+- This example requires changing server name and user credentials in `main.c`
+- This example requires building with TLS support; before running, please see its detailed tutorial at https://mongoose.ws/tutorials/smtp/smtp-client/
diff --git a/examples/smtp-client/main.c b/tutorials/smtp/smtp-client/main.c
similarity index 100%
rename from examples/smtp-client/main.c
rename to tutorials/smtp/smtp-client/main.c
diff --git a/tutorials/smtp/smtp-client/mongoose.c b/tutorials/smtp/smtp-client/mongoose.c
new file mode 120000
index 00000000..5e522bbc
--- /dev/null
+++ b/tutorials/smtp/smtp-client/mongoose.c
@@ -0,0 +1 @@
+../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/smtp/smtp-client/mongoose.h b/tutorials/smtp/smtp-client/mongoose.h
new file mode 120000
index 00000000..ee4ac823
--- /dev/null
+++ b/tutorials/smtp/smtp-client/mongoose.h
@@ -0,0 +1 @@
+../../../mongoose.h
\ No newline at end of file
diff --git a/tutorials/smtp/smtp-client/packed_fs.c b/tutorials/smtp/smtp-client/packed_fs.c
new file mode 120000
index 00000000..5a635976
--- /dev/null
+++ b/tutorials/smtp/smtp-client/packed_fs.c
@@ -0,0 +1 @@
+../../http/http-client/packed_fs.c
\ No newline at end of file