diff --git a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py
index 9c25f78b5905..1eda813a4c62 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py
@@ -91,7 +91,7 @@ def from_connection_string(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_create_client_async.py
+            .. literalinclude:: ../samples/async_samples/sample_create_client_async.py
                 :start-after: [START create_table_client]
                 :end-before: [END create_table_client]
                 :language: python
@@ -208,7 +208,7 @@ async def create_table(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_create_delete_table_async.py
+            .. literalinclude:: ../samples/async_samples/sample_create_delete_table_async.py
                 :start-after: [START create_table]
                 :end-before: [END create_table]
                 :language: python
@@ -236,7 +236,7 @@ async def delete_table(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_create_delete_table_async.py
+            .. literalinclude:: ../samples/async_samples/sample_create_delete_table_async.py
                 :start-after: [START delete_table]
                 :end-before: [END delete_table]
                 :language: python
@@ -269,7 +269,7 @@ async def delete_entity(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_insert_delete_entities_async.py
+            .. literalinclude:: ../samples/async_samples/sample_insert_delete_entities_async.py
                 :start-after: [START delete_entity]
                 :end-before: [END delete_entity]
                 :language: python
@@ -305,7 +305,7 @@ async def create_entity(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_insert_delete_entities_async.py
+            .. literalinclude:: ../samples/async_samples/sample_insert_delete_entities_async.py
                 :start-after: [START create_entity]
                 :end-before: [END create_entity]
                 :language: python
@@ -354,7 +354,7 @@ async def update_entity(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_update_upsert_merge_entities_async.py
+            .. literalinclude:: ../samples/async_samples/sample_update_upsert_merge_entities_async.py
                 :start-after: [START update_entity]
                 :end-before: [END update_entity]
                 :language: python
@@ -409,7 +409,7 @@ def list_entities(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_update_upsert_merge_entities_async.py
+            .. literalinclude:: ../samples/async_samples/sample_update_upsert_merge_entities_async.py
                 :start-after: [START list_entities]
                 :end-before: [END list_entities]
                 :language: python
@@ -449,7 +449,7 @@ def query_entities(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_query_table_async.py
+            .. literalinclude:: ../samples/async_samples/sample_query_table_async.py
                 :start-after: [START query_entities]
                 :end-before: [END query_entities]
                 :language: python
@@ -494,7 +494,7 @@ async def get_entity(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_update_upsert_merge_entities.py
+            .. literalinclude:: ../samples/async_samples/sample_update_upsert_merge_entities_async.py
                 :start-after: [START get_entity]
                 :end-before: [END get_entity]
                 :language: python
@@ -532,7 +532,7 @@ async def upsert_entity(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_update_upsert_merge_entities_async.py
+            .. literalinclude:: ../samples/async_samples/sample_update_upsert_merge_entities_async.py
                 :start-after: [START upsert_entity]
                 :end-before: [END upsert_entity]
                 :language: python
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py
index 202b81bd1718..58473b233e26 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py
@@ -54,14 +54,14 @@ class TableServiceClient(AsyncStorageAccountHostsMixin, TableServiceClientBase):
 
     .. admonition:: Example:
 
-        .. literalinclude:: ../samples/sample_authentication_async.py
+        .. literalinclude:: ../samples/async_samples/sample_authentication_async.py
             :start-after: [START auth_from_shared_key]
             :end-before: [END auth_from_shared_key]
             :language: python
             :dedent: 8
             :caption: Creating the tableServiceClient with an account url and credential.
 
-        .. literalinclude:: ../samples/sample_authentication_async.py
+        .. literalinclude:: ../samples/async_samples/sample_authentication_async.py
             :start-after: [START auth_by_sas]
             :end-before: [END auth_by_sas]
             :language: python
@@ -101,12 +101,12 @@ def from_connection_string(
 
         .. admonition:: Example:
 
-        .. literalinclude:: ../samples/sample_authentication_async.py
-            :start-after: [START auth_from_connection_string]
-            :end-before: [END auth_from_connection_string]
-            :language: python
-            :dedent: 8
-            :caption: Creating the tableServiceClient from a connection string.
+            .. literalinclude:: ../samples/async_samples/sample_authentication_async.py
+                :start-after: [START auth_from_connection_string]
+                :end-before: [END auth_from_connection_string]
+                :language: python
+                :dedent: 8
+                :caption: Creating the tableServiceClient from a connection string
 
         """
         account_url, credential = parse_connection_str(
@@ -204,7 +204,7 @@ async def create_table(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_create_delete_table_async.py
+            .. literalinclude:: ../samples/async_samples/sample_create_delete_table_async.py
                 :start-after: [START create_table]
                 :end-before: [END create_table]
                 :language: python
@@ -234,7 +234,7 @@ async def create_table_if_not_exists(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_create_delete_table_async.py
+            .. literalinclude:: ../samples/async_samples/sample_create_delete_table_async.py
                 :start-after: [START create_if_not_exists]
                 :end-before: [END create_if_not_exists]
                 :language: python
@@ -264,7 +264,7 @@ async def delete_table(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_create_delete_table_async.py
+            .. literalinclude:: ../samples/async_samples/sample_create_delete_table_async.py
                 :start-after: [START delete_table]
                 :end-before: [END delete_table]
                 :language: python
@@ -290,7 +290,7 @@ def list_tables(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_query_tables_async.py
+            .. literalinclude:: ../samples/async_samples/sample_query_tables_async.py
                 :start-after: [START tsc_list_tables]
                 :end-before: [END tsc_list_tables]
                 :language: python
@@ -330,7 +330,7 @@ def query_tables(
 
         .. admonition:: Example:
 
-            .. literalinclude:: ../samples/sample_query_tables_async.py
+            .. literalinclude:: ../samples/async_samples/sample_query_tables_async.py
                 :start-after: [START tsc_query_tables]
                 :end-before: [END tsc_query_tables]
                 :language: python