diff --git a/specification/advisor/resource-manager/readme.md b/specification/advisor/resource-manager/readme.md
index 4cee0564e717..5c13089d36e5 100644
--- a/specification/advisor/resource-manager/readme.md
+++ b/specification/advisor/resource-manager/readme.md
@@ -56,16 +56,3 @@ These settings apply only when `--tag=package-2016-07-preview` is specified on t
 input-file:
 - Microsoft.Advisor/2016-07-12-preview/advisor.json
 ```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
diff --git a/specification/analysisservices/resource-manager/readme.md b/specification/analysisservices/resource-manager/readme.md
index b8ccf1284091..46c563e89e75 100644
--- a/specification/analysisservices/resource-manager/readme.md
+++ b/specification/analysisservices/resource-manager/readme.md
@@ -39,15 +39,19 @@ input-file:
 - Microsoft.AnalysisServices/2016-05-16/analysisservices.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Analysis
+  output-folder: $(csharp-sdks-folder)/AnalysisServices/Management.Analysis/Generated
 ```
 
diff --git a/specification/apimanagement/resource-manager/readme.md b/specification/apimanagement/resource-manager/readme.md
index 0640086a926e..32c8e62adf0f 100644
--- a/specification/apimanagement/resource-manager/readme.md
+++ b/specification/apimanagement/resource-manager/readme.md
@@ -95,16 +95,3 @@ input-file:
 - Microsoft.ApiManagement/2016-07-07/apimanagement.json
 - Microsoft.ApiManagement/2016-07-07/apimdeployment.json
 ```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
diff --git a/specification/appinsights/resource-manager/readme.md b/specification/appinsights/resource-manager/readme.md
index 5c4455e555b1..38f397a13259 100644
--- a/specification/appinsights/resource-manager/readme.md
+++ b/specification/appinsights/resource-manager/readme.md
@@ -42,16 +42,3 @@ input-file:
 - microsoft.insights/2015-05-01/components_API.json
 - microsoft.insights/2015-05-01/webTests_API.json
 ```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
diff --git a/specification/authorization/resource-manager/readme.md b/specification/authorization/resource-manager/readme.md
index 80f03547ee0a..bcc09d57e3e8 100644
--- a/specification/authorization/resource-manager/readme.md
+++ b/specification/authorization/resource-manager/readme.md
@@ -40,14 +40,20 @@ input-file:
 ```
 
 
+
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Authorization
+  output-folder: $(csharp-sdks-folder)/Authorization/Management.Authorization/Generated
 ```
-
diff --git a/specification/automation/resource-manager/readme.md b/specification/automation/resource-manager/readme.md
index e18480d74b58..eb5748d49c9c 100644
--- a/specification/automation/resource-manager/readme.md
+++ b/specification/automation/resource-manager/readme.md
@@ -59,14 +59,21 @@ input-file:
 ```
 
 
+
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Automation
+  output-folder: $(csharp-sdks-folder)/Automation/Management.Automation/Generated
 ```
 
diff --git a/specification/batch/data-plane/readme.md b/specification/batch/data-plane/readme.md
index 7ec348a62579..8b39f01f783f 100644
--- a/specification/batch/data-plane/readme.md
+++ b/specification/batch/data-plane/readme.md
@@ -88,13 +88,18 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  payload-flattening-threshold: 1
+  namespace: Microsoft.Azure.Batch
+  output-folder: $(csharp-sdks-folder)/Batch/DataPlane/Azure.Batch/GeneratedProtocol
 ```
-
diff --git a/specification/batch/resource-manager/readme.md b/specification/batch/resource-manager/readme.md
index adb353d536a2..e6fa4f2f0b3f 100644
--- a/specification/batch/resource-manager/readme.md
+++ b/specification/batch/resource-manager/readme.md
@@ -60,13 +60,20 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  # last generated with AutoRest.1.0.0-Nightly20170129 from commit 19f63015ea5a8a0fc64b9d7e2cdfeac447d93eaf 
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Batch
+  payload-flattening-threshold: 1
+  output-folder: $(csharp-sdks-folder)/Batch/Management/Management.Batch/Generated
 ```
-
diff --git a/specification/billing/resource-manager/readme.md b/specification/billing/resource-manager/readme.md
index 727ac95d5aa2..554c53bc81b3 100644
--- a/specification/billing/resource-manager/readme.md
+++ b/specification/billing/resource-manager/readme.md
@@ -48,15 +48,16 @@ input-file:
 - Microsoft.Billing/2017-02-27-preview/billing.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Billing
+  output-folder: $(csharp-sdks-folder)/Billing/Management.Billing/Generated
 ```
-
diff --git a/specification/cdn/resource-manager/readme.md b/specification/cdn/resource-manager/readme.md
index 5a7c69318aed..0248b1de8adf 100644
--- a/specification/cdn/resource-manager/readme.md
+++ b/specification/cdn/resource-manager/readme.md
@@ -59,13 +59,20 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  # last generated with AutoRest.1.0.0-Nightly20170212
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Cdn
+  payload-flattening-threshold: 2
+  output-folder: $(csharp-sdks-folder)/Cdn/Management.Cdn/Generated
 ```
-
diff --git a/specification/cognitiveservices/resource-manager/readme.md b/specification/cognitiveservices/resource-manager/readme.md
index 27af4514238b..6bb676921dfe 100644
--- a/specification/cognitiveservices/resource-manager/readme.md
+++ b/specification/cognitiveservices/resource-manager/readme.md
@@ -51,13 +51,18 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.CognitiveServices
+  output-folder: $(csharp-sdks-folder)/CognitiveServices/Management.CognitiveServices/Generated
 ```
-
diff --git a/specification/commerce/resource-manager/readme.md b/specification/commerce/resource-manager/readme.md
index e79ec3b31f6d..8a67f8fd2193 100644
--- a/specification/commerce/resource-manager/readme.md
+++ b/specification/commerce/resource-manager/readme.md
@@ -38,16 +38,3 @@ These settings apply only when `--tag=package-2015-06-preview` is specified on t
 input-file:
 - Microsoft.Commerce/2015-06-01-preview/commerce.json
 ```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md
index e812304aa2a3..7a30c1572034 100644
--- a/specification/compute/resource-manager/readme.md
+++ b/specification/compute/resource-manager/readme.md
@@ -129,18 +129,27 @@ input-file:
 - Microsoft.ContainerService/2015-11-01-preview/containerService.json
 ```
 
+
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  # last generated with AutoRest.1.0.0-Nightly20170126
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Compute
+  payload-flattening-threshold: 1
+  output-folder: $(csharp-sdks-folder)/Compute/Management.Compute/Generated
 ```
 
-## Language-specific settings: Python
+
+## Python
 
 These settings apply only when `--python` is specified on the command line.
 
diff --git a/specification/consumption/resource-manager/readme.md b/specification/consumption/resource-manager/readme.md
index b6184493829a..19d8341968f6 100644
--- a/specification/consumption/resource-manager/readme.md
+++ b/specification/consumption/resource-manager/readme.md
@@ -41,13 +41,18 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Consumption
+  output-folder: $(csharp-sdks-folder)/Consumption/Management.Consumption/Generated
 ```
-
diff --git a/specification/containerregistry/resource-manager/readme.md b/specification/containerregistry/resource-manager/readme.md
index 863c2c3e3401..c8e3e02419bb 100644
--- a/specification/containerregistry/resource-manager/readme.md
+++ b/specification/containerregistry/resource-manager/readme.md
@@ -59,13 +59,20 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  # last generated using AutoRest.1.0.0-Nightly20170212 with commit 3b0b26b4b6e3bc5e7cf3610b0866d310abb5b814
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.ContainerRegistry
+  payload-flattening-threshold: 2
+  output-folder: $(csharp-sdks-folder)/ContainerRegistry/Management.ContainerRegistry/Generated
 ```
-
diff --git a/specification/cosmos-db/resource-manager/readme.md b/specification/cosmos-db/resource-manager/readme.md
index ec66840d42d1..aea0526eb57a 100644
--- a/specification/cosmos-db/resource-manager/readme.md
+++ b/specification/cosmos-db/resource-manager/readme.md
@@ -38,16 +38,3 @@ These settings apply only when `--tag=package-2015-04` is specified on the comma
 input-file:
 - Microsoft.DocumentDB/2015-04-08/cosmos-db.json
 ```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
diff --git a/specification/customer-insights/resource-manager/readme.md b/specification/customer-insights/resource-manager/readme.md
index e30f6cde4d43..886dd8dd8e40 100644
--- a/specification/customer-insights/resource-manager/readme.md
+++ b/specification/customer-insights/resource-manager/readme.md
@@ -51,13 +51,18 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.CustomerInsights
+  output-folder: $(csharp-sdks-folder)/CustomerInsights/Management.CustomerInsights/Generated
 ```
-
diff --git a/specification/datalake-analytics/data-plane/readme.md b/specification/datalake-analytics/data-plane/readme.md
index e680bf64f164..7049b8dccf50 100644
--- a/specification/datalake-analytics/data-plane/readme.md
+++ b/specification/datalake-analytics/data-plane/readme.md
@@ -19,26 +19,19 @@ To see additional help and options, run:
 
 ## Configuration
 
-
-
 ### Basic Information 
 These are the global settings for the DataLakeAnalytics API.
 
 ``` yaml
-title: DataLake Analytics
-description: DataLake Analytics Client
 openapi-type: data-plane
-tag: validate-package-2016-11
 ```
 
-### Tag: package-2016-11
-
-These settings apply only when `--tag=package-2016-11` is specified on the command line.
+``` yaml $(package-catalog)
+tag: package-catalog-2016-11
+```
 
-``` yaml $(tag) == 'validate-package-2016-11'
-input-file:
-- Microsoft.DataLakeAnalytics/2016-11-01/catalog.json
-- Microsoft.DataLakeAnalytics/2016-11-01/job.json
+``` yaml $(package-job)
+tag: package-job-2016-11
 ```
 
 ### Tag: package-catalog-2016-11
@@ -86,15 +79,27 @@ input-file:
 - Microsoft.DataLakeAnalytics/2015-11-01-preview/job.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.DataLake.Analytics
+  output-folder: $(csharp-sdks-folder)/DataLake.Analytics/Management.DataLake.Analytics/Generated
 ```
 
+``` yaml $(csharp)
+csharp:
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.DataLake.Analytics
+  output-folder: $(csharp-sdks-folder)/DataLake.Analytics/Management.DataLake.Analytics/Generated
+```
\ No newline at end of file
diff --git a/specification/datalake-analytics/resource-manager/readme.md b/specification/datalake-analytics/resource-manager/readme.md
index 57cf6daa973a..6ecbb7ccfaff 100644
--- a/specification/datalake-analytics/resource-manager/readme.md
+++ b/specification/datalake-analytics/resource-manager/readme.md
@@ -49,15 +49,19 @@ input-file:
 - Microsoft.DataLakeAnalytics/2015-10-01-preview/account.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.DataLake.Analytics
+  output-folder: $(csharp-sdks-folder)/DataLake.Analytics/Management.DataLake.Analytics/Generated
+```
\ No newline at end of file
diff --git a/specification/datalake-store/data-plane/readme.md b/specification/datalake-store/data-plane/readme.md
index 5402cb99ce69..6a95862f363d 100644
--- a/specification/datalake-store/data-plane/readme.md
+++ b/specification/datalake-store/data-plane/readme.md
@@ -25,9 +25,6 @@ To see additional help and options, run:
 These are the global settings for the DataLakeStore API.
 
 ``` yaml
- 
-title: DataLake Store
-description: DataLake Store Client
 openapi-type: data-plane
 tag: package-2016-11
 ```
@@ -51,15 +48,19 @@ input-file:
 - Microsoft.DataLakeStore/2015-10-01-preview/filesystem.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.DataLake.Store
+  output-folder: $(csharp-sdks-folder)/DataLake.Store/Management.DataLake.Store/Generated
+```
\ No newline at end of file
diff --git a/specification/datalake-store/resource-manager/readme.md b/specification/datalake-store/resource-manager/readme.md
index 18ead02d8057..f1aa48a07add 100644
--- a/specification/datalake-store/resource-manager/readme.md
+++ b/specification/datalake-store/resource-manager/readme.md
@@ -50,15 +50,19 @@ input-file:
 - Microsoft.DataLakeStore/2015-10-01-preview/account.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.DataLake.Store
+  output-folder: $(csharp-sdks-folder)/DataLake.Store/Management.DataLake.Store/Generated
+```
\ No newline at end of file
diff --git a/specification/devtestlabs/resource-manager/readme.md b/specification/devtestlabs/resource-manager/readme.md
index 6e30076d4552..ab5aef171cfb 100644
--- a/specification/devtestlabs/resource-manager/readme.md
+++ b/specification/devtestlabs/resource-manager/readme.md
@@ -50,13 +50,18 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.DevTestLabs
+  output-folder: $(csharp-sdks-folder)/DevTestLabs/Management.DevTestLabs/Generated
+```
\ No newline at end of file
diff --git a/specification/dns/resource-manager/readme.md b/specification/dns/resource-manager/readme.md
index 89eb590f0dfb..ad2c31da1a54 100644
--- a/specification/dns/resource-manager/readme.md
+++ b/specification/dns/resource-manager/readme.md
@@ -50,13 +50,19 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Dns
+  payload-flattening-threshold: 2
+  output-folder: $(csharp-sdks-folder)/Dns/Management.Dns/Generated
+```
\ No newline at end of file
diff --git a/specification/eventhub/resource-manager/readme.md b/specification/eventhub/resource-manager/readme.md
index 20b16234945f..c2b3855749ce 100644
--- a/specification/eventhub/resource-manager/readme.md
+++ b/specification/eventhub/resource-manager/readme.md
@@ -51,13 +51,18 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.EventHub
+  output-folder: $(csharp-sdks-folder)/EventHub/Management.EventHub/Generated
+```
\ No newline at end of file
diff --git a/specification/graphrbac/data-plane/readme.md b/specification/graphrbac/data-plane/readme.md
index 2557bd2fdf1a..8d3752d95305 100644
--- a/specification/graphrbac/data-plane/readme.md
+++ b/specification/graphrbac/data-plane/readme.md
@@ -39,20 +39,23 @@ input-file:
 - 1.6/graphrbac.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
-``` yaml $(csharp)
+```yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Graph.RBAC
+  output-folder: $(csharp-sdks-folder)/Graph.RBAC/Graph.RBAC/Generated
 ```
 
-
-## Language-specific settings: Python
+## Python
 
 These settings apply only when `--python` is specified on the command line.
 
diff --git a/specification/hdinsight/resource-manager/readme.md b/specification/hdinsight/resource-manager/readme.md
index 3f29894fbdc0..e9eb4721a7bc 100644
--- a/specification/hdinsight/resource-manager/readme.md
+++ b/specification/hdinsight/resource-manager/readme.md
@@ -45,17 +45,4 @@ input-file:
 - Microsoft.HDInsight/2015-03-01-preview/extensions.json
 - Microsoft.HDInsight/2015-03-01-preview/scriptActions.json
 - Microsoft.HDInsight/2015-03-01-preview/operations.json
-```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+```
\ No newline at end of file
diff --git a/specification/intune/resource-manager/readme.md b/specification/intune/resource-manager/readme.md
index 8b3384c9a040..64c4aeb58291 100644
--- a/specification/intune/resource-manager/readme.md
+++ b/specification/intune/resource-manager/readme.md
@@ -48,15 +48,18 @@ input-file:
 - Microsoft.Intune/2015-01-14-privatepreview/intune.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Intune
+  output-folder: $(csharp-sdks-folder)/Intune/Intune/Generated
+```
\ No newline at end of file
diff --git a/specification/iothub/resource-manager/readme.md b/specification/iothub/resource-manager/readme.md
index abd8920ef654..4d015e86a3d4 100644
--- a/specification/iothub/resource-manager/readme.md
+++ b/specification/iothub/resource-manager/readme.md
@@ -48,15 +48,19 @@ input-file:
 - Microsoft.Devices/2016-02-03/iothub.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.IotHub
+  output-folder: $(csharp-sdks-folder)/IotHub/Management.IotHub/Generated
+```
\ No newline at end of file
diff --git a/specification/keyvault/data-plane/readme.md b/specification/keyvault/data-plane/readme.md
index 3389d02a604e..c9fb62191a54 100644
--- a/specification/keyvault/data-plane/readme.md
+++ b/specification/keyvault/data-plane/readme.md
@@ -50,13 +50,16 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.KeyVault
+  sync-methods: None
+  output-folder: $(csharp-sdks-folder)/KeyVault/dataPlane/Microsoft.Azure.KeyVault/Generated
+```
\ No newline at end of file
diff --git a/specification/keyvault/resource-manager/readme.md b/specification/keyvault/resource-manager/readme.md
index 3ced608204c2..9a465988113b 100644
--- a/specification/keyvault/resource-manager/readme.md
+++ b/specification/keyvault/resource-manager/readme.md
@@ -51,13 +51,15 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.KeyVault
+  output-folder: $(csharp-sdks-folder)/KeyVault/Management/Management.KeyVault/Generated
+```
\ No newline at end of file
diff --git a/specification/logic/resource-manager/readme.md b/specification/logic/resource-manager/readme.md
index 74faf0596198..e1a45cd29322 100644
--- a/specification/logic/resource-manager/readme.md
+++ b/specification/logic/resource-manager/readme.md
@@ -59,13 +59,17 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  namespace: Microsoft.Azure.Management.Logic
+  output-folder: $(csharp-sdks-folder)/Logic/Management.Logic/Generated
+```
\ No newline at end of file
diff --git a/specification/machinelearning/resource-manager/readme.md b/specification/machinelearning/resource-manager/readme.md
index 3485611c7160..efaa056a05e2 100644
--- a/specification/machinelearning/resource-manager/readme.md
+++ b/specification/machinelearning/resource-manager/readme.md
@@ -26,40 +26,68 @@ These are the global settings for the MachineLearning API.
 
 ``` yaml
 openapi-type: arm
-tag: package-2017-01
 ```
 
+``` yaml $(package-webservices)
+tag: package-webservices-2017-01
+```
+
+``` yaml $(package-commitmentPlans)
+tag: package-commitmentPlans-2016-05-preview
+```
 
-### Tag: package-2017-01
+### Tag: package-webservices-2017-01
 
-These settings apply only when `--tag=package-2017-01` is specified on the command line.
+These settings apply only when `--tag=package-webservices-2017-01` is specified on the command line.
 
-``` yaml $(tag) == 'package-2017-01'
+``` yaml $(tag) == 'package-webservices-2017-01'
 input-file:
 - Microsoft.MachineLearning/2017-01-01/webservices.json
 ```
  
-### Tag: package-2016-05-preview
+### Tag: package-commitmentPlans-2016-05-preview
 
-These settings apply only when `--tag=package-2016-05-preview` is specified on the command line.
+These settings apply only when `--tag=package-commitmentPlans-2016-05-preview` is specified on the command line.
 
-``` yaml $(tag) == 'package-2016-05-preview'
-title: Azure ML Web Services Management Client
-description: Machine Learning Client
+``` yaml $(tag) == 'package-commitmentPlans-2016-05-preview'
 input-file:
 - Microsoft.MachineLearning/2016-05-01-preview/commitmentPlans.json
+```
+ 
+### Tag: package-webservices-2016-05-preview
+
+These settings apply only when `--tag=package-webservices-2016-05-preview` is specified on the command line.
+
+``` yaml $(tag) == 'package-webservices-2016-05-preview'
+input-file:
 - Microsoft.MachineLearning/2016-05-01-preview/webservices.json
 ```
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
-``` yaml $(csharp)
+```yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  payload-flattening-threshold: 1
+  license-header: MICROSOFT_MIT
 ```
 
+```yaml $(csharp) && $(package-commitmentPlans)
+csharp:
+  namespace: Microsoft.Azure.Management.MachineLearning.CommitmentPlans
+  output-folder: $(csharp-sdks-folder)/MachineLearning/Management.MachineLearning/Generated/CommitmentPlans
+```
+
+```yaml $(csharp) && $(package-webservices)
+csharp:
+  namespace: Microsoft.Azure.Management.MachineLearning.WebServices
+  output-folder: $(csharp-sdks-folder)/MachineLearning/Management.MachineLearning/Generated/WebServices
+```
\ No newline at end of file
diff --git a/specification/mediaservices/resource-manager/readme.md b/specification/mediaservices/resource-manager/readme.md
index 17ffe20b967f..419b8ae7a01b 100644
--- a/specification/mediaservices/resource-manager/readme.md
+++ b/specification/mediaservices/resource-manager/readme.md
@@ -39,15 +39,21 @@ input-file:
 - Microsoft.Media/2015-10-01/media.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  # last generated from commit 3586e2989d502434c4f607dd38d40e46aabede5c
+  azure-arm: true
+  payload-flattening-threshold: 2
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Media
+  output-folder: $(csharp-sdks-folder)/Media/Management.Media/Generated
+```
\ No newline at end of file
diff --git a/specification/mobileengagement/resource-manager/readme.md b/specification/mobileengagement/resource-manager/readme.md
index 124d0e1403c9..0a4e3f5503db 100644
--- a/specification/mobileengagement/resource-manager/readme.md
+++ b/specification/mobileengagement/resource-manager/readme.md
@@ -37,17 +37,4 @@ These settings apply only when `--tag=package-2014-12` is specified on the comma
 ``` yaml $(tag) == 'package-2014-12'
 input-file:
 - Microsoft.MobileEngagement/2014-12-01/mobile-engagement.json
-```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+```
\ No newline at end of file
diff --git a/specification/monitor/data-plane/readme.md b/specification/monitor/data-plane/readme.md
index e8fb4e4e2101..ab3529b446c0 100644
--- a/specification/monitor/data-plane/readme.md
+++ b/specification/monitor/data-plane/readme.md
@@ -46,20 +46,26 @@ input-file:
 - microsoft.insights/2016-09-01/metrics_API.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  payload-flattening-threshold: 1
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Monitor
+  output-folder: $(csharp-sdks-folder)/Monitor/Management.Monitor/Generated/Monitor
 ```
 
 
-## Language-specific settings: Python
+## Python
 
 These settings apply only when `--python` is specified on the command line.
 
diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md
index db7610e633c1..c61aff2ab9c4 100644
--- a/specification/monitor/resource-manager/readme.md
+++ b/specification/monitor/resource-manager/readme.md
@@ -47,20 +47,26 @@ input-file:
 - microsoft.insights/2017-04-01/activityLogAlerts_API.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  payload-flattening-threshold: 1
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Monitor.Management
+  output-folder: $(csharp-sdks-folder)/Monitor/Management.Monitor/Generated/Management/Monitor
 ```
 
 
-## Language-specific settings: Python
+## Python
 
 These settings apply only when `--python` is specified on the command line.
 
diff --git a/specification/mysql/resource-manager/readme.md b/specification/mysql/resource-manager/readme.md
index 32fd70e07502..2a085ead967d 100644
--- a/specification/mysql/resource-manager/readme.md
+++ b/specification/mysql/resource-manager/readme.md
@@ -37,16 +37,4 @@ These settings apply only when `--tag=package-2017-04-preview` is specified on t
 ``` yaml $(tag) == 'package-2017-04-preview'
 input-file:
 - Microsoft.DBforMySQL/2017-04-30-preview/mysql.json
-```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
+```
\ No newline at end of file
diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md
index 162de1cdf5ed..4d3e40f3748c 100644
--- a/specification/network/resource-manager/readme.md
+++ b/specification/network/resource-manager/readme.md
@@ -186,20 +186,25 @@ input-file:
 - Microsoft.Network/2015-05-01-preview/network.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Network
+  output-folder: $(csharp-sdks-folder)/Network/Management.Network/Generated
 ```
 
 
-## Language-specific settings: Python
+## Python
 
 These settings apply only when `--python` is specified on the command line.
 
diff --git a/specification/notificationhubs/resource-manager/readme.md b/specification/notificationhubs/resource-manager/readme.md
index 22637fa4efef..5eca09e3fa4c 100644
--- a/specification/notificationhubs/resource-manager/readme.md
+++ b/specification/notificationhubs/resource-manager/readme.md
@@ -59,13 +59,17 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.NotificationHubs
+  output-folder: $(csharp-sdks-folder)/NotificationHubs/Management.NotificationHubs/Generated
+```
\ No newline at end of file
diff --git a/specification/operationalinsights/resource-manager/readme.md b/specification/operationalinsights/resource-manager/readme.md
index 60255f3fa063..f086154416d8 100644
--- a/specification/operationalinsights/resource-manager/readme.md
+++ b/specification/operationalinsights/resource-manager/readme.md
@@ -25,7 +25,7 @@ To see additional help and options, run:
 These are the global settings for the OperationalInsights API.
 
 ``` yaml
-title: Azure Log Analytics
+title: OperationalInsightsManagementClient
 description: Operational Insights Client
 openapi-type: arm
 tag: package-2015-11-preview
@@ -51,15 +51,21 @@ input-file:
 - Microsoft.OperationalInsights/2015-03-20/OperationalInsights.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
-``` yaml $(csharp)
+```yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  # last generated using AutoRest.1.0.0-Nightly20170126 
+  azure-arm: true
+  namespace: Microsoft.Azure.Management.OperationalInsights
+  payload-flattening-threshold: 1
+  license-header: MICROSOFT_MIT
+  output-folder: $(csharp-sdks-folder)/OperationalInsights/Management.OperationalInsights/Generated
+```
\ No newline at end of file
diff --git a/specification/postgresql/resource-manager/readme.md b/specification/postgresql/resource-manager/readme.md
index 5400bc80339c..99d157b321d3 100644
--- a/specification/postgresql/resource-manager/readme.md
+++ b/specification/postgresql/resource-manager/readme.md
@@ -37,16 +37,4 @@ These settings apply only when `--tag=package-2017-04-preview` is specified on t
 ``` yaml $(tag) == 'package-2017-04-preview'
 input-file:
 - Microsoft.DBforPostgreSQL/2017-04-30-preview/postgresql.json
-```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
+```
\ No newline at end of file
diff --git a/specification/powerbiembedded/resource-manager/readme.md b/specification/powerbiembedded/resource-manager/readme.md
index afcf59dd485e..2ac5b0f15333 100644
--- a/specification/powerbiembedded/resource-manager/readme.md
+++ b/specification/powerbiembedded/resource-manager/readme.md
@@ -41,13 +41,19 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.PowerBIEmbedded
+  payload-flattening-threshold: 2
+  output-folder: $(csharp-sdks-folder)/PowerBIEmbedded/Management.PowerBIEmbedded/Generated
+```
\ No newline at end of file
diff --git a/specification/recoveryservices/resource-manager/readme.md b/specification/recoveryservices/resource-manager/readme.md
index 98f27b21b458..c1b52cf07397 100644
--- a/specification/recoveryservices/resource-manager/readme.md
+++ b/specification/recoveryservices/resource-manager/readme.md
@@ -59,13 +59,17 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  payload-flattening-threshold: 1
+  namespace: Microsoft.Azure.Management.RecoveryServices
+  output-folder: $(csharp-sdks-folder)/RecoveryServices/Management.RecoveryServices/Generated
 ```
 
diff --git a/specification/recoveryservicesbackup/resource-manager/readme.md b/specification/recoveryservicesbackup/resource-manager/readme.md
index 79fa9586406f..7cf87de851eb 100644
--- a/specification/recoveryservicesbackup/resource-manager/readme.md
+++ b/specification/recoveryservicesbackup/resource-manager/readme.md
@@ -62,17 +62,21 @@ input-file:
 ## C#
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ```yaml $(csharp)
 csharp:
   azure-arm: true
+  payload-flattening-threshold: 1
   license-header: MICROSOFT_MIT
   namespace: Microsoft.Azure.Management.RecoveryServices.Backup
-  output-folder: $(output-folder)Generated/CSharp
+  output-folder: $(csharp-sdks-folder)/RecoveryServices.Backup/Management.RecoveryServices.Backup/Generated
 ```
 
 ## Python
 
+These settings apply only when `--python` is specified on the command line.
+
 ```yaml $(python)
 python:
   azure-arm: true
diff --git a/specification/recoveryservicessiterecovery/resource-manager/readme.md b/specification/recoveryservicessiterecovery/resource-manager/readme.md
index bd3f22f3a063..3a8ef1170b8c 100644
--- a/specification/recoveryservicessiterecovery/resource-manager/readme.md
+++ b/specification/recoveryservicessiterecovery/resource-manager/readme.md
@@ -39,15 +39,19 @@ input-file:
 - Microsoft.RecoveryServices/2016-08-10/service.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
-``` yaml $(csharp)
+```yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  payload-flattening-threshold: 1
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.RecoveryServices.SiteRecovery
+  output-folder: $(csharp-sdks-folder)/RecoveryServices.SiteRecovery/Management.RecoveryServices.SiteRecovery/Generated
+```
\ No newline at end of file
diff --git a/specification/redis/resource-manager/readme.md b/specification/redis/resource-manager/readme.md
index cc253b6d82ea..a2e5f525e67c 100644
--- a/specification/redis/resource-manager/readme.md
+++ b/specification/redis/resource-manager/readme.md
@@ -60,13 +60,19 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  # last generated with AutoRest.0.17.3
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Redis
+  output-folder: $(csharp-sdks-folder)/RedisCache/Management.Redis/Generated
+```
\ No newline at end of file
diff --git a/specification/relay/resource-manager/readme.md b/specification/relay/resource-manager/readme.md
index 34704f210cb7..e6816dc5874c 100644
--- a/specification/relay/resource-manager/readme.md
+++ b/specification/relay/resource-manager/readme.md
@@ -51,13 +51,18 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Relay
+  output-folder: $(csharp-sdks-folder)/Relay/Management.Relay/Generated
+```
\ No newline at end of file
diff --git a/specification/resourcehealth/resource-manager/readme.md b/specification/resourcehealth/resource-manager/readme.md
index 3e2659511f28..39bbdfc57f88 100644
--- a/specification/resourcehealth/resource-manager/readme.md
+++ b/specification/resourcehealth/resource-manager/readme.md
@@ -37,17 +37,4 @@ These settings apply only when `--tag=package-2015-01` is specified on the comma
 ``` yaml $(tag) == 'package-2015-01'
 input-file:
 - Microsoft.ResourceHealth/2015-01-01/resourcehealth.json
-```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+```
\ No newline at end of file
diff --git a/specification/resources/resource-manager/readme.md b/specification/resources/resource-manager/readme.md
index bb29592c38d9..fa2abc67848e 100644
--- a/specification/resources/resource-manager/readme.md
+++ b/specification/resources/resource-manager/readme.md
@@ -26,7 +26,34 @@ These are the global settings for the Resource API.
 
 ``` yaml
 openapi-type: arm
-tag: package-2017-05
+```
+
+``` yaml $(package-features)
+tag: package-features-2015-12
+```
+
+``` yaml $(package-locks)
+tag: package-locks-2016-09
+```
+
+``` yaml $(package-policy)
+tag: package-policy-2016-12
+```
+
+``` yaml $(package-resources)
+tag: package-resources-2017-05
+```
+
+``` yaml $(package-subscriptions)
+tag: package-subscriptions-2016-06
+```
+
+``` yaml $(package-links)
+tag: package-links-2016-09
+```
+
+``` yaml $(package-managedapplications)
+tag: package-managedapplications-2016-09
 ```
 
 ### Tag: package-features-2015-12
@@ -45,6 +72,14 @@ input-file:
 - Microsoft.Authorization/2016-09-01/locks.json
 ```
 
+### Tag: package-locks-2015-01
+These settings apply only when `--tag=package-locks-2015-01` is specified on the command line.
+
+``` yaml $(tag) == 'package-locks-2015-01'
+input-file:
+- Microsoft.Authorization/2015-01-01/locks.json
+```
+
 ### Tag: package-policy-2016-12
 These settings apply only when `--tag=package-policy-2016-12` is specified on the command line.
 
@@ -53,139 +88,99 @@ input-file:
 - Microsoft.Authorization/2016-12-01/policy.json
 ```
 
-### Tag: package-resources-2017-05
-These settings apply only when `--tag=package-resources-2017-05` is specified on the command line.
+### Tag: package-policy-2016-04
+These settings apply only when `--tag=package-policy-2016-04` is specified on the command line.
 
-``` yaml $(tag) == 'package-resources-2017-05'
+``` yaml $(tag) == 'package-policy-2016-04'
 input-file:
-- Microsoft.Resources/2017-05-10/resources.json
+- Microsoft.Authorization/2016-04-01/policy.json
 ```
 
-### Tag: package-subscriptions-2016-06
-These settings apply only when `--tag=package-subscriptions-2016-06` is specified on the command line.
+### Tag: package-policy-2015-10
+These settings apply only when `--tag=package-policy-2015-10` is specified on the command line.
 
-``` yaml $(tag) == 'package-subscriptions-2016-06'
+``` yaml $(tag) == 'package-policy-2015-10'
 input-file:
-- Microsoft.Resources/2016-06-01/subscriptions.json
+- Microsoft.Authorization/2015-10-01-preview/policy.json
 ```
 
-### Tag: package-2017-05
-
-These settings apply only when `--tag=package-2017-05` is specified on the command line.
+### Tag: package-resources-2017-05
+These settings apply only when `--tag=package-resources-2017-05` is specified on the command line.
 
-``` yaml $(tag) == 'package-2017-05'
-title: ResourceClient
-description: Resource Client
+``` yaml $(tag) == 'package-resources-2017-05'
 input-file:
-- Microsoft.Authorization/2016-09-01/locks.json
-- Microsoft.Authorization/2016-12-01/policy.json
-- Microsoft.Features/2015-12-01/features.json
 - Microsoft.Resources/2017-05-10/resources.json
-- Microsoft.Resources/2016-06-01/subscriptions.json
-- Microsoft.Scheduler/2016-09-01/links.json
-- Microsoft.Solutions/2016-09-01-preview/managedapplications.json
 ```
- 
-### Tag: package-2016-09
 
-These settings apply only when `--tag=package-2016-09` is specified on the command line.
+### Tag: package-resources-2016-09
+These settings apply only when `--tag=package-resources-2016-09` is specified on the command line.
 
-``` yaml $(tag) == 'package-2016-09'
-title: ResourceClient
-description: Resource Client
+``` yaml $(tag) == 'package-resources-2016-09'
 input-file:
-- Microsoft.Authorization/2016-09-01/locks.json
-- Microsoft.Authorization/2016-04-01/policy.json
-- Microsoft.Features/2015-12-01/features.json
 - Microsoft.Resources/2016-09-01/resources.json
-- Microsoft.Resources/2016-06-01/subscriptions.json
-- Microsoft.Resources/2016-09-01/links.json
 ```
- 
-### Tag: package-2016-07
 
-These settings apply only when `--tag=package-2016-07` is specified on the command line.
+### Tag: package-resources-2016-07
+These settings apply only when `--tag=package-resources-2016-07` is specified on the command line.
 
-``` yaml $(tag) == 'package-2016-07'
-title: ResourceClient
-description: Resource Client
+``` yaml $(tag) == 'package-resources-2016-07'
 input-file:
-- Microsoft.Authorization/2015-01-01/locks.json
-- Microsoft.Authorization/2016-04-01/policy.json
-- Microsoft.Features/2015-12-01/features.json
 - Microsoft.Resources/2016-07-01/resources.json
-- Microsoft.Resources/2016-06-01/subscriptions.json
 ```
- 
-### Tag: package-2016-06
 
-These settings apply only when `--tag=package-2016-06` is specified on the command line.
+### Tag: package-resources-2015-11
+These settings apply only when `--tag=package-resources-2015-11` is specified on the command line.
 
-``` yaml $(tag) == 'package-2016-06'
-title: ResourceClient
-description: Resource Client
+``` yaml $(tag) == 'package-resources-2015-11'
 input-file:
-- Microsoft.Authorization/2015-01-01/locks.json
-- Microsoft.Authorization/2016-04-01/policy.json
-- Microsoft.Features/2015-12-01/features.json
-- Microsoft.Resources/2016-02-01/resources.json
-- Microsoft.Resources/2016-06-01/subscriptions.json
+- Microsoft.Resources/2015-11-01/resources.json
 ```
- 
-### Tag: package-2016-04
 
-These settings apply only when `--tag=package-2016-04` is specified on the command line.
+### Tag: package-subscriptions-2016-06
+These settings apply only when `--tag=package-subscriptions-2016-06` is specified on the command line.
 
-``` yaml $(tag) == 'package-2016-04'
-title: ResourceClient
-description: Resource Client
+``` yaml $(tag) == 'package-subscriptions-2016-06'
 input-file:
-- Microsoft.Authorization/2015-01-01/locks.json
-- Microsoft.Authorization/2016-04-01/policy.json
-- Microsoft.Features/2015-12-01/features.json
-- Microsoft.Resources/2016-02-01/resources.json
-- Microsoft.Resources/2015-11-01/subscriptions.json
+- Microsoft.Resources/2016-06-01/subscriptions.json
 ```
- 
-### Tag: package-2016-02
 
-These settings apply only when `--tag=package-2016-02` is specified on the command line.
+### Tag: package-subscriptions-2015-11
+These settings apply only when `--tag=package-subscriptions-2015-11` is specified on the command line.
 
-``` yaml $(tag) == 'package-2016-02'
-title: ResourceClient
-description: Resource Client
+``` yaml $(tag) == 'package-subscriptions-2015-11'
 input-file:
-- Microsoft.Authorization/2015-01-01/locks.json
-- Microsoft.Authorization/2015-10-01-preview/policy.json
-- Microsoft.Features/2015-12-01/features.json
-- Microsoft.Resources/2016-02-01/resources.json
 - Microsoft.Resources/2015-11-01/subscriptions.json
 ```
- 
-### Tag: package-2015-12
 
-These settings apply only when `--tag=package-2015-12` is specified on the command line.
+### Tag: package-links-2016-09
+These settings apply only when `--tag=package-links-2016-09` is specified on the command line.
 
-``` yaml $(tag) == 'package-2015-12'
-title: ResourceClient
-description: Resource Client
+``` yaml $(tag) == 'package-links-2016-09'
 input-file:
-- Microsoft.Authorization/2015-01-01/locks.json
-- Microsoft.Authorization/2015-10-01-preview/policy.json
-- Microsoft.Features/2015-12-01/features.json
-- Microsoft.Resources/2015-11-01/resources.json
-- Microsoft.Resources/2015-11-01/subscriptions.json
+- Microsoft.Resources/2016-09-01/links.json
 ```
 
+### Tag: package-managedapplications-2016-09
+These settings apply only when `--tag=package-managedapplications-2016-09` is specified on the command line.
+
+``` yaml $(tag) == 'package-managedapplications-2016-09'
+input-file:
+- Microsoft.Solutions/2016-09-01-preview/managedapplications.json
+```
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C#
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
-``` yaml $(csharp)
+```yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  namespace: Microsoft.Azure.Management.ResourceManager
+  license-header: MICROSOFT_MIT
+  output-folder: $(csharp-sdks-folder)/Resource/Management.ResourceManager/Generated
+```
\ No newline at end of file
diff --git a/specification/scheduler/resource-manager/readme.md b/specification/scheduler/resource-manager/readme.md
index 4e790b860388..f3cd2ab03bd1 100644
--- a/specification/scheduler/resource-manager/readme.md
+++ b/specification/scheduler/resource-manager/readme.md
@@ -59,13 +59,15 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: NONE
+  namespace: Microsoft.Azure.Management.Scheduler
+  output-folder: $(csharp-sdks-folder)/Scheduler/Management.Scheduler/Generated
+```
\ No newline at end of file
diff --git a/specification/search/data-plane/readme.md b/specification/search/data-plane/readme.md
index 675cbbb43cf7..c668341e52b3 100644
--- a/specification/search/data-plane/readme.md
+++ b/specification/search/data-plane/readme.md
@@ -25,7 +25,6 @@ To see additional help and options, run:
 These are the global settings for the SearchClient API.
 
 ``` yaml
- 
 title: SearchClient
 description: Search Client
 openapi-type: data-plane
@@ -65,13 +64,15 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Search
+  output-folder: $(csharp-sdks-folder)/Search/DataPlane/Microsoft.Azure.Search/GeneratedSearchIndex
+```
\ No newline at end of file
diff --git a/specification/search/resource-manager/readme.md b/specification/search/resource-manager/readme.md
index 632d2aae9916..835aec629022 100644
--- a/specification/search/resource-manager/readme.md
+++ b/specification/search/resource-manager/readme.md
@@ -50,13 +50,15 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Search
+  output-folder: $(csharp-sdks-folder)/Search/Management/Management.Search/Generated
+```
\ No newline at end of file
diff --git a/specification/servermanagement/resource-manager/readme.md b/specification/servermanagement/resource-manager/readme.md
index f335cc0b3b60..56f684e870ea 100644
--- a/specification/servermanagement/resource-manager/readme.md
+++ b/specification/servermanagement/resource-manager/readme.md
@@ -50,13 +50,18 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.ServerManagement
+  output-folder: $(csharp-sdks-folder)/ServerManagement/Management.ServerManagement/Generated
+```
\ No newline at end of file
diff --git a/specification/service-map/resource-manager/readme.md b/specification/service-map/resource-manager/readme.md
index 238022ce0c82..05edb2a23f7a 100644
--- a/specification/service-map/resource-manager/readme.md
+++ b/specification/service-map/resource-manager/readme.md
@@ -37,17 +37,4 @@ These settings apply only when `--tag=package-2015-11-preview` is specified on t
 ``` yaml $(tag) == 'package-2015-11-preview'
 input-file:
 - Microsoft.OperationalInsights/2015-11-01-preview/arm-service-map.json
-```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+```
\ No newline at end of file
diff --git a/specification/servicebus/resource-manager/readme.md b/specification/servicebus/resource-manager/readme.md
index 88c311af8b2a..c4e8376bd563 100644
--- a/specification/servicebus/resource-manager/readme.md
+++ b/specification/servicebus/resource-manager/readme.md
@@ -51,13 +51,18 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.ServiceBus
+  output-folder: $(csharp-sdks-folder)/ServiceBus/Management.ServiceBus/Generated
+```
\ No newline at end of file
diff --git a/specification/servicefabric/data-plane/README.md b/specification/servicefabric/data-plane/README.md
index 0d708c04d9e2..53fba5eeaf8d 100644
--- a/specification/servicefabric/data-plane/README.md
+++ b/specification/servicefabric/data-plane/README.md
@@ -47,17 +47,4 @@ These settings apply only when `--tag=5.6` is specified on the command line.
 ``` yaml $(tag) == '1.0.0'
 input-file:
 - Microsoft.ServiceFabric/5.6/servicefabric.json
-```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+```
\ No newline at end of file
diff --git a/specification/servicefabric/resource-manager/readme.md b/specification/servicefabric/resource-manager/readme.md
index b78ae2aea483..f82b734d77f3 100644
--- a/specification/servicefabric/resource-manager/readme.md
+++ b/specification/servicefabric/resource-manager/readme.md
@@ -41,13 +41,18 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.ServiceFabric
+  output-folder: $(csharp-sdks-folder)/ServiceFabric/Management.ServiceFabric/Generated
+```
\ No newline at end of file
diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md
index 1203dcea747c..86d9fef41d5d 100644
--- a/specification/sql/resource-manager/readme.md
+++ b/specification/sql/resource-manager/readme.md
@@ -79,18 +79,24 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Sql
+  output-folder: $(csharp-sdks-folder)/SqlManagement/Management.Sql/Generated
 ```
 
 
-## Language-specific settings: Python
+## Python
 
 These settings apply only when `--python` is specified on the command line.
 
diff --git a/specification/storage/resource-manager/readme.md b/specification/storage/resource-manager/readme.md
index 1e7539ed404d..4978223033b5 100644
--- a/specification/storage/resource-manager/readme.md
+++ b/specification/storage/resource-manager/readme.md
@@ -87,13 +87,19 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.Storage
+  payload-flattening-threshold: 2
+  output-folder: $(csharp-sdks-folder)/Storage/Management.Storage/Generated
+```
\ No newline at end of file
diff --git a/specification/storageimportexport/resource-manager/readme.md b/specification/storageimportexport/resource-manager/readme.md
index 78a8c885983c..d8ce4773fa25 100644
--- a/specification/storageimportexport/resource-manager/readme.md
+++ b/specification/storageimportexport/resource-manager/readme.md
@@ -37,17 +37,4 @@ These settings apply only when `--tag=package-2016-11` is specified on the comma
 ``` yaml $(tag) == 'package-2016-11'
 input-file:
 - Microsoft.ImportExport/2016-11-01/storageimportexport.json
-```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+```
\ No newline at end of file
diff --git a/specification/storsimple8000series/resource-manager/readme.md b/specification/storsimple8000series/resource-manager/readme.md
index c488f6497358..df48ae3479b2 100644
--- a/specification/storsimple8000series/resource-manager/readme.md
+++ b/specification/storsimple8000series/resource-manager/readme.md
@@ -39,15 +39,19 @@ input-file:
 - Microsoft.StorSimple/2017-06-01/storsimple.json
 ```
 
-
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.StorSimple8000Series
+  output-folder: $(csharp-sdks-folder)/StorSimple8000Series/Management.StorSimple8000Series/Generated
 ```
-
diff --git a/specification/streamanalytics/resource-manager/readme.md b/specification/streamanalytics/resource-manager/readme.md
index 41e3d2176f9d..2555330b7aba 100644
--- a/specification/streamanalytics/resource-manager/readme.md
+++ b/specification/streamanalytics/resource-manager/readme.md
@@ -48,13 +48,18 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.StreamAnalytics
+  output-folder: $(csharp-sdks-folder)/StreamAnalytics/Management.StreamAnalytics/Generated
 ```
-
diff --git a/specification/timeseriesinsights/resource-manager/readme.md b/specification/timeseriesinsights/resource-manager/readme.md
index e08d3d688fb1..8bb1806d2996 100644
--- a/specification/timeseriesinsights/resource-manager/readme.md
+++ b/specification/timeseriesinsights/resource-manager/readme.md
@@ -37,17 +37,4 @@ These settings apply only when `--tag=package-2017-02-preview` is specified on t
 ``` yaml $(tag) == 'package-2017-02-preview'
 input-file:
 - Microsoft.TimeSeriesInsights/2017-02-28-preview/timeseriesinsights.json
-```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+```
\ No newline at end of file
diff --git a/specification/trafficmanager/resource-manager/readme.md b/specification/trafficmanager/resource-manager/readme.md
index 351534cb2b01..5c8f3aa1b970 100644
--- a/specification/trafficmanager/resource-manager/readme.md
+++ b/specification/trafficmanager/resource-manager/readme.md
@@ -60,13 +60,20 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
-
+  # last generated with commit 9e35e9c1e14dc46fcb1837ad108bba185ccaf9a9
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION
+  namespace: Microsoft.Azure.Management.TrafficManager
+  payload-flattening-threshold: 2
+  output-folder: $(csharp-sdks-folder)/TrafficManager/Management.TrafficManager/Generated
+```
\ No newline at end of file
diff --git a/specification/visualstudio/resource-manager/readme.md b/specification/visualstudio/resource-manager/readme.md
index 6f68e257facd..7913145a2dc6 100644
--- a/specification/visualstudio/resource-manager/readme.md
+++ b/specification/visualstudio/resource-manager/readme.md
@@ -43,16 +43,4 @@ These settings apply only when `--tag=package-2014-04-preview` is specified on t
 ``` yaml $(tag) == 'package-2014-04-preview'
 input-file:
 - Microsoft.VisualStudio/2014-04-01-preview/Csm.json
-```
-
-
----
-## Language-specific settings: CSharp
-
-These settings apply only when `--csharp` is specified on the command line.
-
-``` yaml $(csharp)
-csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
-```
+```
\ No newline at end of file
diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md
index 841522e1413b..8c6482e00c34 100644
--- a/specification/web/resource-manager/readme.md
+++ b/specification/web/resource-manager/readme.md
@@ -69,18 +69,25 @@ input-file:
 
 
 ---
-## Language-specific settings: CSharp
+# Code Generation
+
+
+## C# 
 
 These settings apply only when `--csharp` is specified on the command line.
+Please also specify `--csharp-sdks-folder=<path to "SDKs" directory of your azure-sdk-for-net clone>`.
 
 ``` yaml $(csharp)
 csharp:
-  # override the default output folder
-  output-folder: $(output-folder)/csharp
+  # last generated with commit e416af734666d658a04530df605f60480c01cc10
+  azure-arm: true
+  license-header: MICROSOFT_MIT
+  namespace: Microsoft.Azure.Management.WebSites
+  output-folder: $(csharp-sdks-folder)/WebSites/Management.WebSites/Generated
 ```
 
 
-## Language-specific settings: Python
+## Python
 
 These settings apply only when `--python` is specified on the command line.