diff --git a/doc/buildbot.rst b/doc/dev/buildbot.rst
similarity index 100%
rename from doc/buildbot.rst
rename to doc/dev/buildbot.rst
diff --git a/doc/index.rst b/doc/index.rst
index 85231537cd9..25da881ae86 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -41,8 +41,8 @@ Publishing Datasets
 
    loading_data
    authorization
-   file-upload
-   datastore
+   storage/filestore
+   storage/datastore
 
 The CKAN API
 ============
@@ -72,6 +72,7 @@ For CKAN Developers
    :maxdepth: 2
 
    test
+   dev/buildbot
 
 Other material
 ==============
diff --git a/doc/datastore.rst b/doc/storage/datastore.rst
similarity index 100%
rename from doc/datastore.rst
rename to doc/storage/datastore.rst
diff --git a/doc/file-upload.rst b/doc/storage/filestore.rst
similarity index 100%
rename from doc/file-upload.rst
rename to doc/storage/filestore.rst