diff --git a/sites/docs/api/transport.rst b/sites/docs/api/transport.rst
index f68b77d..1b54f04 100644
--- a/sites/docs/api/transport.rst
+++ b/sites/docs/api/transport.rst
@@ -1,4 +1,4 @@
-Transport (core protocol)
-=========================
+Transport
+=========
 
 .. automodule:: paramiko.transport
diff --git a/sites/docs/index.rst b/sites/docs/index.rst
index 89c7583..bca0e65 100644
--- a/sites/docs/index.rst
+++ b/sites/docs/index.rst
@@ -5,7 +5,46 @@ This site covers Paramiko's usage & API documentation. For basic info on what
 Paramiko is, including its public changelog & how the project is maintained,
 please see `the main website <http://paramiko.org>`_.
 
-.. toctree::
-    :glob:
 
-    api/*
+API documentation
+=================
+
+Core SSH protocol classes
+-------------------------
+
+.. toctree::
+    api/channel
+    api/client
+    api/message
+    api/packet
+    api/transport
+
+
+Authentication & key handling
+-----------------------------
+
+.. toctree::
+    api/agent
+    api/hostkeys
+    api/keys
+    api/win_pageant
+
+
+Other primary functions
+-----------------------
+
+.. toctree::
+    api/config
+    api/proxy
+    api/server
+    api/sftp
+
+
+Miscellany
+----------
+
+.. toctree::
+    api/buffered_pipe
+    api/file
+    api/pipe
+    api/ssh_exception