diff --git a/docs/README.md b/docs/README.md
index 8eb2a00bd..ca8c54c38 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -84,6 +84,10 @@ See the full documentation at [`../README.md`](../README.md) or browse sub-pages
 
 [Conversations API](https://lightspeed-core.github.io/lightspeed-stack/devel_doc/conversations_api.html)
 
+[Query endpoint](https://lightspeed-core.github.io/lightspeed-stack/devel_doc/query_endpoint.html)
+
+[Streaming query endpoint](https://lightspeed-core.github.io/lightspeed-stack/devel_doc/streaming_query_endpoint.html)
+
 ### Models
 
 [Common](https://lightspeed-core.github.io/lightspeed-stack/models/common.html)
@@ -100,11 +104,11 @@ See the full documentation at [`../README.md`](../README.md) or browse sub-pages
 
 ### Testing
 
-[Testing](https://lightspeed-core.github.io/lightspeed-stack/testing.html)
+[Testing](https://lightspeed-core.github.io/lightspeed-stack/testing/testing.html)
 
-[End-to-End Tests Guide](https://lightspeed-core.github.io/lightspeed-stack/e2e_testing.html)
+[End-to-End Tests Guide](https://lightspeed-core.github.io/lightspeed-stack/testing/e2e_testing.html)
 
-[List of e2e scenarios](https://lightspeed-core.github.io/lightspeed-stack/e2e_scenarios.html)
+[List of e2e scenarios](https://lightspeed-core.github.io/lightspeed-stack/testing/e2e_scenarios.html)
 
 ## Maintenance
 
diff --git a/docs/devel_doc/convesation_history.svg b/docs/devel_doc/conversation_history.svg
similarity index 100%
rename from docs/devel_doc/convesation_history.svg
rename to docs/devel_doc/conversation_history.svg
diff --git a/docs/core2llama-stack_interface.png b/docs/devel_doc/core2llama-stack_interface.png
similarity index 100%
rename from docs/core2llama-stack_interface.png
rename to docs/devel_doc/core2llama-stack_interface.png
diff --git a/docs/devel_doc/query_endpoint.md b/docs/devel_doc/query_endpoint.md
new file mode 100644
index 000000000..3c7a32c40
--- /dev/null
+++ b/docs/devel_doc/query_endpoint.md
@@ -0,0 +1,3 @@
+# Query endpoint
+
+![Query endpoint](./query_endpoint.svg)
diff --git a/docs/query_endpoint.puml b/docs/devel_doc/query_endpoint.puml
similarity index 100%
rename from docs/query_endpoint.puml
rename to docs/devel_doc/query_endpoint.puml
diff --git a/docs/query_endpoint.svg b/docs/devel_doc/query_endpoint.svg
similarity index 100%
rename from docs/query_endpoint.svg
rename to docs/devel_doc/query_endpoint.svg
diff --git a/docs/devel_doc/streaming_query_endpoint.md b/docs/devel_doc/streaming_query_endpoint.md
new file mode 100644
index 000000000..668475e44
--- /dev/null
+++ b/docs/devel_doc/streaming_query_endpoint.md
@@ -0,0 +1,3 @@
+# Streaming auery endpoint
+
+![Streaming query endpoint](./streaming_query_endpoint.svg)
diff --git a/docs/streaming_query_endpoint.puml b/docs/devel_doc/streaming_query_endpoint.puml
similarity index 100%
rename from docs/streaming_query_endpoint.puml
rename to docs/devel_doc/streaming_query_endpoint.puml
diff --git a/docs/streaming_query_endpoint.svg b/docs/devel_doc/streaming_query_endpoint.svg
similarity index 100%
rename from docs/streaming_query_endpoint.svg
rename to docs/devel_doc/streaming_query_endpoint.svg
diff --git a/docs/index.md b/docs/index.md
index a353b57c2..33b421e45 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -91,6 +91,10 @@ product questions using backend LLM services, agents, and RAG databases.
 
 [Conversations API](https://lightspeed-core.github.io/lightspeed-stack/devel_doc/conversations_api.html)
 
+[Query endpoint](https://lightspeed-core.github.io/lightspeed-stack/devel_doc/query_endpoint.html)
+
+[Streaming query endpoint](https://lightspeed-core.github.io/lightspeed-stack/devel_doc/streaming_query_endpoint.html)
+
 ### Models
 
 [Common](https://lightspeed-core.github.io/lightspeed-stack/models/common.html)
@@ -107,11 +111,11 @@ product questions using backend LLM services, agents, and RAG databases.
 
 ### Testing
 
-[Testing](https://lightspeed-core.github.io/lightspeed-stack/testing.html)
+[Testing](https://lightspeed-core.github.io/lightspeed-stack/testing/testing.html)
 
-[End-to-End Tests Guide](https://lightspeed-core.github.io/lightspeed-stack/e2e_testing.html)
+[End-to-End Tests Guide](https://lightspeed-core.github.io/lightspeed-stack/testing/e2e_testing.html)
 
-[List of e2e scenarios](https://lightspeed-core.github.io/lightspeed-stack/e2e_scenarios.html)
+[List of e2e scenarios](https://lightspeed-core.github.io/lightspeed-stack/testing/e2e_scenarios.html)
 
 ## Maintenance
 
diff --git a/docs/e2e_scenarios.md b/docs/testing/e2e_scenarios.md
similarity index 100%
rename from docs/e2e_scenarios.md
rename to docs/testing/e2e_scenarios.md
diff --git a/docs/e2e_testing.md b/docs/testing/e2e_testing.md
similarity index 100%
rename from docs/e2e_testing.md
rename to docs/testing/e2e_testing.md
diff --git a/docs/testing.md b/docs/testing/testing.md
similarity index 100%
rename from docs/testing.md
rename to docs/testing/testing.md