diff --git a/specification/automation/resource-manager/readme.typescript.md b/specification/automation/resource-manager/readme.typescript.md
index 045e54639f04..ea94ced0e8e2 100644
--- a/specification/automation/resource-manager/readme.typescript.md
+++ b/specification/automation/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-automation"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-automation"
+  output-folder: "$(typescript-sdks-folder)/sdk/automation/arm-automation"
   generate-metadata: true
 ```
diff --git a/specification/azurestack/resource-manager/readme.typescript.md b/specification/azurestack/resource-manager/readme.typescript.md
index 17fb1f326796..07a47ea5a2f3 100644
--- a/specification/azurestack/resource-manager/readme.typescript.md
+++ b/specification/azurestack/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-azurestack"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-azurestack"
+  output-folder: "$(typescript-sdks-folder)/sdk/azurestack/arm-azurestack"
   generate-metadata: true
 ```
diff --git a/specification/batch/resource-manager/readme.typescript.md b/specification/batch/resource-manager/readme.typescript.md
index f3c8e77215b2..26de4af5e50b 100644
--- a/specification/batch/resource-manager/readme.typescript.md
+++ b/specification/batch/resource-manager/readme.typescript.md
@@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-batch"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-batch"
+  output-folder: "$(typescript-sdks-folder)/sdk/batch/arm-batch"
   payload-flattening-threshold: 1
   generate-metadata: true
 ```
diff --git a/specification/batchai/resource-manager/readme.typescript.md b/specification/batchai/resource-manager/readme.typescript.md
index 13ca86de2aa9..0affbae266b4 100644
--- a/specification/batchai/resource-manager/readme.typescript.md
+++ b/specification/batchai/resource-manager/readme.typescript.md
@@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-batchai"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-batchai"
+  output-folder: "$(typescript-sdks-folder)/sdk/batchai/arm-batchai"
   payload-flattening-threshold: 1
   generate-metadata: true
 ```
diff --git a/specification/billing/resource-manager/readme.typescript.md b/specification/billing/resource-manager/readme.typescript.md
index 30bd7cb6ff66..42faf3d04bef 100644
--- a/specification/billing/resource-manager/readme.typescript.md
+++ b/specification/billing/resource-manager/readme.typescript.md
@@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-billing"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-billing"
+  output-folder: "$(typescript-sdks-folder)/sdk/billing/arm-billing"
   payload-flattening-threshold: 1
   generate-metadata: true
 ```
diff --git a/specification/cdn/resource-manager/readme.typescript.md b/specification/cdn/resource-manager/readme.typescript.md
index 5a3b29431ba2..bd2a17ef3bf2 100644
--- a/specification/cdn/resource-manager/readme.typescript.md
+++ b/specification/cdn/resource-manager/readme.typescript.md
@@ -9,6 +9,6 @@ typescript:
   license-header: MICROSOFT_MIT_NO_VERSION
   payload-flattening-threshold: 2
   package-name: "@azure/arm-cdn"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-cdn"
+  output-folder: "$(typescript-sdks-folder)/sdk/cdn/arm-cdn"
   generate-metadata: true
 ```
diff --git a/specification/consumption/resource-manager/readme.typescript.md b/specification/consumption/resource-manager/readme.typescript.md
index 96078aaff521..616ad88356e8 100644
--- a/specification/consumption/resource-manager/readme.typescript.md
+++ b/specification/consumption/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-consumption"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-consumption"
+  output-folder: "$(typescript-sdks-folder)/sdk/consumption/arm-consumption"
   generate-metadata: true
 ```
diff --git a/specification/containerinstance/resource-manager/readme.typescript.md b/specification/containerinstance/resource-manager/readme.typescript.md
index 7f4639a78bea..9829c1e2f88b 100644
--- a/specification/containerinstance/resource-manager/readme.typescript.md
+++ b/specification/containerinstance/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-containerinstance"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-containerinstance"
+  output-folder: "$(typescript-sdks-folder)/containerinstance/arm-containerinstance"
   generate-metadata: true
 ```
diff --git a/specification/customer-insights/resource-manager/readme.typescript.md b/specification/customer-insights/resource-manager/readme.typescript.md
index f44a643b65d7..3ac0ca83f6fc 100644
--- a/specification/customer-insights/resource-manager/readme.typescript.md
+++ b/specification/customer-insights/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-customerinsights"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-customerinsights"
+  output-folder: "$(typescript-sdks-folder)/sdk/customer-insights/arm-customerinsights"
   generate-metadata: true
 ```
diff --git a/specification/databox/resource-manager/readme.typescript.md b/specification/databox/resource-manager/readme.typescript.md
index 076a31c5f6e5..8e6f88e9699b 100644
--- a/specification/databox/resource-manager/readme.typescript.md
+++ b/specification/databox/resource-manager/readme.typescript.md
@@ -9,6 +9,6 @@ typescript:
   license-header: MICROSOFT_MIT_NO_VERSION
   payload-flattening-threshold: 2
   package-name: "@azure/arm-databox"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-databox"
+  output-folder: "$(typescript-sdks-folder)/sdk/databox/arm-databox"
   generate-metadata: true
 ```
diff --git a/specification/databricks/resource-manager/readme.typescript.md b/specification/databricks/resource-manager/readme.typescript.md
index c04eff734111..128250c7801b 100644
--- a/specification/databricks/resource-manager/readme.typescript.md
+++ b/specification/databricks/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-databricks"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-databricks"
+  output-folder: "$(typescript-sdks-folder)/sdk/databricks/arm-databricks"
   generate-metadata: true
 ```
diff --git a/specification/datacatalog/resource-manager/readme.typescript.md b/specification/datacatalog/resource-manager/readme.typescript.md
index 889229d00a1a..e6a31ff2e0d1 100644
--- a/specification/datacatalog/resource-manager/readme.typescript.md
+++ b/specification/datacatalog/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-datacatalog"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-datacatalog"
+  output-folder: "$(typescript-sdks-folder)/sdk/datacatalog/arm-datacatalog"
   generate-metadata: true
 ```
diff --git a/specification/datafactory/resource-manager/readme.typescript.md b/specification/datafactory/resource-manager/readme.typescript.md
index 48009c60cd77..82fd7faff244 100644
--- a/specification/datafactory/resource-manager/readme.typescript.md
+++ b/specification/datafactory/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-datafactory"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-datafactory"
+  output-folder: "$(typescript-sdks-folder)/sdk/datafactory/arm-datafactory"
   generate-metadata: true
 ```
diff --git a/specification/deploymentmanager/resource-manager/readme.typescript.md b/specification/deploymentmanager/resource-manager/readme.typescript.md
index 9b4156921069..c5770c7c83d6 100644
--- a/specification/deploymentmanager/resource-manager/readme.typescript.md
+++ b/specification/deploymentmanager/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-deploymentmanager"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-deploymentmanager"
+  output-folder: "$(typescript-sdks-folder)/sdk/deploymentmanager/arm-deploymentmanager"
   generate-metadata: true
 ```
diff --git a/specification/deviceprovisioningservices/resource-manager/readme.typescript.md b/specification/deviceprovisioningservices/resource-manager/readme.typescript.md
index 3d161b41964d..3a67c09ede91 100644
--- a/specification/deviceprovisioningservices/resource-manager/readme.typescript.md
+++ b/specification/deviceprovisioningservices/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-deviceprovisioningservices"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-deviceprovisioningservices"
+  output-folder: "$(typescript-sdks-folder)/sdk/deviceprovisioningservices/arm-deviceprovisioningservices"
   generate-metadata: true
 ```
diff --git a/specification/devspaces/resource-manager/readme.typescript.md b/specification/devspaces/resource-manager/readme.typescript.md
index 967dd28b32d9..be2a39dde63e 100644
--- a/specification/devspaces/resource-manager/readme.typescript.md
+++ b/specification/devspaces/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-devspaces"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-devspaces"
+  output-folder: "$(typescript-sdks-folder)/sdk/devspaces/arm-devspaces"
   generate-metadata: true
 ```
diff --git a/specification/devtestlabs/resource-manager/readme.typescript.md b/specification/devtestlabs/resource-manager/readme.typescript.md
index 2f78e61476af..36da4a241211 100644
--- a/specification/devtestlabs/resource-manager/readme.typescript.md
+++ b/specification/devtestlabs/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-devtestlabs"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-devtestlabs"
+  output-folder: "$(typescript-sdks-folder)/sdk/devtestlabs/arm-devtestlabs"
   generate-metadata: true
 ```
diff --git a/specification/dns/resource-manager/readme.typescript.md b/specification/dns/resource-manager/readme.typescript.md
index bb632956c7be..98f84aceb8b7 100644
--- a/specification/dns/resource-manager/readme.typescript.md
+++ b/specification/dns/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-dns"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-dns"
+  output-folder: "$(typescript-sdks-folder)/sdk/dns/arm-dns"
   generate-metadata: true
 ```
diff --git a/specification/domainservices/resource-manager/readme.typescript.md b/specification/domainservices/resource-manager/readme.typescript.md
index 259abd54adc6..925b4ee7379c 100644
--- a/specification/domainservices/resource-manager/readme.typescript.md
+++ b/specification/domainservices/resource-manager/readme.typescript.md
@@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-domainservices"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-domainservices"
+  output-folder: "$(typescript-sdks-folder)/sdk/domainservices/arm-domainservices"
   override-client-name: DomainservicesManagementClient
   generate-metadata: true
 ```
diff --git a/specification/edgegateway/resource-manager/readme.typescript.md b/specification/edgegateway/resource-manager/readme.typescript.md
index d7c26804f5b1..4efe2562d442 100644
--- a/specification/edgegateway/resource-manager/readme.typescript.md
+++ b/specification/edgegateway/resource-manager/readme.typescript.md
@@ -9,6 +9,6 @@ typescript:
   license-header: MICROSOFT_MIT_NO_VERSION
   payload-flattening-threshold: 2
   package-name: "@azure/arm-edgegateway"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-edgegateway"
+  output-folder: "$(typescript-sdks-folder)/sdk/edgegateway/arm-edgegateway"
   generate-metadata: true
 ```
diff --git a/specification/eventgrid/resource-manager/readme.typescript.md b/specification/eventgrid/resource-manager/readme.typescript.md
index 40cd1dd4e887..357755b102f7 100644
--- a/specification/eventgrid/resource-manager/readme.typescript.md
+++ b/specification/eventgrid/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-eventgrid"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-eventgrid"
+  output-folder: "$(typescript-sdks-folder)/sdk/eventgrid/arm-eventgrid"
   generate-metadata: true
 ```
diff --git a/specification/eventhub/resource-manager/readme.typescript.md b/specification/eventhub/resource-manager/readme.typescript.md
index 8336f2dcda0b..96d9b4601eda 100644
--- a/specification/eventhub/resource-manager/readme.typescript.md
+++ b/specification/eventhub/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-eventhub"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-eventhub"
+  output-folder: "$(typescript-sdks-folder)/sdk/eventhub/arm-eventhub"
   generate-metadata: true
 ```
diff --git a/specification/frontdoor/resource-manager/readme.typescript.md b/specification/frontdoor/resource-manager/readme.typescript.md
index c20aff2ea590..fd86181fb8f2 100644
--- a/specification/frontdoor/resource-manager/readme.typescript.md
+++ b/specification/frontdoor/resource-manager/readme.typescript.md
@@ -7,6 +7,6 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   package-name: "@azure/arm-frontdoor"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-frontdoor"
+  output-folder: "$(typescript-sdks-folder)/sdk/frontdoor/arm-frontdoor"
   generate-metadata: true
 ```
diff --git a/specification/resources/resource-manager/readme.typescript.md b/specification/resources/resource-manager/readme.typescript.md
index 6523fd3082db..5ad93a89f765 100644
--- a/specification/resources/resource-manager/readme.typescript.md
+++ b/specification/resources/resource-manager/readme.typescript.md
@@ -20,7 +20,7 @@ batch:
 ```yaml $(typescript) && $(package-features)
 typescript:
   package-name: "@azure/arm-features"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/arm-features"
+  output-folder: "$(typescript-sdks-folder)/sdk/features/arm-features"
 ```
 
 ```yaml $(typescript) && $(package-locks)