diff --git a/mkdocs.yml b/mkdocs.yml
index 43d0851e5..03d7bb95d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -10,20 +10,43 @@ repo_url: https://github.com/fonoster/routr
 edit_uri: /fonoster/routr/edit/master/docs/
 
 nav:
-  - Introduction: index.md
-  - Installation: getting-started-installation.md
-  - Routing Methods: getting-started-routing.md
-  - Command Line: api-cli-commands.md
+  - Introduction:
+    - Overview: introduction/overview.md
+    - Installation: introduction/installation.md
+    - Comparison to Alternatives: introduction/comparison.md
+    - Community: introduction/community.md
+    - FAQ: introduction/faq.md
+    - Roadmap: introduction/roadmap.md
+    - Media: introduction/media.md
+    - Glossary: introduction/glossary.md
+  - Concepts: concepts.md
+  - Configuration:
+    - General Configuration:
+      - Transport Settings: configuration/general/transport.md
+      - Signaling Security(TLS): configuration/general/signaling-security.md
+      - Restful API: configuration/general/restful-api.md
+      - Datasource Setting: configuration/general/datasources.md
+      - Logging: configuration/general/logging.md
+    - Users Configuration: configuration/users.md
+    - Carriers(Gateways) Configuration: configuration/gateways.md
+    - Virtual Numbers(DIDs) Configuration: configuration/dids.md
+    - Domains Configuration: configuration/domains.md
+    - Agents Configuration: configuration/agents.md
+    - Peers Configuration: configuration/peers.md
+  - Administration:
+    - Command-Line: administration/cli.md
+    - Web Console: administration/webconsole.md
   - API:
-    - Reference: api-reference.md
-    - Resources: api-resources.md
+    - Reference: api/reference.md
+    - Resources: api/resources.md
   - Guides:
-    - Voip Network Setup: guide-voip-network-setup.md
-    - Routr as Asterisk frontend: guide-routr-as-asterisk-frontend.md
-    - Securing the Signaling Path: guide-securing-the-signal.md
-  - Web Console: api-webconsole.md
-  - Community: community.md
-  - Faqs: faqs.md
+    - Basic Setup: guides/basic-setup.md
+    - Routr as Asterisk frontend: guides/routr-as-asterisk-frontend.md
+    - Routr as FreeSWITCH frontend: guides/routr-as-freeswitch-frontend.md
+    - Securing the Signaling Path: guides/securing-the-signaling-path.md
+    - Running with Docker or Compose: guides/running-with-docker-or-compose.md
+    - Running on Kubernetes: guides/running-on-kubernetes.md
+    - Benchmarking: guides/benchmarking.md
 
 # Copyright
 copyright: 'Copyright © 2018 Fonoster Inc'