diff --git a/api-guide/source/index.rst b/api-guide/source/index.rst
index 779b65bf5..e9a8f78b2 100644
--- a/api-guide/source/index.rst
+++ b/api-guide/source/index.rst
@@ -9,8 +9,6 @@ Contents
    secret_metadata
    containers
    acls
-   pkcs11keygeneration
-   dogtag_setup
    quotas
    consumers
    orders
diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst
index 5c9e7b862..29b3a2f62 100644
--- a/doc/source/admin/index.rst
+++ b/doc/source/admin/index.rst
@@ -9,7 +9,8 @@ management of secrets.
 .. toctree::
    :maxdepth: 1
 
-   access_control.rst
-   barbican_manage.rst
-   database_cleaning.rst
-   upgrade.rst
+   access_control
+   barbican_manage
+   database_cleaning
+   upgrade
+   pkcs11keygeneration
diff --git a/api-guide/source/pkcs11keygeneration.rst b/doc/source/admin/pkcs11keygeneration.rst
similarity index 100%
rename from api-guide/source/pkcs11keygeneration.rst
rename to doc/source/admin/pkcs11keygeneration.rst
diff --git a/api-guide/source/dogtag_setup.rst b/doc/source/configuration/dogtag_setup.rst
similarity index 100%
rename from api-guide/source/dogtag_setup.rst
rename to doc/source/configuration/dogtag_setup.rst
diff --git a/doc/source/configuration/index.rst b/doc/source/configuration/index.rst
index fa1bd36cb..59ee4862b 100644
--- a/doc/source/configuration/index.rst
+++ b/doc/source/configuration/index.rst
@@ -4,10 +4,11 @@ Setting up Barbican
 .. toctree::
    :maxdepth: 1
 
-   keystone.rst
-   troubleshooting.rst
-   noauth.rst
-   audit.rst
-   plugin_backends.rst
-   config.rst
-   policy.rst
+   keystone
+   troubleshooting
+   noauth
+   audit
+   plugin_backends
+   config
+   policy
+   dogtag_setup