diff --git a/doc/source/api/accounting.rst b/doc/source/api/accounting.rst
index db280a40959558f3f3768a3e5577b24e75fb9216..845b63952d36e2f1de2d2b028e2d1c6d3507a904 100644
--- a/doc/source/api/accounting.rst
+++ b/doc/source/api/accounting.rst
@@ -1,67 +1,77 @@
-accounting Package
+accounting package
 ==================
 
-:mod:`accounting` Package
--------------------------
+Subpackages
+-----------
 
-.. automodule:: accounting
-    :members:
-    :undoc-members:
-    :show-inheritance:
+.. toctree::
+
+    accounting.storage
 
-:mod:`client` Module
---------------------
+Submodules
+----------
+
+accounting.client module
+------------------------
 
 .. automodule:: accounting.client
     :members:
     :undoc-members:
     :show-inheritance:
 
-:mod:`config` Module
---------------------
+accounting.config module
+------------------------
 
 .. automodule:: accounting.config
     :members:
     :undoc-members:
     :show-inheritance:
 
-:mod:`decorators` Module
-------------------------
+accounting.decorators module
+----------------------------
 
 .. automodule:: accounting.decorators
     :members:
     :undoc-members:
     :show-inheritance:
 
-:mod:`exceptions` Module
-------------------------
+accounting.exceptions module
+----------------------------
 
 .. automodule:: accounting.exceptions
     :members:
     :undoc-members:
     :show-inheritance:
 
-:mod:`models` Module
---------------------
+accounting.models module
+------------------------
 
 .. automodule:: accounting.models
     :members:
     :undoc-members:
     :show-inheritance:
 
-:mod:`transport` Module
------------------------
+accounting.transport module
+---------------------------
 
 .. automodule:: accounting.transport
     :members:
     :undoc-members:
     :show-inheritance:
 
-:mod:`web` Module
------------------
+accounting.web module
+---------------------
 
 .. automodule:: accounting.web
     :members:
     :undoc-members:
     :show-inheritance:
 
+
+Module contents
+---------------
+
+.. automodule:: accounting
+    :members:
+    :undoc-members:
+    :show-inheritance: