diff --git a/docs/api/stix2.v20.bundle.rst b/docs/api/stix2.v20.bundle.rst
deleted file mode 100644
index bd2abd4..0000000
--- a/docs/api/stix2.v20.bundle.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-bundle
-================
-
-.. automodule:: stix2.v20.bundle
-   :members:
\ No newline at end of file
diff --git a/docs/api/stix2.v20.common.rst b/docs/api/stix2.v20.common.rst
deleted file mode 100644
index 8cec059..0000000
--- a/docs/api/stix2.v20.common.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-common
-================
-
-.. automodule:: stix2.v20.common
-   :members:
diff --git a/docs/api/stix2.v20.observables.rst b/docs/api/stix2.v20.observables.rst
deleted file mode 100644
index 4d9803a..0000000
--- a/docs/api/stix2.v20.observables.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-observables
-=====================
-
-.. automodule:: stix2.v20.observables
-   :members:
diff --git a/docs/api/stix2.v20.sdo.rst b/docs/api/stix2.v20.sdo.rst
deleted file mode 100644
index a115d5b..0000000
--- a/docs/api/stix2.v20.sdo.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-sdo
-=============
-
-.. automodule:: stix2.v20.sdo
-   :members:
diff --git a/docs/api/stix2.v20.sro.rst b/docs/api/stix2.v20.sro.rst
deleted file mode 100644
index 397cf29..0000000
--- a/docs/api/stix2.v20.sro.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-sro
-=============
-
-.. automodule:: stix2.v20.sro
-   :members:
diff --git a/docs/api/stix2.v21.bundle.rst b/docs/api/stix2.v21.bundle.rst
deleted file mode 100644
index da67082..0000000
--- a/docs/api/stix2.v21.bundle.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-bundle
-================
-
-.. automodule:: stix2.v21.bundle
-   :members:
\ No newline at end of file
diff --git a/docs/api/stix2.v21.common.rst b/docs/api/stix2.v21.common.rst
deleted file mode 100644
index b480481..0000000
--- a/docs/api/stix2.v21.common.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-common
-================
-
-.. automodule:: stix2.v21.common
-   :members:
\ No newline at end of file
diff --git a/docs/api/stix2.v21.observables.rst b/docs/api/stix2.v21.observables.rst
deleted file mode 100644
index 56f409a..0000000
--- a/docs/api/stix2.v21.observables.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-observables
-=====================
-
-.. automodule:: stix2.v21.observables
-   :members:
\ No newline at end of file
diff --git a/docs/api/stix2.v21.sdo.rst b/docs/api/stix2.v21.sdo.rst
deleted file mode 100644
index b1a568d..0000000
--- a/docs/api/stix2.v21.sdo.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-sdo
-=============
-
-.. automodule:: stix2.v21.sdo
-   :members:
\ No newline at end of file
diff --git a/docs/api/stix2.v21.sro.rst b/docs/api/stix2.v21.sro.rst
deleted file mode 100644
index 3532a37..0000000
--- a/docs/api/stix2.v21.sro.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-sro
-=============
-
-.. automodule:: stix2.v21.sro
-   :members:
\ No newline at end of file
diff --git a/stix2/__init__.py b/stix2/__init__.py
index 3bedec8..246ecaf 100644
--- a/stix2/__init__.py
+++ b/stix2/__init__.py
@@ -12,16 +12,8 @@
    patterns
    properties
    utils
-   v20.bundle
-   v20.common
-   v20.observables
-   v20.sdo
-   v20.sro
-   v21.bundle
-   v21.common
-   v21.observables
-   v21.sdo
-   v21.sro
+   v20
+   v21
    workbench
 
 """
diff --git a/stix2/v20/__init__.py b/stix2/v20/__init__.py
index bef7d66..4d0a98f 100644
--- a/stix2/v20/__init__.py
+++ b/stix2/v20/__init__.py
@@ -1,4 +1,16 @@
-"""STIX 2.0 API Objects."""
+"""STIX 2.0 API Objects.
+
+.. autosummary::
+   :toctree: v20
+
+   bundle
+   common
+   observables
+   sdo
+   sro
+
+|
+"""
 
 # flake8: noqa
 
diff --git a/stix2/v21/__init__.py b/stix2/v21/__init__.py
index 4a8fe29..c1caae4 100644
--- a/stix2/v21/__init__.py
+++ b/stix2/v21/__init__.py
@@ -1,4 +1,16 @@
-"""STIX 2.1 API Objects."""
+"""STIX 2.1 API Objects.
+
+.. autosummary::
+   :toctree: v21
+
+   bundle
+   common
+   observables
+   sdo
+   sro
+
+|
+"""
 
 # flake8: noqa