diff --git a/doc/source/contributor/ref/forms.rst b/doc/source/contributor/ref/forms.rst
index f5b6a5b831..4360c015a7 100644
--- a/doc/source/contributor/ref/forms.rst
+++ b/doc/source/contributor/ref/forms.rst
@@ -24,12 +24,6 @@ Form Views
 .. automodule:: horizon.forms.views
     :members:
 
-Auth Forms
-==========
-
-.. automodule:: openstack_auth.forms
-   :members:
-
 Forms Javascript
 ================
 
diff --git a/doc/source/contributor/ref/index.rst b/doc/source/contributor/ref/index.rst
index ac79c258df..10b926150e 100644
--- a/doc/source/contributor/ref/index.rst
+++ b/doc/source/contributor/ref/index.rst
@@ -24,9 +24,6 @@ Auth API Reference
 
 .. toctree::
    :maxdepth: 2
+   :glob:
 
-   user
-   views
-   forms
-   backend
-   utils
+   openstack_auth/*
diff --git a/doc/source/contributor/ref/backend.rst b/doc/source/contributor/ref/openstack_auth/backend.rst
similarity index 100%
rename from doc/source/contributor/ref/backend.rst
rename to doc/source/contributor/ref/openstack_auth/backend.rst
diff --git a/doc/source/contributor/ref/openstack_auth/forms.rst b/doc/source/contributor/ref/openstack_auth/forms.rst
new file mode 100644
index 0000000000..120c21361c
--- /dev/null
+++ b/doc/source/contributor/ref/openstack_auth/forms.rst
@@ -0,0 +1,6 @@
+================
+The Forms Module
+================
+
+.. automodule:: openstack_auth.forms
+   :members:
diff --git a/doc/source/contributor/ref/user.rst b/doc/source/contributor/ref/openstack_auth/user.rst
similarity index 51%
rename from doc/source/contributor/ref/user.rst
rename to doc/source/contributor/ref/openstack_auth/user.rst
index f54587ca64..ff52172200 100644
--- a/doc/source/contributor/ref/user.rst
+++ b/doc/source/contributor/ref/openstack_auth/user.rst
@@ -1,6 +1,6 @@
-==============
-The User Class
-==============
+===============
+The User Module
+===============
 
 .. automodule:: openstack_auth.user
    :members:
diff --git a/doc/source/contributor/ref/utils.rst b/doc/source/contributor/ref/openstack_auth/utils.rst
similarity index 100%
rename from doc/source/contributor/ref/utils.rst
rename to doc/source/contributor/ref/openstack_auth/utils.rst
diff --git a/doc/source/contributor/ref/views.rst b/doc/source/contributor/ref/openstack_auth/views.rst
similarity index 100%
rename from doc/source/contributor/ref/views.rst
rename to doc/source/contributor/ref/openstack_auth/views.rst