diff --git a/docs/0.0.1/Makefile b/docs/Makefile
similarity index 100%
rename from docs/0.0.1/Makefile
rename to docs/Makefile
diff --git a/docs/0.0.1/source/app_engine.rst b/docs/source/app_engine.rst
similarity index 100%
rename from docs/0.0.1/source/app_engine.rst
rename to docs/source/app_engine.rst
diff --git a/docs/0.0.1/source/jsonify.rst b/docs/source/celery.rst
similarity index 100%
rename from docs/0.0.1/source/jsonify.rst
rename to docs/source/celery.rst
diff --git a/docs/0.0.1/source/conf.py b/docs/source/conf.py
similarity index 100%
rename from docs/0.0.1/source/conf.py
rename to docs/source/conf.py
diff --git a/docs/0.0.1/source/configuration.rst b/docs/source/configuration.rst
similarity index 100%
rename from docs/0.0.1/source/configuration.rst
rename to docs/source/configuration.rst
diff --git a/docs/0.0.1/source/routing.rst b/docs/source/databases.rst
similarity index 100%
rename from docs/0.0.1/source/routing.rst
rename to docs/source/databases.rst
diff --git a/docs/0.0.1/source/secure_controller.rst b/docs/source/deployment.rst
similarity index 100%
rename from docs/0.0.1/source/secure_controller.rst
rename to docs/source/deployment.rst
diff --git a/docs/0.0.1/source/hooks.rst b/docs/source/hooks.rst
similarity index 100%
rename from docs/0.0.1/source/hooks.rst
rename to docs/source/hooks.rst
diff --git a/docs/0.0.1/source/index.rst b/docs/source/index.rst
similarity index 87%
rename from docs/0.0.1/source/index.rst
rename to docs/source/index.rst
index 98e7e41..b8d4eef 100644
--- a/docs/0.0.1/source/index.rst
+++ b/docs/source/index.rst
@@ -14,15 +14,18 @@ Contents:
 
 .. toctree::
    :maxdepth: 2
-
+   
    installation.rst
-   routing.rst 
-   configuration.rst 
-   templates.rst 
-   hooks.rst 
-   jsonify.rst 
-   secure_controller.rst 
+   routing.rst
    validation_n_errors.rst
+   configuration.rst
+   commands.rst
+   templates.rst
+   rest.rst
+   secure_controller.rst
+   jsonify.rst
+   hooks.rst
+   testing.rst
 
 
 Introduction
@@ -60,34 +63,22 @@ WSGI server you want::
     httpserver.serve(app, host='0.0.0.0', port=8080)
 
 
-Tutorials
-=========
-We provide a couple of easy ways to get started including a short tutorial on
-App Engine.
+Cookbook
+========
+We provide a couple of easy ways to get started including a short
+tutorial on App Engine.
 
 .. toctree::
    :maxdepth: 2
 
    quick_start.rst 
    app_engine.rst
-
-
-API
-===
-The following section lists the main sections of Pecan, where you can find more
-specific details about methods and modules available.
-
-.. toctree::
-   :maxdepth: 2
-
-   decorators.rst 
-   hooks.rst 
-   jsonify.rst 
-   pecan.rst 
-   rest.rst 
-   routing.rst 
-   secure.rst
-   templating.rst
+   sessions.rst
+   celery.rst
+   databases.rst
+   deployment.rst
+   reporting.rst
+   
 
 License
 -------
diff --git a/docs/0.0.1/source/installation.rst b/docs/source/installation.rst
similarity index 100%
rename from docs/0.0.1/source/installation.rst
rename to docs/source/installation.rst
diff --git a/docs/0.0.1/source/templates.rst b/docs/source/jsonify.rst
similarity index 100%
rename from docs/0.0.1/source/templates.rst
rename to docs/source/jsonify.rst
diff --git a/docs/0.0.1/source/quick_start.rst b/docs/source/quick_start.rst
similarity index 100%
rename from docs/0.0.1/source/quick_start.rst
rename to docs/source/quick_start.rst
diff --git a/docs/0.0.1/source/validation_n_errors.rst b/docs/source/reporting.rst
similarity index 100%
rename from docs/0.0.1/source/validation_n_errors.rst
rename to docs/source/reporting.rst
diff --git a/docs/source/rest.rst b/docs/source/rest.rst
new file mode 100644
index 0000000..e69de29
diff --git a/docs/source/routing.rst b/docs/source/routing.rst
new file mode 100644
index 0000000..e69de29
diff --git a/docs/source/secure_controller.rst b/docs/source/secure_controller.rst
new file mode 100644
index 0000000..e69de29
diff --git a/docs/source/sessions.rst b/docs/source/sessions.rst
new file mode 100644
index 0000000..e69de29
diff --git a/docs/source/templates.rst b/docs/source/templates.rst
new file mode 100644
index 0000000..e69de29
diff --git a/docs/source/validation_n_errors.rst b/docs/source/validation_n_errors.rst
new file mode 100644
index 0000000..e69de29