From bc08730126d952a340b083cb5d9f8c18df7c2932 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 18:35:36 -0700
Subject: [PATCH 01/28] update eventgrid path in readme.TS

---
 specification/eventgrid/data-plane/readme.typescript.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From 695cd6d2ae51ac60b434207963854480af503265 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 18:46:45 -0700
Subject: [PATCH 02/28] update batch path in readme.TS

---
 specification/batch/data-plane/readme.typescript.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From c41fd2f565af76aae9be5aab1bad9c5f45bdf449 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 18:50:45 -0700
Subject: [PATCH 03/28] update cognitiveservices-anomalydetector path in
 readme.TS

---
 .../data-plane/AnomalyDetector/readme.typescript.md             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From f5ca9b40d2b6bec46267726a8d816a763c5798ab Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 18:56:03 -0700
Subject: [PATCH 04/28] update cognitiveservices-autosuggest path in readme.TS

---
 .../data-plane/AutoSuggest/readme.typescript.md                 | 2 +-
 .../data-plane/ComputerVision/readme.typescript.md              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
 ```

From 53fd03363096294d5420ba0e182ee98a176ab763 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 18:56:03 -0700
Subject: [PATCH 05/28] update cognitiveservices-autosuggest and
 cognitiveservices-computervision path in readme.TS

---
 .../data-plane/AutoSuggest/readme.typescript.md                 | 2 +-
 .../data-plane/ComputerVision/readme.typescript.md              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
 ```

From d9b0b19c4ca61d3d631dc8fd2dc6af1fdc069f0c Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:00:30 -0700
Subject: [PATCH 06/28] update cognitiveservices-contentmoderator path in
 readme.TS

---
 .../data-plane/ContentModerator/readme.typescript.md            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From 81aa8e7de8bba44590d828017b04354c6843f1f4 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:02:45 -0700
Subject: [PATCH 07/28] update cognitiveservices-customimagesearch path in
 readme.TS

---
 .../data-plane/CustomImageSearch/readme.typescript.md           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From 78f90b6e9ac0f707aa71e72375e7cc59f61e2406 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:04:50 -0700
Subject: [PATCH 08/28] update cognitiveservices-customsearch path in readme.TS

---
 .../data-plane/CustomWebSearch/readme.typescript.md             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From c055721114c94d17bf61a3230e4378d7f02f4cd6 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:06:42 -0700
Subject: [PATCH 09/28] update cognitiveservices-customvision-prediction path
 in readme.TS

---
 .../data-plane/CustomVision/Prediction/readme.typescript.md     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From c64cb562ee30c126dd6e5e9206116567c0eb0a5d Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:10:48 -0700
Subject: [PATCH 10/28] update cognitiveservices-customvision-training path in
 readme.TS

---
 .../data-plane/CustomVision/Training/readme.typescript.md       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 3acd20571c0dff13b66a0c6fae7aee54ecfd9fce Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:14:21 -0700
Subject: [PATCH 11/28] update cognitiveservices-entitysearch path in readme.TS

---
 .../data-plane/EntitySearch/readme.typescript.md                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From c27ef3ccda52f4d18bb02643a064a8420247495f Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:16:43 -0700
Subject: [PATCH 12/28] update cognitiveservices-face path in readme.TS

---
 .../cognitiveservices/data-plane/Face/readme.typescript.md      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From e88b6b7831ead05a10a6d06dae155f354125ce30 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:18:35 -0700
Subject: [PATCH 13/28] update cognitiveservices-imagesearch path in readme.TS

---
 .../data-plane/ImageSearch/readme.typescript.md                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From ee17e037ef92a6183e09f3f06ac1df8bc7bd5f41 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:19:51 -0700
Subject: [PATCH 14/28] update cognitiveservices-localsearch path in readme.TS

---
 .../data-plane/LocalSearch/readme.typescript.md                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From 2f9a030ba1d311cd19cb6a681466e1f970eb383c Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:21:27 -0700
Subject: [PATCH 15/28] update cognitiveservices-luis-authoring path in
 readme.TS

---
 .../data-plane/LUIS/Authoring/readme.typescript.md              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From 6f6eeb6826dbbdace198f87b0b077a41cde0bc55 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:23:16 -0700
Subject: [PATCH 16/28] update cognitiveservices-luis-runtime path in readme.TS

---
 .../data-plane/LUIS/Runtime/readme.typescript.md                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From ff9467b4e8ca2372fc7f62f8e68cef99f77e3176 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:24:48 -0700
Subject: [PATCH 17/28] update cognitiveservices-newssearch path in readme.TS

---
 .../data-plane/NewsSearch/readme.typescript.md                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From 6f78cb5dfc8e8be3d5c4f782380034a0e95a8f35 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:26:15 -0700
Subject: [PATCH 18/28] update cognitiveservices-qnamaker path in readme.TS

---
 .../cognitiveservices/data-plane/QnAMaker/readme.typescript.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From ea14ae9a11b3ee0f833b68dc4345997ac5977c08 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:27:19 -0700
Subject: [PATCH 19/28] update cognitiveservices-spellcheck path in readme.TS

---
 .../data-plane/SpellCheck/readme.typescript.md                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From 037d7f3ffc5f818557d53df0ffe0ee6a36bd4803 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:28:33 -0700
Subject: [PATCH 20/28] update cognitiveservices-textanalytics path in
 readme.TS

---
 .../data-plane/TextAnalytics/readme.typescript.md               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From 213a5d785e4dc64f8cef3672e8b604ef136b37af Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:30:45 -0700
Subject: [PATCH 21/28] update cognitiveservices-videosearch path in readme.TS

---
 .../data-plane/VideoSearch/readme.typescript.md                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From 10a5002e5e71389f5df0b5ce36c478acdc0dfa28 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:32:09 -0700
Subject: [PATCH 22/28] update cognitiveservices-visualsearch path in readme.TS

---
 .../data-plane/VisualSearch/readme.typescript.md                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From 4814ad2c0e8f8b1d16795805c4a5db4681be2788 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:33:32 -0700
Subject: [PATCH 23/28] update cognitiveservices-websearch path in readme.TS

---
 .../cognitiveservices/data-plane/WebSearch/readme.typescript.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From fe1cd0553567b9e4f669d422954d95a5cff716f2 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:35:30 -0700
Subject: [PATCH 24/28] update graph path in readme.TS

---
 specification/graphrbac/data-plane/readme.typescript.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specification/graphrbac/data-plane/readme.typescript.md b/specification/graphrbac/data-plane/readme.typescript.md
index 41bb54a38dae..e17bb24526b4 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/graph/graph"
   payload-flattening-threshold: 1
   generate-metadata: true
 ```

From 4b3949b42dd05689931ce943c99883f03828978e Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:37:00 -0700
Subject: [PATCH 25/28] update loganalytics path in readme.TS

---
 .../operationalinsights/data-plane/readme.typescript.md         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specification/operationalinsights/data-plane/readme.typescript.md b/specification/operationalinsights/data-plane/readme.typescript.md
index 20cbfd7f9080..7f789ab20f48 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/loganalytics/loganalytics"
   override-client-name: LogAnalyticsClient
   generate-metadata: true
 ```
\ No newline at end of file

From 0f77bff548964f8efe870b9e9c5692b87fd3cc6d Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:38:35 -0700
Subject: [PATCH 26/28] update servicefabric path in readme.TS

---
 specification/servicefabric/data-plane/readme.typescript.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From cd876dba2acb0dfe1c294fd2e59dea56b5314965 Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Fri, 12 Apr 2019 19:40:21 -0700
Subject: [PATCH 27/28] update storage-datalake path in readme.TS

---
 specification/storage/data-plane/readme.typescript.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ```

From dd203c69618db5f9afd9677f961666862d6138be Mon Sep 17 00:00:00 2001
From: Karishma Ghiya <kaghiya@microsoft.com>
Date: Mon, 15 Apr 2019 11:17:13 -0700
Subject: [PATCH 28/28] renamed the service folder name for graph and
 loganalytics dataplane  packages

---
 specification/graphrbac/data-plane/readme.typescript.md         | 2 +-
 .../operationalinsights/data-plane/readme.typescript.md         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/specification/graphrbac/data-plane/readme.typescript.md b/specification/graphrbac/data-plane/readme.typescript.md
index e17bb24526b4..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)/sdk/graph/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 7f789ab20f48..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)/sdk/loganalytics/loganalytics"
+  output-folder: "$(typescript-sdks-folder)/sdk/operationalinsights/loganalytics"
   override-client-name: LogAnalyticsClient
   generate-metadata: true
 ```
\ No newline at end of file