diff --git a/exercise-book/src/SUMMARY.md b/exercise-book/src/SUMMARY.md
index 130dd65..61c6e65 100644
--- a/exercise-book/src/SUMMARY.md
+++ b/exercise-book/src/SUMMARY.md
@@ -113,4 +113,18 @@
 - [Interactive TCP Echo Server](./tcp-server.md)
   - [Share data between connections](./tcp-server-log.md)
 
+# Async chat
+
+- [Tutorial: Implementing a chat](./async-chat/index.md)
+  - [Specification and Getting started](./async-chat/specification.md)
+  - [Writing an Accept Loop](./async-chat/accept_loop.md)
+  - [Receiving Messages](./async-chat/receiving_messages.md)
+  - [Sending Messages](./async-chat/sending_messages.md)
+  - [Connecting Readers and Writers](./async-chat/connecting_readers_and_writers.md)
+  - [All Together](./async-chat/all_together.md)
+  - [Clean Shutdown](./async-chat/clean_shutdown.md)
+  - [Handling Disconnection](./async-chat/handling_disconnection.md)
+  - [Final Server Code](./async-chat/final_server_code.md)
+  - [Implementing a Client](./async-chat/implementing_a_client.md)
+
 # Other Topics
diff --git a/exercise-solutions/async-chat/docs/accept_loop.md b/exercise-book/src/async-chat/accept_loop.md
similarity index 100%
rename from exercise-solutions/async-chat/docs/accept_loop.md
rename to exercise-book/src/async-chat/accept_loop.md
diff --git a/exercise-solutions/async-chat/docs/all_together.md b/exercise-book/src/async-chat/all_together.md
similarity index 100%
rename from exercise-solutions/async-chat/docs/all_together.md
rename to exercise-book/src/async-chat/all_together.md
diff --git a/exercise-solutions/async-chat/docs/clean_shutdown.md b/exercise-book/src/async-chat/clean_shutdown.md
similarity index 100%
rename from exercise-solutions/async-chat/docs/clean_shutdown.md
rename to exercise-book/src/async-chat/clean_shutdown.md
diff --git a/exercise-solutions/async-chat/docs/connecting_readers_and_writers.md b/exercise-book/src/async-chat/connecting_readers_and_writers.md
similarity index 100%
rename from exercise-solutions/async-chat/docs/connecting_readers_and_writers.md
rename to exercise-book/src/async-chat/connecting_readers_and_writers.md
diff --git a/exercise-solutions/async-chat/docs/final_server_code.md b/exercise-book/src/async-chat/final_server_code.md
similarity index 100%
rename from exercise-solutions/async-chat/docs/final_server_code.md
rename to exercise-book/src/async-chat/final_server_code.md
diff --git a/exercise-solutions/async-chat/docs/handling_disconnection.md b/exercise-book/src/async-chat/handling_disconnection.md
similarity index 100%
rename from exercise-solutions/async-chat/docs/handling_disconnection.md
rename to exercise-book/src/async-chat/handling_disconnection.md
diff --git a/exercise-solutions/async-chat/docs/implementing_a_client.md b/exercise-book/src/async-chat/implementing_a_client.md
similarity index 100%
rename from exercise-solutions/async-chat/docs/implementing_a_client.md
rename to exercise-book/src/async-chat/implementing_a_client.md
diff --git a/exercise-solutions/async-chat/docs/index.md b/exercise-book/src/async-chat/index.md
similarity index 100%
rename from exercise-solutions/async-chat/docs/index.md
rename to exercise-book/src/async-chat/index.md
diff --git a/exercise-solutions/async-chat/docs/receiving_messages.md b/exercise-book/src/async-chat/receiving_messages.md
similarity index 100%
rename from exercise-solutions/async-chat/docs/receiving_messages.md
rename to exercise-book/src/async-chat/receiving_messages.md
diff --git a/exercise-solutions/async-chat/docs/sending_messages.md b/exercise-book/src/async-chat/sending_messages.md
similarity index 100%
rename from exercise-solutions/async-chat/docs/sending_messages.md
rename to exercise-book/src/async-chat/sending_messages.md
diff --git a/exercise-solutions/async-chat/docs/specification.md b/exercise-book/src/async-chat/specification.md
similarity index 100%
rename from exercise-solutions/async-chat/docs/specification.md
rename to exercise-book/src/async-chat/specification.md
diff --git a/exercise-solutions/async-chat/book.toml b/exercise-solutions/async-chat/book.toml
deleted file mode 100644
index 75742f5..0000000
--- a/exercise-solutions/async-chat/book.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[book]
-authors = ["Ferrous Systems GmbH"]
-language = "en"
-multilingual = false
-src = "docs"
-title = "Async programming tutorial in Rust with tokio"
-
-[rust]
-edition = "2021"
-
-[output.html.playground]
-runnable = false
diff --git a/exercise-solutions/async-chat/docs/SUMMARY.md b/exercise-solutions/async-chat/docs/SUMMARY.md
deleted file mode 100644
index 9c5a711..0000000
--- a/exercise-solutions/async-chat/docs/SUMMARY.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Summary
-
-- [Tutorial: Implementing a chat](./index.md)
-  - [Specification and Getting started](./specification.md)
-  - [Writing an Accept Loop](./accept_loop.md)
-  - [Receiving Messages](./receiving_messages.md)
-  - [Sending Messages](./sending_messages.md)
-  - [Connecting Readers and Writers](./connecting_readers_and_writers.md)
-  - [All Together](./all_together.md)
-  - [Clean Shutdown](./clean_shutdown.md)
-  - [Handling Disconnection](./handling_disconnection.md)
-  - [Final Server Code](./final_server_code.md)
-  - [Implementing a Client](./implementing_a_client.md)