diff --git a/doc/source/api/modules.rst b/doc/source/api/modules.rst
index 7331f9c2..89af6576 100644
--- a/doc/source/api/modules.rst
+++ b/doc/source/api/modules.rst
@@ -1,8 +1,36 @@
-Python API
-============
+MontePy API 
+===========
 
+Submodules
+----------
 
 .. toctree::
-   :maxdepth: 4
+   :maxdepth: 1
+
+   montepy.cell
+   montepy.cells
+   montepy.constants
+   montepy.errors
+   montepy.geometry_operators
+   montepy.materials
+   montepy.mcnp_object
+   montepy.mcnp_problem
+   montepy.numbered_mcnp_object
+   montepy.numbered_object_collection
+   montepy.particle
+   montepy.surface_collection
+   montepy.transforms
+   montepy.universe
+   montepy.universes
+   montepy.utilities
+
+Subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 2
+
+   montepy.data_inputs
+   montepy.input_parser
+   montepy.surfaces
 
-   montepy
diff --git a/doc/source/api/montepy.cell.rst b/doc/source/api/montepy.cell.rst
index f14acb8c..5b34b566 100644
--- a/doc/source/api/montepy.cell.rst
+++ b/doc/source/api/montepy.cell.rst
@@ -2,7 +2,7 @@ montepy.cell module
 ===================
 
 
-.. automodule:: montepy.cell
+.. autoclass:: montepy.cell.Cell
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/doc/source/api/montepy.data_inputs.rst b/doc/source/api/montepy.data_inputs.rst
index 96bdae1e..3471a48c 100644
--- a/doc/source/api/montepy.data_inputs.rst
+++ b/doc/source/api/montepy.data_inputs.rst
@@ -7,8 +7,6 @@ montepy.data\_inputs package
    :undoc-members:
    :show-inheritance:
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 4
diff --git a/doc/source/api/montepy.input_parser.rst b/doc/source/api/montepy.input_parser.rst
index fc837495..3c595b97 100644
--- a/doc/source/api/montepy.input_parser.rst
+++ b/doc/source/api/montepy.input_parser.rst
@@ -7,11 +7,8 @@ montepy.input\_parser package
    :undoc-members:
    :show-inheritance:
 
-Submodules
-----------
-
 .. toctree::
-   :maxdepth: 4
+   :maxdepth: 2
 
    montepy.input_parser.block_type
    montepy.input_parser.cell_parser
diff --git a/doc/source/api/montepy.surfaces.rst b/doc/source/api/montepy.surfaces.rst
index e66b4112..6f07c96e 100644
--- a/doc/source/api/montepy.surfaces.rst
+++ b/doc/source/api/montepy.surfaces.rst
@@ -7,11 +7,9 @@ montepy.surfaces package
    :undoc-members:
    :show-inheritance:
 
-Submodules
-----------
 
 .. toctree::
-   :maxdepth: 4
+   :maxdepth: 2
 
    montepy.surfaces.axis_plane
    montepy.surfaces.cylinder_on_axis