diff --git a/docs/Makefile b/docs/Makefile
index 412252b..5dd06fa 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -192,4 +192,7 @@ pseudoxml:
 	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
 
 rst:
-	sphinx-apidoc -f -o . ../pygal
+	sphinx-apidoc -f -o api ../pygal
+
+auto:
+	sphinx-autobuild . _build/html
diff --git a/docs/modules.rst b/docs/api/modules.rst
similarity index 100%
rename from docs/modules.rst
rename to docs/api/modules.rst
diff --git a/docs/pygal.graph.rst b/docs/api/pygal.graph.rst
similarity index 100%
rename from docs/pygal.graph.rst
rename to docs/api/pygal.graph.rst
diff --git a/docs/pygal.rst b/docs/api/pygal.rst
similarity index 100%
rename from docs/pygal.rst
rename to docs/api/pygal.rst
diff --git a/docs/pygal.test.rst b/docs/api/pygal.test.rst
similarity index 100%
rename from docs/pygal.test.rst
rename to docs/api/pygal.test.rst
diff --git a/docs/basic_customizations.rst b/docs/documentation/basic_customizations.rst
similarity index 100%
rename from docs/basic_customizations.rst
rename to docs/documentation/basic_customizations.rst
diff --git a/docs/builtin_styles.rst b/docs/documentation/builtin_styles.rst
similarity index 100%
rename from docs/builtin_styles.rst
rename to docs/documentation/builtin_styles.rst
diff --git a/docs/chart_types.rst b/docs/documentation/chart_types.rst
similarity index 100%
rename from docs/chart_types.rst
rename to docs/documentation/chart_types.rst
diff --git a/docs/custom_styles.rst b/docs/documentation/custom_styles.rst
similarity index 100%
rename from docs/custom_styles.rst
rename to docs/documentation/custom_styles.rst
diff --git a/docs/first_steps.rst b/docs/documentation/first_steps.rst
similarity index 100%
rename from docs/first_steps.rst
rename to docs/documentation/first_steps.rst
diff --git a/docs/documentation.rst b/docs/documentation/index.rst
similarity index 100%
rename from docs/documentation.rst
rename to docs/documentation/index.rst
diff --git a/docs/interpolations.rst b/docs/documentation/interpolations.rst
similarity index 100%
rename from docs/interpolations.rst
rename to docs/documentation/interpolations.rst
diff --git a/docs/metadata.rst b/docs/documentation/metadata.rst
similarity index 100%
rename from docs/metadata.rst
rename to docs/documentation/metadata.rst
diff --git a/docs/other_customizations.rst b/docs/documentation/other_customizations.rst
similarity index 100%
rename from docs/other_customizations.rst
rename to docs/documentation/other_customizations.rst
diff --git a/docs/parametric_styles.rst b/docs/documentation/parametric_styles.rst
similarity index 100%
rename from docs/parametric_styles.rst
rename to docs/documentation/parametric_styles.rst
diff --git a/docs/sparks.rst b/docs/documentation/sparks.rst
similarity index 100%
rename from docs/sparks.rst
rename to docs/documentation/sparks.rst
diff --git a/docs/styles.rst b/docs/documentation/styles.rst
similarity index 100%
rename from docs/styles.rst
rename to docs/documentation/styles.rst
diff --git a/docs/web.rst b/docs/documentation/web.rst
similarity index 100%
rename from docs/web.rst
rename to docs/documentation/web.rst
diff --git a/docs/index.rst b/docs/index.rst
index 2d12cf3..3715b77 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -100,15 +100,38 @@ Optional dependencies
 PNG output requires `CairoSVG <http://cairosvg.org/>`_, `tinycss <http://packages.python.org/tinycss/>`_ and `cssselect <http://packages.python.org/cssselect/>`_.
 Install those with ``pip install CairoSVG tinycss cssselect``.
 
-Unit testing needs `py.test <http://pytest.org/latest/>`_ or `nosetests <http://readthedocs.org/docs/nose/en/latest/>`_.
+Unit testing needs `py.test <http://pytest.org/latest/>`_ or `nosetests <http://readthedocs/org/docs/nose/en/latest/>`_.
 
 Visual testing is based on `flask <http://flask.pocoo.org/>`_.
 
-Contents:
+
+Read more
+=========
 
 .. toctree::
    :maxdepth: 2
 
+   documentation/index
+   documentation/first_steps
+   documentation/chart_types
+   documentation/styles
+   documentation/basic_customizations
+   documentation/interpolations
+   documentation/sparks
+   documentation/metadata
+   documentation/other_customizations
+   documentation/builtin_styles
+   documentation/parametric_styles
+   documentation/custom_styles
+   documentation/web
+
+   download
+   support
+
+   api/modules
+   api/pygal
+   api/pygal.graph
+   api/pygal.test
 
 
 Indices and tables