diff --git a/.mkdocs.yml b/.mkdocs.yml
index ca9cbb4..bc3513a 100644
--- a/.mkdocs.yml
+++ b/.mkdocs.yml
@@ -16,8 +16,9 @@ nav:
     - tutorials/alias-to-remote.md
     - tutorials/multiple-domains.md
     - tutorials/upgrading.md
-    - tutorials/smtp-only.md
-    - tutorials/imap-only.md
+  - Integration with software:
+    - third-party/dovecot.md
+    - third-party/smtp-servers.md
   - seclevels.md
   - faq.md
   - unicode.md
diff --git a/docs/tutorials/smtp-only.md b/docs/third-party/dovecot.md
similarity index 92%
rename from docs/tutorials/smtp-only.md
rename to docs/third-party/dovecot.md
index b115428..823d364 100644
--- a/docs/tutorials/smtp-only.md
+++ b/docs/third-party/dovecot.md
@@ -1,14 +1,9 @@
-# Using maddy with an external IMAP server
+# Dovecot
 
 Builtin maddy IMAP server may not match your requirements in terms of
 performance, reliabilty or anything. For this reason it is possible to
 integrate it with any external IMAP server that implements necessary
-protocols.
-
-## Dovecot
-
-It is possible to replace builtin IMAP server with Dovecot.
-Here are necessary bits to change in configuration.
+protocols. Here is how to do it for Dovecot.
 
 1. Get rid of `imap` endpoint and existing `local_authdb` and `local_mailboxes`
    blocks.
diff --git a/docs/tutorials/imap-only.md b/docs/third-party/smtp-servers.md
similarity index 97%
rename from docs/tutorials/imap-only.md
rename to docs/third-party/smtp-servers.md
index 6f9626a..61de1b0 100644
--- a/docs/tutorials/imap-only.md
+++ b/docs/third-party/smtp-servers.md
@@ -1,4 +1,4 @@
-# Using maddy with an external SMTP server
+# External SMTP server
 
 It is possible to use maddy as an IMAP server only
 and have it interface with external SMTP server using