diff --git a/specification/batch/data-plane/readme.typescript.md b/specification/batch/data-plane/readme.typescript.md
index 1607505b5612..6d555c86a80f 100644
--- a/specification/batch/data-plane/readme.typescript.md
+++ b/specification/batch/data-plane/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/batch"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/batch"
+  output-folder: "$(typescript-sdks-folder)/sdk/batch/batch"
   payload-flattening-threshold: 1
   generate-metadata: true
 ```
\ No newline at end of file
diff --git a/specification/cognitiveservices/data-plane/AnomalyDetector/readme.typescript.md b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.typescript.md
index 4233005354a8..109d5b77ec97 100644
--- a/specification/cognitiveservices/data-plane/AnomalyDetector/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-anomalydetector"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-anomalydetector"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-anomalydetector"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/AutoSuggest/readme.typescript.md b/specification/cognitiveservices/data-plane/AutoSuggest/readme.typescript.md
index afac7cd077f1..1e0129e1ecb4 100644
--- a/specification/cognitiveservices/data-plane/AutoSuggest/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/AutoSuggest/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-autosuggest"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-autosuggest"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-autosuggest"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/ComputerVision/readme.typescript.md b/specification/cognitiveservices/data-plane/ComputerVision/readme.typescript.md
index 64e9e1d8776d..c129937a279d 100644
--- a/specification/cognitiveservices/data-plane/ComputerVision/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/ComputerVision/readme.typescript.md
@@ -12,7 +12,7 @@ directive:
     $ = $.replace( /mode, url/g, "url, mode" );
 typescript:
   package-name: "@azure/cognitiveservices-computervision"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-computervision"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-computervision"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/ContentModerator/readme.typescript.md b/specification/cognitiveservices/data-plane/ContentModerator/readme.typescript.md
index 33ec89d42f2e..adb4c53f8079 100644
--- a/specification/cognitiveservices/data-plane/ContentModerator/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/ContentModerator/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-contentmoderator"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-contentmoderator"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-contentmoderator"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/CustomImageSearch/readme.typescript.md b/specification/cognitiveservices/data-plane/CustomImageSearch/readme.typescript.md
index ec955400679d..15189cfd101c 100644
--- a/specification/cognitiveservices/data-plane/CustomImageSearch/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/CustomImageSearch/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-customimagesearch"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-customimagesearch"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-customimagesearch"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/CustomVision/Prediction/readme.typescript.md b/specification/cognitiveservices/data-plane/CustomVision/Prediction/readme.typescript.md
index 73b67856d051..34e20a9f1d5d 100644
--- a/specification/cognitiveservices/data-plane/CustomVision/Prediction/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/CustomVision/Prediction/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-customvision-prediction"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-customvision-prediction"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-customvision-prediction"
   override-client-name: PredictionAPIClient
   azure-arm: false
   generate-metadata: true
diff --git a/specification/cognitiveservices/data-plane/CustomVision/Training/readme.typescript.md b/specification/cognitiveservices/data-plane/CustomVision/Training/readme.typescript.md
index e4698ec80216..ef05c82f0402 100644
--- a/specification/cognitiveservices/data-plane/CustomVision/Training/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/CustomVision/Training/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-customvision-training"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-customvision-training"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-customvision-training"
   override-client-name: TrainingAPIClient
   azure-arm: false
   generate-metadata: true
diff --git a/specification/cognitiveservices/data-plane/CustomWebSearch/readme.typescript.md b/specification/cognitiveservices/data-plane/CustomWebSearch/readme.typescript.md
index 66fcb3bd5115..3b21e9c57886 100644
--- a/specification/cognitiveservices/data-plane/CustomWebSearch/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/CustomWebSearch/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-customsearch"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-customsearch"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-customsearch"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/EntitySearch/readme.typescript.md b/specification/cognitiveservices/data-plane/EntitySearch/readme.typescript.md
index 76b5f004e384..76bdb7399113 100644
--- a/specification/cognitiveservices/data-plane/EntitySearch/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/EntitySearch/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-entitysearch"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-entitysearch"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-entitysearch"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/Face/readme.typescript.md b/specification/cognitiveservices/data-plane/Face/readme.typescript.md
index 38bb9d5eedec..e48d6782970b 100644
--- a/specification/cognitiveservices/data-plane/Face/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/Face/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-face"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-face"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-face"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/ImageSearch/readme.typescript.md b/specification/cognitiveservices/data-plane/ImageSearch/readme.typescript.md
index baaba0c7105e..b4245cff8c77 100644
--- a/specification/cognitiveservices/data-plane/ImageSearch/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/ImageSearch/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-imagesearch"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-imagesearch"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-imagesearch"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/LUIS/Authoring/readme.typescript.md b/specification/cognitiveservices/data-plane/LUIS/Authoring/readme.typescript.md
index 2cce2d7664c4..d938a653a558 100644
--- a/specification/cognitiveservices/data-plane/LUIS/Authoring/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/LUIS/Authoring/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-luis-authoring"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-luis-authoring"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-luis-authoring"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/LUIS/Runtime/readme.typescript.md b/specification/cognitiveservices/data-plane/LUIS/Runtime/readme.typescript.md
index 78bcd51513d4..b19fd4254f8d 100644
--- a/specification/cognitiveservices/data-plane/LUIS/Runtime/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/LUIS/Runtime/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-luis-runtime"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-luis-runtime"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-luis-runtime"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/LocalSearch/readme.typescript.md b/specification/cognitiveservices/data-plane/LocalSearch/readme.typescript.md
index 9b2db9dccc55..186624f9dfa2 100644
--- a/specification/cognitiveservices/data-plane/LocalSearch/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/LocalSearch/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-localsearch"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-localsearch"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-localsearch"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/NewsSearch/readme.typescript.md b/specification/cognitiveservices/data-plane/NewsSearch/readme.typescript.md
index 734bddd971e1..fcc5ff6bf355 100644
--- a/specification/cognitiveservices/data-plane/NewsSearch/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/NewsSearch/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-newssearch"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-newssearch"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-newssearch"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/QnAMaker/readme.typescript.md b/specification/cognitiveservices/data-plane/QnAMaker/readme.typescript.md
index 5639b97a3794..f796e6157012 100644
--- a/specification/cognitiveservices/data-plane/QnAMaker/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/QnAMaker/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-qnamaker"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-qnamaker"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-qnamaker"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/SpellCheck/readme.typescript.md b/specification/cognitiveservices/data-plane/SpellCheck/readme.typescript.md
index 3cdd74f58cce..5bf4a21fce2c 100644
--- a/specification/cognitiveservices/data-plane/SpellCheck/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/SpellCheck/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-spellcheck"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-spellcheck"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-spellcheck"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/TextAnalytics/readme.typescript.md b/specification/cognitiveservices/data-plane/TextAnalytics/readme.typescript.md
index cce9f774bdb3..7b59b467180c 100644
--- a/specification/cognitiveservices/data-plane/TextAnalytics/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/TextAnalytics/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-textanalytics"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-textanalytics"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-textanalytics"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/VideoSearch/readme.typescript.md b/specification/cognitiveservices/data-plane/VideoSearch/readme.typescript.md
index c3eb441f8a2e..ba3f6669349b 100644
--- a/specification/cognitiveservices/data-plane/VideoSearch/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/VideoSearch/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-videosearch"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-videosearch"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-videosearch"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/VisualSearch/readme.typescript.md b/specification/cognitiveservices/data-plane/VisualSearch/readme.typescript.md
index f692a8a7e53c..cf693b42514b 100644
--- a/specification/cognitiveservices/data-plane/VisualSearch/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/VisualSearch/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-visualsearch"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-visualsearch"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-visualsearch"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/WebSearch/readme.typescript.md b/specification/cognitiveservices/data-plane/WebSearch/readme.typescript.md
index 12fe208c8fa4..e2b5d7f97042 100644
--- a/specification/cognitiveservices/data-plane/WebSearch/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/WebSearch/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/cognitiveservices-websearch"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-websearch"
+  output-folder: "$(typescript-sdks-folder)/sdk/cognitiveservices/cognitiveservices-websearch"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/eventgrid/data-plane/readme.typescript.md b/specification/eventgrid/data-plane/readme.typescript.md
index b1efcf49e82b..b8a4f4a8c0d4 100644
--- a/specification/eventgrid/data-plane/readme.typescript.md
+++ b/specification/eventgrid/data-plane/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/eventgrid"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/eventgrid"
+  output-folder: "$(typescript-sdks-folder)/sdk/eventgrid/eventgrid"
   generate-metadata: true
 ```
diff --git a/specification/graphrbac/data-plane/readme.typescript.md b/specification/graphrbac/data-plane/readme.typescript.md
index 41bb54a38dae..4f773716c484 100644
--- a/specification/graphrbac/data-plane/readme.typescript.md
+++ b/specification/graphrbac/data-plane/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/graph"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/graph"
+  output-folder: "$(typescript-sdks-folder)/sdk/graphrbac/graph"
   payload-flattening-threshold: 1
   generate-metadata: true
 ```
diff --git a/specification/operationalinsights/data-plane/readme.typescript.md b/specification/operationalinsights/data-plane/readme.typescript.md
index 20cbfd7f9080..6ef846a840e6 100644
--- a/specification/operationalinsights/data-plane/readme.typescript.md
+++ b/specification/operationalinsights/data-plane/readme.typescript.md
@@ -6,7 +6,7 @@ Please also specify `--typescript-sdks-folder=<path to the root directory of you
 ``` yaml $(typescript)
 typescript:
   package-name: "@azure/loganalytics"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/loganalytics"
+  output-folder: "$(typescript-sdks-folder)/sdk/operationalinsights/loganalytics"
   override-client-name: LogAnalyticsClient
   generate-metadata: true
 ```
\ No newline at end of file
diff --git a/specification/servicefabric/data-plane/readme.typescript.md b/specification/servicefabric/data-plane/readme.typescript.md
index 1ab368a22b7e..34d272c940ca 100644
--- a/specification/servicefabric/data-plane/readme.typescript.md
+++ b/specification/servicefabric/data-plane/readme.typescript.md
@@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: false
   package-name: "@azure/servicefabric"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/servicefabric"
+  output-folder: "$(typescript-sdks-folder)/sdk/servicefabric/servicefabric"
   override-client-name: ServiceFabricClient
   generate-metadata: true
 ```
diff --git a/specification/storage/data-plane/readme.typescript.md b/specification/storage/data-plane/readme.typescript.md
index d81aa4f6b304..38f647ed7636 100644
--- a/specification/storage/data-plane/readme.typescript.md
+++ b/specification/storage/data-plane/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/storage-datalake"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/storage-datalake"
+  output-folder: "$(typescript-sdks-folder)/sdk/storage/storage-datalake"
   generate-metadata: true
 ```