diff --git a/.gitignore b/.gitignore
index 4b04b5b..00631e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,6 @@ output/*/index.html
 
 # Sphinx
 doc/build
-doc/source/api
 
 # pbr generates these
 AUTHORS
diff --git a/doc/source/api/almanachclient.exceptions.rst b/doc/source/api/almanachclient.exceptions.rst
new file mode 100644
index 0000000..ad27b08
--- /dev/null
+++ b/doc/source/api/almanachclient.exceptions.rst
@@ -0,0 +1,7 @@
+The :mod:`almanachclient.exceptions` Module
+===========================================
+
+.. automodule:: almanachclient.exceptions
+  :members:
+  :undoc-members:
+  :show-inheritance:
diff --git a/doc/source/api/almanachclient.http_client.rst b/doc/source/api/almanachclient.http_client.rst
new file mode 100644
index 0000000..54f1375
--- /dev/null
+++ b/doc/source/api/almanachclient.http_client.rst
@@ -0,0 +1,7 @@
+The :mod:`almanachclient.http_client` Module
+============================================
+
+.. automodule:: almanachclient.http_client
+  :members:
+  :undoc-members:
+  :show-inheritance:
diff --git a/doc/source/api/almanachclient.keystone_client.rst b/doc/source/api/almanachclient.keystone_client.rst
new file mode 100644
index 0000000..6e50418
--- /dev/null
+++ b/doc/source/api/almanachclient.keystone_client.rst
@@ -0,0 +1,7 @@
+The :mod:`almanachclient.keystone_client` Module
+================================================
+
+.. automodule:: almanachclient.keystone_client
+  :members:
+  :undoc-members:
+  :show-inheritance:
diff --git a/doc/source/api/almanachclient.shell.rst b/doc/source/api/almanachclient.shell.rst
new file mode 100644
index 0000000..61f5858
--- /dev/null
+++ b/doc/source/api/almanachclient.shell.rst
@@ -0,0 +1,7 @@
+The :mod:`almanachclient.shell` Module
+======================================
+
+.. automodule:: almanachclient.shell
+  :members:
+  :undoc-members:
+  :show-inheritance:
diff --git a/doc/source/api/almanachclient.v1.client.rst b/doc/source/api/almanachclient.v1.client.rst
new file mode 100644
index 0000000..a40b0b8
--- /dev/null
+++ b/doc/source/api/almanachclient.v1.client.rst
@@ -0,0 +1,7 @@
+The :mod:`almanachclient.v1.client` Module
+==========================================
+
+.. automodule:: almanachclient.v1.client
+  :members:
+  :undoc-members:
+  :show-inheritance:
diff --git a/doc/source/api/almanachclient.version.rst b/doc/source/api/almanachclient.version.rst
new file mode 100644
index 0000000..734c8df
--- /dev/null
+++ b/doc/source/api/almanachclient.version.rst
@@ -0,0 +1,7 @@
+The :mod:`almanachclient.version` Module
+========================================
+
+.. automodule:: almanachclient.version
+  :members:
+  :undoc-members:
+  :show-inheritance:
diff --git a/doc/source/api/autoindex.rst b/doc/source/api/autoindex.rst
new file mode 100644
index 0000000..9e5975d
--- /dev/null
+++ b/doc/source/api/autoindex.rst
@@ -0,0 +1,6 @@
+.. toctree::
+   :maxdepth: 1
+
+   almanachclient.exceptions.rst
+   almanachclient.keystone_client.rst
+   almanachclient.v1.client.rst