diff --git a/docs/api/concepts.rst b/docs/api/architecture.rst
similarity index 97%
rename from docs/api/concepts.rst
rename to docs/api/architecture.rst
index 9c542777..b0789f49 100644
--- a/docs/api/concepts.rst
+++ b/docs/api/architecture.rst
@@ -1,8 +1,8 @@
 .. _concepts:
 
-*************************
-Architecture and concepts
-*************************
+************
+Architecture
+************
 
 The overall architecture of Mopidy is organized around multiple frontends and
 backends. The frontends use the core API. The core actor makes multiple backends
diff --git a/docs/api/index.rst b/docs/api/index.rst
index b19d9e21..3a79af5d 100644
--- a/docs/api/index.rst
+++ b/docs/api/index.rst
@@ -10,20 +10,50 @@ API reference
     extensions.
 
 
-.. toctree::
-    :glob:
+Concepts
+========
 
-    concepts
+.. toctree::
+
+    architecture
     models
+
+
+Basics
+======
+
+.. toctree::
+
     core
     frontend
     backend
-    audio
-    mixer
-    commands
     ext
-    config
-    zeroconf
+
+
+Web/JavaScript
+==============
+
+.. toctree::
+
     http-server
     http
     js
+
+
+Audio
+=====
+
+.. toctree::
+
+    audio
+    mixer
+
+
+Utilities
+=========
+
+.. toctree::
+
+    config
+    commands
+    zeroconf