diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md
index c9297cd3b8fc..ead32fce76af 100644
--- a/specification/compute/resource-manager/readme.md
+++ b/specification/compute/resource-manager/readme.md
@@ -61,16 +61,6 @@ input-file:
 - Microsoft.Compute/2017-03-30/runCommands.json
 ```
 
-### Tag: package-container-instance-2017-08-preview
-
-These settings apply only when `--tag=package-container-instance-2017-08-preview` is specified on the command line.
-
-``` yaml $(tag) == 'package-container-instance-2017-08-preview'
-input-file:
-- Microsoft.ContainerInstance/2017-08-01-preview/containerInstance.json
-```
-
-
 ### Tag: package-container-service-2017-01
 
 These settings apply only when `--tag=package-container-service-2017-01` is specified on the command line.
diff --git a/specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/containerInstance.json
similarity index 98%
rename from specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/containerInstance.json
rename to specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/containerInstance.json
index 8f84576c8600..aad99c489883 100644
--- a/specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/containerInstance.json
+++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/containerInstance.json
@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "version": "2017-08-01-preview",
-    "title": "Microsoft Container Instance Management Client"
+    "title": "ContainerInstanceManagementClient"
   },
   "host": "management.azure.com",
   "schemes": [
@@ -35,10 +35,10 @@
   "paths": {
     "/subscriptions/{subscriptionId}/providers/Microsoft.ContainerInstance/containerGroups": {
       "get": {
-        "operationId": "ContainerGroups_ListAll",
+        "operationId": "ContainerGroups_List",
         "x-ms-examples": {
-          "ContainerGroupsListAll": {
-            "$ref": "./examples/ContainerGroupsListAll.json"
+          "ContainerGroupsList": {
+            "$ref": "./examples/ContainerGroupsList.json"
           }
         },
         "description": "Get the list of container groups in a given subscription.",
@@ -65,10 +65,10 @@
     },
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerInstance/containerGroups": {
       "get": {
-        "operationId": "ContainerGroups_List",
+        "operationId": "ContainerGroups_ListByResourceGroup",
         "x-ms-examples": {
-          "ContainerGroupsList": {
-            "$ref": "./examples/ContainerGroupsList.json"
+          "ContainerGroupsListByResourceGroup": {
+            "$ref": "./examples/ContainerGroupsListByResourceGroup.json"
           }
         },
         "description": "Get the list of container groups in a given resource group.",
@@ -278,7 +278,7 @@
             "name": "tail",
             "in": "query",
             "description": "Only show this number of log lines. If not provided, all available logs are shown.",
-            "type": "string"
+            "type": "integer"
           }
         ],
         "responses": {
diff --git a/specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsCreateOrUpdate.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsCreateOrUpdate.json
similarity index 100%
rename from specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsCreateOrUpdate.json
rename to specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsCreateOrUpdate.json
diff --git a/specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsDelete.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsDelete.json
similarity index 100%
rename from specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsDelete.json
rename to specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsDelete.json
diff --git a/specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsGet.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsGet.json
similarity index 100%
rename from specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsGet.json
rename to specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsGet.json
diff --git a/specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsListAll.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsList.json
similarity index 100%
rename from specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsListAll.json
rename to specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsList.json
diff --git a/specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsList.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsListByResourceGroup.json
similarity index 100%
rename from specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsList.json
rename to specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerGroupsListByResourceGroup.json
diff --git a/specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerLogsList.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerLogsList.json
similarity index 100%
rename from specification/compute/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerLogsList.json
rename to specification/containerinstance/resource-manager/Microsoft.ContainerInstance/2017-08-01-preview/examples/ContainerLogsList.json
diff --git a/specification/containerinstance/resource-manager/readme.md b/specification/containerinstance/resource-manager/readme.md
new file mode 100644
index 000000000000..9a0cee3c5a6a
--- /dev/null
+++ b/specification/containerinstance/resource-manager/readme.md
@@ -0,0 +1,73 @@
+# ContainerInstance
+    
+> see https://aka.ms/autorest
+
+This is the AutoRest configuration file for ContainerInstance.
+
+
+
+---
+## Getting Started 
+To build the SDK for ContainerInstance, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
+
+> `autorest`
+
+To see additional help and options, run:
+
+> `autorest --help`
+---
+
+## Configuration
+
+
+
+### Basic Information 
+These are the global settings for the ContainerInstance API.
+
+``` yaml
+openapi-type: arm
+tag: package-2017-08-preview
+```
+
+
+### Tag: package-2017-08-preview
+
+These settings apply only when `--tag=package-2017-08-preview` is specified on the command line.
+
+``` yaml $(tag) == 'package-2017-08-preview'
+input-file:
+- Microsoft.ContainerInstance/2017-08-01-preview/containerInstance.json
+```
+
+
+---
+# 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:
+  azure-arm: true
+  license-header: MICROSOFT_MIT_NO_VERSION
+  namespace: Microsoft.Azure.Management.ContainerInstance
+  payload-flattening-threshold: 1
+  output-folder: $(csharp-sdks-folder)/ContainerInstance/Management.ContainerInstance/Generated
+  clear-output-folder: true
+```
+
+
+## Python
+
+These settings apply only when `--python` is specified on the command line.
+
+``` yaml $(python)
+python:
+  # override the default output folder
+  namespace: azure.mgmt.containerinstance
+  output-folder: $(output-folder)/python
+  license-header: MICROSOFT_MIT_NO_VERSION
+  payload-flattening-threshold: 2
+```