diff --git a/docs/source/flytekit.rst b/docs/source/flytekit.rst
index dbf6a3a326..b982badef6 100644
--- a/docs/source/flytekit.rst
+++ b/docs/source/flytekit.rst
@@ -2,8 +2,3 @@
    :no-members:
    :no-inherited-members:
    :no-special-members:
-
-.. automodule:: flytekit.core
-   :no-members:
-   :no-inherited-members:
-   :no-special-members:
diff --git a/flytekit/__init__.py b/flytekit/__init__.py
index 249f87b71f..2e84c8a6a0 100644
--- a/flytekit/__init__.py
+++ b/flytekit/__init__.py
@@ -52,12 +52,11 @@
    TaskMetadata - Wrapper object that allows users to specify Task
    Resources - Things like CPUs/Memory, etc.
    WorkflowFailurePolicy - Customizes what happens when a workflow fails.
-   dynamic
 
 
 Dynamic and Nested Workflows
 ==============================
-Please see the :py:mod:`Dynamic <flytekit.core.dynamic_workflow_task>` module for more information as well.
+See the :py:mod:`Dynamic <flytekit.core.dynamic_workflow_task>` module for more information.
 
 .. autosummary::
    :nosignatures:
@@ -67,9 +66,9 @@
 
 Scheduling and Notifications
 ============================
-:py:mod:`Notifications Module <flytekit.core.notification>`
 
-:py:mod:`Schedules Module <flytekit.core.schedule>`
+See the :py:mod:`Notifications Module <flytekit.core.notification>` and
+:py:mod:`Schedules Module <flytekit.core.schedule>` for more information.
 
 .. autosummary::
    :nosignatures:
@@ -118,6 +117,17 @@
    Secret
    SecurityContext
 
+Core Modules
+=============
+
+.. autosummary::
+   :nosignatures:
+   :toctree: generated/
+
+   core.dynamic_workflow_task
+   core.notification
+   core.schedule
+
 """