diff --git a/doc/greet-json.rst b/docs/source/examples/greet-json.rst
similarity index 100%
rename from doc/greet-json.rst
rename to docs/source/examples/greet-json.rst
diff --git a/doc/upload.rst b/docs/source/examples/upload.rst
similarity index 100%
rename from doc/upload.rst
rename to docs/source/examples/upload.rst
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 23f2cbb..cd47276 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -1,23 +1,25 @@
-.. include:: ../../README.rst
+.. toctree::
+   :maxdepth: 2
+   :caption: Setup
+
+   setup/install-and-configure
 
 .. toctree::
    :maxdepth: 2
-   :caption: TODO
-
-   install
-   quickstart
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Example
+   :caption: Examples
 
    examples/index
+   examples/greet-json
+   examples/upload
 
 .. toctree::
    :maxdepth: 2
-   :caption: Tutorial
+   :caption: Theory
 
-   tutorial
+   theory/interfaces
+   theory/philosophy
+   theory/request_life_cycle
+   theory/resource_tree
 
 
 
diff --git a/doc/install-and-configure.rst b/docs/source/setup/install-and-configure.rst
similarity index 100%
rename from doc/install-and-configure.rst
rename to docs/source/setup/install-and-configure.rst