diff --git a/doc/documentation.rst b/doc/contributors/documentation.rst
similarity index 100%
rename from doc/documentation.rst
rename to doc/contributors/documentation.rst
diff --git a/doc/contributing.rst b/doc/contributors/guidelines.rst
similarity index 84%
rename from doc/contributing.rst
rename to doc/contributors/guidelines.rst
index d94f2e6..862e9d7 100644
--- a/doc/contributing.rst
+++ b/doc/contributors/guidelines.rst
@@ -1,7 +1,7 @@
 
 
-Contributing to Autocmake
-=========================
+Contributing guidelines
+=======================
 
 Please follow the excellent guide: http://www.contribution-guide.org.
 
diff --git a/doc/testing.rst b/doc/contributors/testing.rst
similarity index 100%
rename from doc/testing.rst
rename to doc/contributors/testing.rst
diff --git a/doc/customizing-modules.rst b/doc/developers/customizing-modules.rst
similarity index 100%
rename from doc/customizing-modules.rst
rename to doc/developers/customizing-modules.rst
diff --git a/doc/autocmake-users-faq.rst b/doc/developers/faq.rst
similarity index 100%
rename from doc/autocmake-users-faq.rst
rename to doc/developers/faq.rst
diff --git a/doc/new-project.rst b/doc/developers/new-project.rst
similarity index 100%
rename from doc/new-project.rst
rename to doc/developers/new-project.rst
diff --git a/doc/updating-modules.rst b/doc/developers/updating-modules.rst
similarity index 100%
rename from doc/updating-modules.rst
rename to doc/developers/updating-modules.rst
diff --git a/doc/about.rst b/doc/general/about.rst
similarity index 100%
rename from doc/about.rst
rename to doc/general/about.rst
diff --git a/doc/index.rst b/doc/index.rst
index 44fc041..778c869 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -10,7 +10,7 @@ General
 .. toctree::
    :maxdepth: 2
 
-   about.rst
+   general/about.rst
 
 
 For developers who use Autocmake
@@ -19,10 +19,10 @@ For developers who use Autocmake
 .. toctree::
    :maxdepth: 2
 
-   autocmake-users-faq.rst
-   new-project.rst
-   customizing-modules.rst
-   updating-modules.rst
+   developers/faq.rst
+   developers/new-project.rst
+   developers/customizing-modules.rst
+   developers/updating-modules.rst
 
 
 For users of projects which use Autocmake
@@ -35,9 +35,9 @@ For developers/contributors to Autocmake
 .. toctree::
    :maxdepth: 2
 
-   contributing.rst
-   testing.rst
-   documentation.rst
+   contributors/guidelines.rst
+   contributors/testing.rst
+   contributors/documentation.rst
 
 
 Reference