diff --git a/doc/sphinx/ref/azure.storage.blob.aio.rst b/doc/sphinx/ref/azure.storage.blob.aio.rst
new file mode 100644
index 000000000000..2a8b6aa79f70
--- /dev/null
+++ b/doc/sphinx/ref/azure.storage.blob.aio.rst
@@ -0,0 +1,54 @@
+azure.storage.blob.aio package
+==============================
+
+Submodules
+----------
+
+azure.storage.blob.aio.blob\_client\_async module
+-------------------------------------------------
+
+.. automodule:: azure.storage.blob.aio.blob_client_async
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+azure.storage.blob.aio.blob\_service\_client\_async module
+----------------------------------------------------------
+
+.. automodule:: azure.storage.blob.aio.blob_service_client_async
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+azure.storage.blob.aio.container\_client\_async module
+------------------------------------------------------
+
+.. automodule:: azure.storage.blob.aio.container_client_async
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+azure.storage.blob.aio.lease\_async module
+------------------------------------------
+
+.. automodule:: azure.storage.blob.aio.lease_async
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+azure.storage.blob.aio.models module
+------------------------------------
+
+.. automodule:: azure.storage.blob.aio.models
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: azure.storage.blob.aio
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/doc/sphinx/ref/azure.storage.blob.rst b/doc/sphinx/ref/azure.storage.blob.rst
index 792501192d43..bdb39a3a496e 100644
--- a/doc/sphinx/ref/azure.storage.blob.rst
+++ b/doc/sphinx/ref/azure.storage.blob.rst
@@ -1,6 +1,13 @@
 azure.storage.blob package
 ==========================
 
+Subpackages
+-----------
+
+.. toctree::
+
+   azure.storage.blob.aio
+
 Submodules
 ----------
 
@@ -44,14 +51,6 @@ azure.storage.blob.models module
    :undoc-members:
    :show-inheritance:
 
-azure.storage.blob.polling module
----------------------------------
-
-.. automodule:: azure.storage.blob.polling
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 azure.storage.blob.version module
 ---------------------------------
 
diff --git a/doc/sphinx/ref/azure.storage.file.aio.rst b/doc/sphinx/ref/azure.storage.file.aio.rst
new file mode 100644
index 000000000000..39209bacdee4
--- /dev/null
+++ b/doc/sphinx/ref/azure.storage.file.aio.rst
@@ -0,0 +1,54 @@
+azure.storage.file.aio package
+==============================
+
+Submodules
+----------
+
+azure.storage.file.aio.directory\_client\_async module
+------------------------------------------------------
+
+.. automodule:: azure.storage.file.aio.directory_client_async
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+azure.storage.file.aio.file\_client\_async module
+-------------------------------------------------
+
+.. automodule:: azure.storage.file.aio.file_client_async
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+azure.storage.file.aio.file\_service\_client\_async module
+----------------------------------------------------------
+
+.. automodule:: azure.storage.file.aio.file_service_client_async
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+azure.storage.file.aio.models module
+------------------------------------
+
+.. automodule:: azure.storage.file.aio.models
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+azure.storage.file.aio.share\_client\_async module
+--------------------------------------------------
+
+.. automodule:: azure.storage.file.aio.share_client_async
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: azure.storage.file.aio
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/doc/sphinx/ref/azure.storage.file.rst b/doc/sphinx/ref/azure.storage.file.rst
index 0c81c1917b0d..61f0ceaef69e 100644
--- a/doc/sphinx/ref/azure.storage.file.rst
+++ b/doc/sphinx/ref/azure.storage.file.rst
@@ -1,6 +1,13 @@
 azure.storage.file package
 ==========================
 
+Subpackages
+-----------
+
+.. toctree::
+
+   azure.storage.file.aio
+
 Submodules
 ----------
 
@@ -36,14 +43,6 @@ azure.storage.file.models module
    :undoc-members:
    :show-inheritance:
 
-azure.storage.file.polling module
----------------------------------
-
-.. automodule:: azure.storage.file.polling
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 azure.storage.file.share\_client module
 ---------------------------------------
 
diff --git a/doc/sphinx/ref/azure.storage.queue.aio.rst b/doc/sphinx/ref/azure.storage.queue.aio.rst
new file mode 100644
index 000000000000..639ea94f0256
--- /dev/null
+++ b/doc/sphinx/ref/azure.storage.queue.aio.rst
@@ -0,0 +1,38 @@
+azure.storage.queue.aio package
+===============================
+
+Submodules
+----------
+
+azure.storage.queue.aio.models module
+-------------------------------------
+
+.. automodule:: azure.storage.queue.aio.models
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+azure.storage.queue.aio.queue\_client\_async module
+---------------------------------------------------
+
+.. automodule:: azure.storage.queue.aio.queue_client_async
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+azure.storage.queue.aio.queue\_service\_client\_async module
+------------------------------------------------------------
+
+.. automodule:: azure.storage.queue.aio.queue_service_client_async
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: azure.storage.queue.aio
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/doc/sphinx/ref/azure.storage.queue.rst b/doc/sphinx/ref/azure.storage.queue.rst
index 9814ad8a878b..13c80dc07718 100644
--- a/doc/sphinx/ref/azure.storage.queue.rst
+++ b/doc/sphinx/ref/azure.storage.queue.rst
@@ -1,6 +1,13 @@
 azure.storage.queue package
 ===========================
 
+Subpackages
+-----------
+
+.. toctree::
+
+   azure.storage.queue.aio
+
 Submodules
 ----------