diff --git a/docs/base/fs.rst b/docs/api/base/fs.rst
similarity index 100%
rename from docs/base/fs.rst
rename to docs/api/base/fs.rst
diff --git a/docs/base/index.rst b/docs/api/base/index.rst
similarity index 98%
rename from docs/base/index.rst
rename to docs/api/base/index.rst
index d80e702..c17d336 100644
--- a/docs/base/index.rst
+++ b/docs/api/base/index.rst
@@ -7,9 +7,9 @@ and handles the gather, sorting and running of tasks.
 
 .. toctree::
    :maxdepth: 2
+   :glob:
 
-   fs
-   pkg
+   *
 
 Bootstrap information
 ---------------------
diff --git a/docs/base/pkg.rst b/docs/api/base/pkg.rst
similarity index 100%
rename from docs/base/pkg.rst
rename to docs/api/base/pkg.rst
diff --git a/docs/common/fs.rst b/docs/api/common/fs.rst
similarity index 100%
rename from docs/common/fs.rst
rename to docs/api/common/fs.rst
diff --git a/docs/common/index.rst b/docs/api/common/index.rst
similarity index 100%
rename from docs/common/index.rst
rename to docs/api/common/index.rst
diff --git a/docs/common/tasks/index.rst b/docs/api/common/tasks/index.rst
similarity index 100%
rename from docs/common/tasks/index.rst
rename to docs/api/common/tasks/index.rst
diff --git a/docs/api/index.rst b/docs/api/index.rst
new file mode 100644
index 0000000..1c7c3c7
--- /dev/null
+++ b/docs/api/index.rst
@@ -0,0 +1,9 @@
+API
+===
+
+
+.. toctree::
+   :maxdepth: 2
+
+   base/index
+   common/index
diff --git a/docs/index.rst b/docs/index.rst
index 5413191..a27b43c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -11,10 +11,10 @@ Contents:
 .. toctree::
    :maxdepth: 2
 
-   base/index
-   common/index
-   plugins/index
    providers/index
+   plugins/index
+
+   api/index
    guidelines
    taskoverview
    howitworks