diff --git a/doc/api/index.rst b/doc/api/index.rst
new file mode 100644
index 0000000..7a8fea3
--- /dev/null
+++ b/doc/api/index.rst
@@ -0,0 +1,14 @@
+Classes and Functions
+=====================
+
+.. toctree::
+   :maxdepth: 2
+
+   api
+   request_and_response
+   status
+   errors
+   middleware
+   hooks
+   routing
+   util
\ No newline at end of file
diff --git a/doc/changes/index.rst b/doc/changes/index.rst
new file mode 100644
index 0000000..75a90a7
--- /dev/null
+++ b/doc/changes/index.rst
@@ -0,0 +1,6 @@
+Changelogs
+==========
+
+.. toctree::
+
+   0.2.0 <0.2.0>
\ No newline at end of file
diff --git a/doc/community/index.rst b/doc/community/index.rst
new file mode 100644
index 0000000..444c963
--- /dev/null
+++ b/doc/community/index.rst
@@ -0,0 +1,9 @@
+Community Guide
+===============
+
+.. toctree::
+   :maxdepth: 1
+
+   help
+   contribute
+   faq
\ No newline at end of file
diff --git a/doc/index.rst b/doc/index.rst
index 7b7756a..d62667a 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -80,48 +80,13 @@ Resources
 - `An Unladen Web Framework <http://blog.kgriffs.com/2013/07/02/python-fast-web-service-framework.html>`_
 - `The Definitive Introduction to Falcon <https://speakerdeck.com/cabrera/the-definitive-introduction-to-falcon>`_
 
-Community Guide
----------------
-
-.. toctree::
-   :maxdepth: 1
-
-   community/help
-   community/contribute
-   community/faq
-
-
-User Guide
-----------
+Documentation
+-------------
 
 .. toctree::
    :maxdepth: 2
 
-   user/intro
-   user/install
-   user/quickstart
-   user/tutorial
-
-
-Classes and Functions
----------------------
-
-.. toctree::
-   :maxdepth: 2
-
-   api/api
-   api/request_and_response
-   api/status
-   api/errors
-   api/middleware
-   api/hooks
-   api/routing
-   api/util
-
-Changelogs
-----------
-
-.. toctree::
-   :glob:
-
-   changes/*
+   community/index
+   user/index
+   api/index
+   changes/index
diff --git a/doc/user/index.rst b/doc/user/index.rst
new file mode 100644
index 0000000..c920e4e
--- /dev/null
+++ b/doc/user/index.rst
@@ -0,0 +1,10 @@
+User Guide
+==========
+
+.. toctree::
+   :maxdepth: 2
+
+   intro
+   install
+   quickstart
+   tutorial
\ No newline at end of file