diff --git a/docs/source/modules/musicbrainzapi.api.authenticate.rst b/docs/source/modules/musicbrainzapi.api.authenticate.rst
deleted file mode 100644
index 805ba56..0000000
--- a/docs/source/modules/musicbrainzapi.api.authenticate.rst
+++ /dev/null
@@ -1,10 +0,0 @@
- .. include:: ../global.rst
-
-musicbrainzapi.api.authenticate :modname:`musicbrainzapi.api.authenticate module`
-------------------------------------------------------------------------------------------
-
-.. automodule:: musicbrainzapi.api.authenticate
-   :members:
-   :undoc-members:
-   :show-inheritance:
-   :private-members:
diff --git a/docs/source/modules/musicbrainzapi.api.lyrics.builder.rst b/docs/source/modules/musicbrainzapi.api.lyrics.builder.rst
deleted file mode 100644
index 38d5e4b..0000000
--- a/docs/source/modules/musicbrainzapi.api.lyrics.builder.rst
+++ /dev/null
@@ -1,10 +0,0 @@
- .. include:: ../global.rst
-
-musicbrainzapi.api.lyrics.builder :modname:`musicbrainzapi.api.lyrics.builder`
--------------------------------------------------------------------------------
-
-.. automodule:: musicbrainzapi.api.lyrics.builder
-   :members:
-   :undoc-members:
-   :show-inheritance:
-   :private-members:
diff --git a/docs/source/modules/musicbrainzapi.api.lyrics.concrete_builder.rst b/docs/source/modules/musicbrainzapi.api.lyrics.concrete_builder.rst
deleted file mode 100644
index 4acc336..0000000
--- a/docs/source/modules/musicbrainzapi.api.lyrics.concrete_builder.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. include:: ../global.rst
-
-musicbrainzapi.api.lyrics.concrete_builder :modname:`musicbrainzapi.api.lyrics.concrete_builder`
--------------------------------------------------------------------------------------------------
-
-.. automodule:: musicbrainzapi.api.lyrics.concrete_builder
-   :members:
-   :undoc-members:
-   :show-inheritance:
-   :private-members:
diff --git a/docs/source/modules/musicbrainzapi.api.lyrics.director.rst b/docs/source/modules/musicbrainzapi.api.lyrics.director.rst
deleted file mode 100644
index f5dc1d2..0000000
--- a/docs/source/modules/musicbrainzapi.api.lyrics.director.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-musicbrainzapi.api.lyrics.director
--------------------------------------
-
-.. automodule:: musicbrainzapi.api.lyrics.director
-   :members:
-   :undoc-members:
-   :show-inheritance:
-   :private-members:
diff --git a/docs/source/modules/musicbrainzapi.api.lyrics.rst b/docs/source/modules/musicbrainzapi.api.lyrics.rst
index 28bda3e..4ba0104 100644
--- a/docs/source/modules/musicbrainzapi.api.lyrics.rst
+++ b/docs/source/modules/musicbrainzapi.api.lyrics.rst
@@ -8,7 +8,10 @@ musicbrainzapi.api.lyrics package
     :private-members:
 
 Submodules
-==========
+----------
+
+musicbrainzapi.api.lyrics.builder module
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. automodule:: musicbrainzapi.api.lyrics.builder
     :members:
@@ -16,12 +19,18 @@ Submodules
     :show-inheritance:
     :private-members:
 
+musicbrainzapi.api.lyrics.concrete_builder module
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 .. automodule:: musicbrainzapi.api.lyrics.concrete_builder
     :members:
     :undoc-members:
     :show-inheritance:
     :private-members:
 
+musicbrainzapi.api.lyrics.director module
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 .. automodule:: musicbrainzapi.api.lyrics.director
     :members:
     :undoc-members:
diff --git a/docs/source/modules/musicbrainzapi.api.rst b/docs/source/modules/musicbrainzapi.api.rst
index d0080a9..9df8cfe 100644
--- a/docs/source/modules/musicbrainzapi.api.rst
+++ b/docs/source/modules/musicbrainzapi.api.rst
@@ -8,16 +8,18 @@ musicbrainzapi.api package
     :private-members:
 
 Subpackages
-===========
+-----------
 
 .. toctree::
+    :maxdepth: 1
+
     musicbrainzapi.api.lyrics
 
 Submodules
-==========
+----------
 
-musicbrainzapi.api.authenticate
--------------------------------
+musicbrainzapi.api.authenticate module
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. automodule:: musicbrainzapi.api.authenticate
     :members:
diff --git a/docs/source/modules/musicbrainzapi.rst b/docs/source/modules/musicbrainzapi.rst
index d6e76ac..109766f 100644
--- a/docs/source/modules/musicbrainzapi.rst
+++ b/docs/source/modules/musicbrainzapi.rst
@@ -7,10 +7,13 @@ musicbrainzapi
    :show-inheritance:
    :private-members:
 
+
 Subpackages
-===========
+-----------
 
 .. toctree::
+    :maxdepth: 1
+
     musicbrainzapi.api
     musicbrainzapi.wordcloud