diff --git a/examples/json-rpc-over-websocket/README.md b/examples/json-rpc-over-websocket/README.md
deleted file mode 100644
index 96784c1d..00000000
--- a/examples/json-rpc-over-websocket/README.md
+++ /dev/null
@@ -1 +0,0 @@
-See detailed tutorial at https://mongoose.ws/tutorials/json-rpc-over-websocket/
diff --git a/examples/json-rpc-over-websocket/mongoose.c b/examples/json-rpc-over-websocket/mongoose.c
deleted file mode 120000
index 8ef6e62d..00000000
--- a/examples/json-rpc-over-websocket/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.c
\ No newline at end of file
diff --git a/examples/json-rpc-over-websocket/mongoose.h b/examples/json-rpc-over-websocket/mongoose.h
deleted file mode 120000
index 488ef358..00000000
--- a/examples/json-rpc-over-websocket/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.h
\ No newline at end of file
diff --git a/examples/websocket-client/mongoose.c b/examples/websocket-client/mongoose.c
deleted file mode 120000
index 8ef6e62d..00000000
--- a/examples/websocket-client/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.c
\ No newline at end of file
diff --git a/examples/websocket-client/mongoose.h b/examples/websocket-client/mongoose.h
deleted file mode 120000
index 488ef358..00000000
--- a/examples/websocket-client/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.h
\ No newline at end of file
diff --git a/examples/websocket-server/mongoose.c b/examples/websocket-server/mongoose.c
deleted file mode 120000
index 8ef6e62d..00000000
--- a/examples/websocket-server/mongoose.c
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.c
\ No newline at end of file
diff --git a/examples/websocket-server/mongoose.h b/examples/websocket-server/mongoose.h
deleted file mode 120000
index 488ef358..00000000
--- a/examples/websocket-server/mongoose.h
+++ /dev/null
@@ -1 +0,0 @@
-../../mongoose.h
\ No newline at end of file
diff --git a/examples/json-rpc-over-websocket/Makefile b/tutorials/websocket/json-rpc-over-websocket/Makefile
similarity index 100%
rename from examples/json-rpc-over-websocket/Makefile
rename to tutorials/websocket/json-rpc-over-websocket/Makefile
diff --git a/tutorials/websocket/json-rpc-over-websocket/README.md b/tutorials/websocket/json-rpc-over-websocket/README.md
new file mode 100644
index 00000000..8b50c1c8
--- /dev/null
+++ b/tutorials/websocket/json-rpc-over-websocket/README.md
@@ -0,0 +1 @@
+See detailed tutorial at https://mongoose.ws/tutorials/websocket/json-rpc-over-websocket/
diff --git a/examples/json-rpc-over-websocket/main.c b/tutorials/websocket/json-rpc-over-websocket/main.c
similarity index 100%
rename from examples/json-rpc-over-websocket/main.c
rename to tutorials/websocket/json-rpc-over-websocket/main.c
diff --git a/tutorials/websocket/json-rpc-over-websocket/mongoose.c b/tutorials/websocket/json-rpc-over-websocket/mongoose.c
new file mode 120000
index 00000000..5e522bbc
--- /dev/null
+++ b/tutorials/websocket/json-rpc-over-websocket/mongoose.c
@@ -0,0 +1 @@
+../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/websocket/json-rpc-over-websocket/mongoose.h b/tutorials/websocket/json-rpc-over-websocket/mongoose.h
new file mode 120000
index 00000000..ee4ac823
--- /dev/null
+++ b/tutorials/websocket/json-rpc-over-websocket/mongoose.h
@@ -0,0 +1 @@
+../../../mongoose.h
\ No newline at end of file
diff --git a/examples/json-rpc-over-websocket/web_root/index.html b/tutorials/websocket/json-rpc-over-websocket/web_root/index.html
similarity index 100%
rename from examples/json-rpc-over-websocket/web_root/index.html
rename to tutorials/websocket/json-rpc-over-websocket/web_root/index.html
diff --git a/examples/json-rpc-over-websocket/web_root/rpc-over-websocket.js b/tutorials/websocket/json-rpc-over-websocket/web_root/rpc-over-websocket.js
similarity index 100%
rename from examples/json-rpc-over-websocket/web_root/rpc-over-websocket.js
rename to tutorials/websocket/json-rpc-over-websocket/web_root/rpc-over-websocket.js
diff --git a/examples/websocket-client/Makefile b/tutorials/websocket/websocket-client/Makefile
similarity index 100%
rename from examples/websocket-client/Makefile
rename to tutorials/websocket/websocket-client/Makefile
diff --git a/examples/websocket-server/README.md b/tutorials/websocket/websocket-client/README.md
similarity index 77%
rename from examples/websocket-server/README.md
rename to tutorials/websocket/websocket-client/README.md
index efb07e26..172d780d 100644
--- a/examples/websocket-server/README.md
+++ b/tutorials/websocket/websocket-client/README.md
@@ -1 +1 @@
-See detailed tutorial at https://mongoose.ws/tutorials/websocket-server/
+See detailed tutorial at https://mongoose.ws/tutorials/websocket/websocket-client/
diff --git a/examples/websocket-client/main.c b/tutorials/websocket/websocket-client/main.c
similarity index 100%
rename from examples/websocket-client/main.c
rename to tutorials/websocket/websocket-client/main.c
diff --git a/tutorials/websocket/websocket-client/mongoose.c b/tutorials/websocket/websocket-client/mongoose.c
new file mode 120000
index 00000000..5e522bbc
--- /dev/null
+++ b/tutorials/websocket/websocket-client/mongoose.c
@@ -0,0 +1 @@
+../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/websocket/websocket-client/mongoose.h b/tutorials/websocket/websocket-client/mongoose.h
new file mode 120000
index 00000000..ee4ac823
--- /dev/null
+++ b/tutorials/websocket/websocket-client/mongoose.h
@@ -0,0 +1 @@
+../../../mongoose.h
\ No newline at end of file
diff --git a/examples/websocket-server/Makefile b/tutorials/websocket/websocket-server/Makefile
similarity index 100%
rename from examples/websocket-server/Makefile
rename to tutorials/websocket/websocket-server/Makefile
diff --git a/examples/websocket-client/README.md b/tutorials/websocket/websocket-server/README.md
similarity index 77%
rename from examples/websocket-client/README.md
rename to tutorials/websocket/websocket-server/README.md
index 5526e5aa..96194694 100644
--- a/examples/websocket-client/README.md
+++ b/tutorials/websocket/websocket-server/README.md
@@ -1 +1 @@
-See detailed tutorial at https://mongoose.ws/tutorials/websocket-client/
+See detailed tutorial at https://mongoose.ws/tutorials/websocket/websocket-server/
diff --git a/examples/websocket-server/main.c b/tutorials/websocket/websocket-server/main.c
similarity index 100%
rename from examples/websocket-server/main.c
rename to tutorials/websocket/websocket-server/main.c
diff --git a/tutorials/websocket/websocket-server/mongoose.c b/tutorials/websocket/websocket-server/mongoose.c
new file mode 120000
index 00000000..5e522bbc
--- /dev/null
+++ b/tutorials/websocket/websocket-server/mongoose.c
@@ -0,0 +1 @@
+../../../mongoose.c
\ No newline at end of file
diff --git a/tutorials/websocket/websocket-server/mongoose.h b/tutorials/websocket/websocket-server/mongoose.h
new file mode 120000
index 00000000..ee4ac823
--- /dev/null
+++ b/tutorials/websocket/websocket-server/mongoose.h
@@ -0,0 +1 @@
+../../../mongoose.h
\ No newline at end of file
diff --git a/examples/websocket-server/test.html b/tutorials/websocket/websocket-server/test.html
similarity index 100%
rename from examples/websocket-server/test.html
rename to tutorials/websocket/websocket-server/test.html