diff --git a/arm-recoveryservices/2016-06-01/swagger/recoveryservices.json b/arm-recoveryservices/2016-06-01/swagger/recoveryservices.json
new file mode 100644
index 000000000000..4cd89d4f09dc
--- /dev/null
+++ b/arm-recoveryservices/2016-06-01/swagger/recoveryservices.json
@@ -0,0 +1,339 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "version": "2016-06-01",
+    "title": "RecoveryServicesClient",
+    "x-ms-code-generation-settings": {
+      "internalConstructors": false
+    }
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}": {
+      "get": {
+        "tags": [
+          "Vaults"
+        ],
+        "description": "Get the Vault details.",
+        "operationId": "Vaults_Get",
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/SubscriptionId"
+          },
+          {
+            "$ref": "#/parameters/ResourceGroupName"
+          },
+          {
+            "$ref": "#/parameters/VaultName"
+          },
+          {
+            "$ref": "#/parameters/ApiVersion"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Vault"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Vaults"
+        ],
+        "description": "Creates or updates a Recovery Services vault.",
+        "operationId": "Vaults_CreateOrUpdate",
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/SubscriptionId"
+          },
+          {
+            "$ref": "#/parameters/ResourceGroupName"
+          },
+          {
+            "$ref": "#/parameters/VaultName"
+          },
+          {
+            "$ref": "#/parameters/ApiVersion"
+          },
+          {
+            "name": "vault",
+            "in": "body",
+            "description": "Recovery Services Vault to be created.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Vault"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Vault"
+            }
+          },
+          "201": {
+            "description": "Created",
+            "schema": {
+              "$ref": "#/definitions/Vault"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Vaults"
+        ],
+        "description": "Deletes a vault.",
+        "operationId": "Vaults_Delete",
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/SubscriptionId"
+          },
+          {
+            "$ref": "#/parameters/ResourceGroupName"
+          },
+          {
+            "$ref": "#/parameters/VaultName"
+          },
+          {
+            "$ref": "#/parameters/ApiVersion"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults": {
+      "get": {
+        "tags": [
+          "Vaults"
+        ],
+        "summary": "Retrieve a list of Vaults.",
+        "operationId": "Vaults_ListByResourceGroup",
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/SubscriptionId"
+          },
+          {
+            "$ref": "#/parameters/ResourceGroupName"
+          },
+          {
+            "$ref": "#/parameters/ApiVersion"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VaultList"
+            }
+          }
+        },
+        "deprecated": false,
+        "x-ms-pageable": {
+          "nextLinkName": "null"
+        }
+      }
+    }
+  },
+  "definitions": {
+    "Object": {
+      "description": "Base of all objects.",
+      "type": "object",
+      "properties": {}
+    },
+    "VaultList": {
+      "description": "The response model for Vault.",
+      "type": "object",
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Vault"
+          }
+        }
+      }
+    },
+    "Vault": {
+      "description": "Resource information, as returned by the resource provider.",
+      "required": [
+        "location"
+      ],
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "etag": {
+          "description": "ETag of the Vault.",
+          "type": "string",
+          "readOnly": true
+        },
+        "properties": {
+          "$ref": "#/definitions/VaultProperties"
+        }
+      }
+    },
+    "Sku": {
+      "description": "Identifies the unique system identifier for each Azure resource.",
+      "required": [
+        "name"
+      ],
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "The Sku name.",
+          "enum": [
+            "Standard",
+            "RS0"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "SkuName",
+            "modelAsString": true
+          }
+        }
+      }
+    },
+    "VaultProperties": {
+      "description": "Properties of the vault.",
+      "type": "object",
+      "properties": {
+        "provisioningState": {
+          "description": "Provisioning State.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "Resource": {
+      "properties": {
+        "id": {
+          "description": "Resource Id",
+          "type": "string",
+          "readOnly": true
+        },
+        "name": {
+          "description": "Resource Name",
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "description": "Resource Type",
+          "type": "string",
+          "readOnly": true
+        },
+        "location": {
+          "description": "Resource Location",
+          "type": "string"
+        },
+        "sku": {
+          "$ref": "#/definitions/Sku"
+        },
+        "tags": {
+          "description": "Resource Tags",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        }
+      },
+      "x-ms-azure-resource": true
+    }
+  },
+  "parameters": {
+    "SubscriptionId": {
+      "name": "subscriptionId",
+      "in": "path",
+      "description": "The subscription Id.",
+      "required": true,
+      "type": "string"
+    },
+    "ResourceGroupName": {
+      "name": "resourceGroupName",
+      "in": "path",
+      "description": "The name of the resource group where the recovery services vault is present.",
+      "required": true,
+      "x-ms-parameter-location": "method",
+      "type": "string"
+    },
+    "VaultName": {
+      "name": "vaultName",
+      "in": "path",
+      "description": "The name of the recovery services vault.",
+      "required": true,
+      "x-ms-parameter-location": "method",
+      "type": "string"
+    },
+    "ApiVersion": {
+      "name": "api-version",
+      "in": "query",
+      "description": "Client Api Version.",
+      "required": true,
+      "type": "string"
+    }
+  },
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "description": "Azure Active Directory OAuth2 Flow",
+      "flow": "implicit",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "scopes": {
+        "user_impersonation": "impersonate your user account."
+      }
+    }
+  },
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/arm-recoveryservices/2016-06-01/swagger/registeredidentities.json b/arm-recoveryservices/2016-06-01/swagger/registeredidentities.json
deleted file mode 100644
index 22629878c4e9..000000000000
--- a/arm-recoveryservices/2016-06-01/swagger/registeredidentities.json
+++ /dev/null
@@ -1,386 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "version": "2016-06-01",
-    "title": "RecoveryServicesClient",
-    "x-ms-code-generation-settings": {
-      "internalConstructors": false
-    }
-  },
-  "host": "management.azure.com",
-  "schemes": [
-    "https"
-  ],
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "paths": {
-    "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/operations": {
-      "get": {
-        "tags": [
-          "Operations"
-        ],
-        "description": "Returns the list of available operations.",
-        "operationId": "Operations_List",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "./vaults.json#/definitions/ClientDiscoveryResponse"
-            }
-          }
-        },
-        "deprecated": false,
-        "x-ms-pageable": {
-          "nextLinkName": "NextLink"
-        }
-      }
-    },
-    "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/certificates/{certificateName}": {
-      "put": {
-        "tags": [
-          "VaultCertificates"
-        ],
-        "description": "Upload a certificate for a resource.",
-        "operationId": "VaultCertificates_Create",
-        "consumes": [
-          "application/json"
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/VaultName"
-          },
-          {
-            "name": "certificateName",
-            "in": "path",
-            "description": "Certificate friendly name.",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "certificateRequest",
-            "in": "body",
-            "description": "Input parameters for uploading the vault certificate.",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/CertificateRequest"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/VaultCertificateResponse"
-            }
-          }
-        },
-        "deprecated": false
-      }
-    },
-    "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/registeredIdentities/{identityName}": {
-      "delete": {
-        "tags": [
-          "RegisteredIdentities"
-        ],
-        "description": "Unregisters the given container from your Recovery Services vault.",
-        "operationId": "RegisteredIdentities_Delete",
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/VaultName"
-          },
-          {
-            "name": "identityName",
-            "in": "path",
-            "description": "Name of the protection container to unregister.",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "NoContent"
-          }
-        },
-        "deprecated": false
-      }
-    }
-  },
-  "definitions": {
-    "CertificateRequest": {
-      "description": "Details of the certificate to be uploaded to the vault.",
-      "type": "object",
-      "properties": {
-        "properties": {
-          "$ref": "#/definitions/RawCertificateData"
-        }
-      }
-    },
-    "RawCertificateData": {
-      "description": "Raw certificate data.",
-      "type": "object",
-      "properties": {
-        "authType": {
-          "description": "Specifies the authentication type.",
-          "enum": [
-            "Invalid",
-            "ACS",
-            "AAD",
-            "AccessControlService",
-            "AzureActiveDirectory"
-          ],
-          "type": "string",
-          "x-ms-enum": {
-            "name": "AuthType",
-            "modelAsString": true
-          }
-        },
-        "certificate": {
-          "format": "byte",
-          "description": "The base64 encoded certificate raw data string",
-          "type": "string"
-        }
-      }
-    },
-    "ResourceCertificateAndAADDetails": {
-      "description": "Certificate details representing the Vault credentials for AAD.",
-      "required": [
-        "certificate",
-        "resourceId",
-        "aadAuthority",
-        "aadTenantId",
-        "servicePrincipalClientId",
-        "servicePrincipalObjectId",
-        "azureManagementEndpointAudience",
-        "subject",
-        "validFrom",
-        "validTo",
-        "thumbprint",
-        "friendlyName",
-        "issuer"
-      ],
-      "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/definitions/ResourceCertificateDetails"
-        }
-      ],
-      "properties": {
-        "aadAuthority": {
-          "description": "AAD tenant authority.",
-          "type": "string"
-        },
-        "aadTenantId": {
-          "description": "AAD tenant Id.",
-          "type": "string"
-        },
-        "servicePrincipalClientId": {
-          "description": "AAD service principal clientId.",
-          "type": "string"
-        },
-        "servicePrincipalObjectId": {
-          "description": "AAD service principal ObjectId.",
-          "type": "string"
-        },
-        "azureManagementEndpointAudience": {
-          "description": "Azure Management Endpoint Audience.",
-          "type": "string"
-        }
-      },
-      "x-ms-discriminator-value": "AzureActiveDirectory"
-    },
-    "ResourceCertificateAndACSDetails": {
-      "description": "Certificate details representing the Vault credentials for ACS.",
-      "required": [
-        "certificate",
-        "resourceId",
-        "globalAcsNamespace",
-        "globalAcsHostName",
-        "globalAcsRPRealm",
-        "subject",
-        "validFrom",
-        "validTo",
-        "thumbprint",
-        "friendlyName",
-        "issuer"
-      ],
-      "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/definitions/ResourceCertificateDetails"
-        }
-      ],
-      "properties": {
-        "globalAcsNamespace": {
-          "description": "ACS namespace name - tenant for our service.",
-          "type": "string"
-        },
-        "globalAcsHostName": {
-          "description": "Acs mgmt host name to connect to.",
-          "type": "string"
-        },
-        "globalAcsRPRealm": {
-          "description": "Global ACS namespace RP realm.",
-          "type": "string"
-        }
-      },
-      "x-ms-discriminator-value": "AccessControlService"
-    },
-    "ResourceCertificateDetails": {
-      "description": "Certificate details representing the Vault credentials.",
-      "required": [
-        "authType"
-      ],
-      "type": "object",
-      "properties": {
-        "authType": {
-          "description": "This property will be used as the discriminator for deciding the specific types in the polymorhpic chain of types.",
-          "type": "string"
-        },
-        "certificate": {
-          "format": "byte",
-          "description": "The base64 encoded certificate raw data string.",
-          "type": "string"
-        },
-        "friendlyName": {
-          "description": "Certificate friendlyname.",
-          "type": "string"
-        },
-        "issuer": {
-          "description": "Certificate issuer.",
-          "type": "string"
-        },
-        "resourceId": {
-          "format": "int64",
-          "description": "Resource ID of the vault.",
-          "type": "integer"
-        },
-        "subject": {
-          "description": "Certificate Subject Name.",
-          "type": "string"
-        },
-        "thumbprint": {
-          "description": "Certificate thumbprint.",
-          "type": "string"
-        },
-        "validFrom": {
-          "format": "date-time",
-          "description": "Certificate Validity start Date time.",
-          "type": "string"
-        },
-        "validTo": {
-          "format": "date-time",
-          "description": "Certificate Validity End Date time.",
-          "type": "string"
-        }
-      },
-      "discriminator": "authType"
-    },
-    "VaultCertificateResponse": {
-      "description": "Certificate corresponding to a vault that can be used by clients to register themselves with the vault.",
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "type": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
-        },
-        "properties": {
-          "$ref": "#/definitions/ResourceCertificateDetails"
-        }
-      }
-    }
-  },
-  "parameters": {
-    "SubscriptionId": {
-      "name": "subscriptionId",
-      "in": "path",
-      "description": "The subscription Id.",
-      "required": true,
-      "type": "string"
-    },
-    "ResourceGroupName": {
-      "name": "resourceGroupName",
-      "in": "path",
-      "description": "The name of the resource group where the recovery services vault is present.",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "type": "string"
-    },
-    "VaultName": {
-      "name": "vaultName",
-      "in": "path",
-      "description": "The name of the recovery services vault.",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "type": "string"
-    },
-    "ApiVersion": {
-      "name": "api-version",
-      "in": "query",
-      "description": "Client Api Version.",
-      "required": true,
-      "type": "string"
-    }
-  },
-  "securityDefinitions": {
-    "azure_auth": {
-      "type": "oauth2",
-      "description": "Azure Active Directory OAuth2 Flow",
-      "flow": "implicit",
-      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
-      "scopes": {
-        "user_impersonation": "impersonate your user account."
-      }
-    }
-  },
-  "security": [
-    {
-      "azure_auth": [
-        "user_impersonation"
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/arm-recoveryservices/2016-06-01/swagger/replicationusages.json b/arm-recoveryservices/2016-06-01/swagger/replicationusages.json
deleted file mode 100644
index 6ffa7b6a0f48..000000000000
--- a/arm-recoveryservices/2016-06-01/swagger/replicationusages.json
+++ /dev/null
@@ -1,218 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "version": "2016-06-01",
-    "title": "RecoveryServicesClient",
-    "x-ms-code-generation-settings": {
-      "internalConstructors": false
-    }
-  },
-  "host": "management.azure.com",
-  "schemes": [
-    "https"
-  ],
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "paths": {
-    "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/operations": {
-      "get": {
-        "tags": [
-          "Operations"
-        ],
-        "description": "Returns the list of available operations.",
-        "operationId": "Operations_List",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "../../2016-06-01/swagger/vaults.json#/definitions/ClientDiscoveryResponse"
-            }
-          }
-        },
-        "deprecated": false,
-        "x-ms-pageable": {
-          "nextLinkName": "NextLink"
-        }
-      }
-    },
-    "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/replicationUsages": {
-      "get": {
-        "tags": [
-          "ReplicationUsages"
-        ],
-        "description": "Fetches the replication usages of the vault.",
-        "operationId": "ReplicationUsages_List",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/VaultName"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/ReplicationUsageList"
-            }
-          }
-        },
-        "deprecated": false,
-        "x-ms-pageable": {
-          "nextLinkName": null
-        }
-      }
-    }
-  },
-  "definitions": {
-    "JobsSummary": {
-      "description": "Summary of the replication job data for this vault.",
-      "type": "object",
-      "properties": {
-        "failedJobs": {
-          "description": "Count of failed jobs.",
-          "type": "integer"
-        },
-        "suspendedJobs": {
-          "description": "Count of suspended jobs.",
-          "type": "integer"
-        },
-        "inProgressJobs": {
-          "description": "Count of in-progress jobs.",
-          "type": "integer"
-        }
-      }
-    },
-    "MonitoringSummary": {
-      "description": "Summary of the replication monitoring data for this vault.",
-      "type": "object",
-      "properties": {
-        "unHealthyVmCount": {
-          "description": "Count of unhealthy VMs.",
-          "type": "integer"
-        },
-        "unHealthyProviderCount": {
-          "description": "Count of unhealthy replication providers.",
-          "type": "integer"
-        },
-        "eventsCount": {
-          "description": "Count of all critical warnings.",
-          "type": "integer"
-        }
-      }
-    },
-    "ReplicationUsage": {
-      "description": "Replication usages of a vault.",
-      "type": "object",
-      "properties": {
-        "monitoringSummary": {
-          "$ref": "#/definitions/MonitoringSummary",
-          "description": "Summary of the replication monitoring data for this vault."
-        },
-        "jobsSummary": {
-          "$ref": "#/definitions/JobsSummary",
-          "description": "Summary of the replication jobs data for this vault."        
-        },
-        "protectedItemCount": {
-          "description": "Number of replication protected items for this vault.",
-          "type": "integer"
-        },
-        "recoveryPlanCount": {
-          "description": "Number of replication recovery plans for this vault.",
-          "type": "integer"
-        }
-      }
-    },
-    "ReplicationUsageList": {
-      "description": "Replication usages for vault.",
-      "type": "object",
-      "properties": {
-        "value": {
-          "description": "The list of replication usages for the given vault.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ReplicationUsage"
-          }
-        }
-      }
-    }
-  },
-  "parameters": {
-    "SubscriptionId": {
-      "name": "subscriptionId",
-      "in": "path",
-      "description": "The subscription Id.",
-      "required": true,
-      "type": "string"
-    },
-    "ResourceGroupName": {
-      "name": "resourceGroupName",
-      "in": "path",
-      "description": "The name of the resource group where the recovery services vault is present.",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "type": "string"
-    },
-    "VaultName": {
-      "name": "vaultName",
-      "in": "path",
-      "description": "The name of the recovery services vault.",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "type": "string"
-    },
-    "ApiVersion": {
-      "name": "api-version",
-      "in": "query",
-      "description": "Client Api Version.",
-      "required": true,
-      "type": "string"
-    }
-  },
-  "securityDefinitions": {
-    "azure_auth": {
-      "type": "oauth2",
-      "description": "Azure Active Directory OAuth2 Flow",
-      "flow": "implicit",
-      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
-      "scopes": {
-        "user_impersonation": "impersonate your user account."
-      }
-    }
-  },
-  "security": [
-    {
-      "azure_auth": [
-        "user_impersonation"
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/arm-recoveryservices/2016-06-01/swagger/vaults.json b/arm-recoveryservices/2016-06-01/swagger/vaults.json
deleted file mode 100644
index b2387a8e2572..000000000000
--- a/arm-recoveryservices/2016-06-01/swagger/vaults.json
+++ /dev/null
@@ -1,741 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "version": "2016-06-01",
-    "title": "RecoveryServicesClient",
-    "x-ms-code-generation-settings": {
-      "internalConstructors": false
-    }
-  },
-  "host": "management.azure.com",
-  "schemes": [
-    "https"
-  ],
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "paths": {
-    "/subscriptions/{subscriptionId}/providers/Microsoft.RecoveryServices/vaults": {
-      "get": {
-        "tags": [
-          "Vaults"
-        ],
-        "description": "Fetches all the resources of the specified type in the subscription.",
-        "operationId": "Vaults_ListBySubscriptionId",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/VaultList"
-            }
-          }
-        },
-        "deprecated": false,
-        "x-ms-pageable": {
-          "nextLinkName": null
-        }
-      }
-    },
-    "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/operations": {
-      "get": {
-        "tags": [
-          "Operations"
-        ],
-        "description": "Returns the list of available operations.",
-        "operationId": "Operations_List",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/ClientDiscoveryResponse"
-            }
-          }
-        },
-        "deprecated": false,
-        "x-ms-pageable": {
-          "nextLinkName": "NextLink"
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults": {
-      "get": {
-        "tags": [
-          "Vaults"
-        ],
-        "description": "Retrieve a list of Vaults.",
-        "operationId": "Vaults_ListByResourceGroup",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/VaultList"
-            }
-          }
-        },
-        "deprecated": false,
-        "x-ms-pageable": {
-          "nextLinkName": null
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}": {
-      "get": {
-        "tags": [
-          "Vaults"
-        ],
-        "description": "Get the Vault details.",
-        "operationId": "Vaults_Get",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/VaultName"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/Vault"
-            }
-          }
-        },
-        "deprecated": false
-      },
-      "put": {
-        "tags": [
-          "Vaults"
-        ],
-        "description": "Creates or updates a Recovery Services vault.",
-        "operationId": "Vaults_CreateOrUpdate",
-        "consumes": [
-          "application/json"
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/VaultName"
-          },
-          {
-            "name": "vault",
-            "in": "body",
-            "description": "Recovery Services Vault to be created.",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/Vault"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/Vault"
-            }
-          },
-          "201": {
-            "description": "Created",
-            "schema": {
-              "$ref": "#/definitions/Vault"
-            }
-          }
-        },
-        "deprecated": false
-      },
-      "delete": {
-        "tags": [
-          "Vaults"
-        ],
-        "description": "Deletes a vault.",
-        "operationId": "Vaults_Delete",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/VaultName"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK"
-          }
-        },
-        "deprecated": false
-      },
-      "patch": {
-        "tags": [
-          "Vaults"
-        ],
-        "description": "Updates the vault.",
-        "operationId": "Vaults_Update",
-        "consumes": [
-          "application/json"
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/VaultName"
-          },
-          {
-            "name": "vault",
-            "in": "body",
-            "description": "Recovery Services Vault to be created.",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/Vault"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/Vault"
-            }
-          },
-          "201": {
-            "description": "Created",
-            "schema": {
-              "$ref": "#/definitions/Vault"
-            }
-          }
-        },
-        "deprecated": false
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/extendedInformation/vaultExtendedInfo": {
-      "get": {
-        "tags": [
-          "VaultExtendedInfo"
-        ],
-        "description": "Get the vault extended info.",
-        "operationId": "VaultExtendedInfo_Get",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/VaultName"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/VaultExtendedInfoResource"
-            }
-          }
-        },
-        "deprecated": false
-      },
-      "put": {
-        "tags": [
-          "VaultExtendedInfo"
-        ],
-        "description": "Create vault extended info.",
-        "operationId": "VaultExtendedInfo_CreateOrUpdate",
-        "consumes": [
-          "application/json"
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/VaultName"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "name": "resourceResourceExtendedInfoDetails",
-            "in": "body",
-            "description": "resourceResourceExtendedInfoDetails",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/VaultExtendedInfoResource"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/VaultExtendedInfoResource"
-            }
-          }
-        },
-        "deprecated": false
-      },
-      "patch": {
-        "tags": [
-          "VaultExtendedInfo"
-        ],
-        "description": "Update vault extended info.",
-        "operationId": "VaultExtendedInfo_Update",
-        "consumes": [
-          "application/json"
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/VaultName"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "name": "resourceResourceExtendedInfoDetails",
-            "in": "body",
-            "description": "resourceResourceExtendedInfoDetails",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/VaultExtendedInfoResource"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/VaultExtendedInfoResource"
-            }
-          }
-        },
-        "deprecated": false
-      }
-    }
-  },
-  "definitions": {
-    "ClientDiscoveryDisplay": {
-      "description": "Localized display information of an operation.",
-      "type": "object",
-      "properties": {
-        "Provider": {
-          "description": "Name of the resource provider.",
-          "type": "string",
-          "readOnly": true
-        },
-        "Resource": {
-          "description": "Type of the resource.",
-          "type": "string",
-          "readOnly": true
-        },
-        "Operation": {
-          "description": "Name of the operation.",
-          "type": "string",
-          "readOnly": true
-        },
-        "Description": {
-          "description": "Operation description.",
-          "type": "string",
-          "readOnly": true
-        }
-      }
-    },
-    "ClientDiscoveryForLogSpecification": {
-      "description": "Log specification for the operation.",
-      "type": "object",
-      "properties": {
-        "name": {
-          "description": "Name of the log.",
-          "type": "string",
-          "readOnly": true
-        },
-        "displayName": {
-          "description": "Localized display name.",
-          "type": "string",
-          "readOnly": true
-        },
-        "blobDuration": {
-          "description": "Blob duration.",
-          "format": "date-time",
-          "type": "string",
-          "readOnly": true
-        }
-      }
-    },
-    "ClientDiscoveryForServiceSpecification": {
-      "description": "Operation properties.",
-      "type": "object",
-      "properties": {
-        "logSpecifications": {
-          "description": "List of log specifications of this operation.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ClientDiscoveryForLogSpecification"
-          },
-          "readOnly": true
-        }
-      }
-    },
-    "ClientDiscoveryProperties": {
-      "description": "Operation properties.",
-      "type": "object",
-      "properties": {
-        "serviceSpecification": {
-          "$ref": "#/definitions/ClientDiscoveryForServiceSpecification",
-          "description": "Operation properties.",
-          "readOnly": true
-        }
-      }
-    },
-    "ClientDiscoveryResponse": {
-      "description": "List of available operations.",
-      "type": "object",
-      "properties": {
-        "Value": {
-          "description": "List of available operationss.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ClientDiscoveryValueForSingleApi"
-          },
-          "readOnly": true
-        },
-        "NextLink": {
-          "description": "NextLink",
-          "type": "string",
-          "readOnly": true
-        }
-      }
-    },
-    "ClientDiscoveryValueForSingleApi": {
-      "description": "Available operation details.",
-      "type": "object",
-      "properties": {
-        "Name": {
-          "description": "Name of the operation.",
-          "type": "string",
-          "readOnly": true
-        },
-        "Display": {
-          "$ref": "#/definitions/ClientDiscoveryDisplay",
-          "description": "Contains the localized display information for this particular operation.",
-          "readOnly": true
-        },
-        "Origin": {
-          "description": "The intended executor of the operation.",
-          "type": "string",
-          "readOnly": true
-        },
-        "Properties": {
-          "$ref": "#/definitions/ClientDiscoveryProperties",
-          "description": "Properties of the operation.",
-          "readOnly": true,
-          "x-ms-client-flatten": true
-        }
-      }
-    },
-    "Resource": {
-      "description": "ARM Resource.",
-      "type": "object",
-      "properties": {
-        "id": {
-          "description": "Resource Id represents the complete path to the resource.",
-          "type": "string",
-          "readOnly": true
-        },
-        "name": {
-          "description": "Resource name associated with the resource.",
-          "type": "string",
-          "readOnly": true
-        },
-        "type": {
-          "description": "Resource type represents the complete path of the form Namespace/ResourceType/ResourceType/...",
-          "type": "string",
-          "readOnly": true
-        },
-        "eTag": {
-          "description": "Optional ETag.",
-          "type": "string"
-        }
-      },
-      "x-ms-azure-resource": true
-    },
-    "Sku": {
-      "description": "Identifies the unique system identifier for each Azure resource.",
-      "required": [
-        "name"
-      ],
-      "type": "object",
-      "properties": {
-        "name": {
-          "description": "The Sku name.",
-          "enum": [
-            "Standard",
-            "RS0"
-          ],
-          "type": "string",
-          "x-ms-enum": {
-            "name": "SkuName",
-            "modelAsString": true
-          }
-        }
-      }
-    },
-    "TrackedResource": {
-      "description": "Tracked resource with location.",
-      "type": "object",
-      "required": [
-        "location"
-      ],
-      "allOf": [
-        {
-          "$ref": "#/definitions/Resource"
-        }
-      ],
-      "properties":{
-        "location": {
-          "description": "Resource location.",
-          "type": "string"
-        },
-        "tags": {
-          "description": "Resource tags.",
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        }
-      }
-    },
-    "Vault": {
-      "description": "Resource information, as returned by the resource provider.",
-      "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/definitions/TrackedResource"
-        }
-      ],
-      "properties": {
-        "properties": {
-          "$ref": "#/definitions/VaultProperties",
-          "x-ms-client-flatten": true
-        },
-        "sku": {
-          "$ref": "#/definitions/Sku"
-        }
-      }
-    },
-    "VaultExtendedInfo": {
-      "description": "Vault extended information.",
-      "type": "object",
-      "properties": {
-        "integrityKey": {
-          "description": "Integrity key.",
-          "type": "string"
-        },
-        "encryptionKey": {
-          "description": "Encryption key.",
-          "type": "string"
-        },
-        "encryptionKeyThumbprint": {
-          "description": "Encryption key thumbprint.",
-          "type": "string"
-        },
-        "algorithm": {
-          "description": "Algorithm.",
-          "type": "string"
-        }
-      }
-    },
-    "VaultExtendedInfoResource": {
-      "description": "Vault extended information.",
-      "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/definitions/Resource"
-        }
-      ],
-      "properties": {
-        "properties": {
-          "$ref": "#/definitions/VaultExtendedInfo",
-          "x-ms-client-flatten": true
-        }
-      }
-    },
-    "VaultList": {
-      "description": "The response model for a list of Vaults.",
-      "type": "object",
-      "properties": {
-        "value": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Vault"
-          }
-        },
-        "nextLink": {
-          "type": "string",
-          "readOnly": true
-        }
-      }
-    },
-    "VaultProperties": {
-      "description": "Properties of the vault.",
-      "type": "object",
-      "properties": {
-        "provisioningState": {
-          "description": "Provisioning State.",
-          "type": "string",
-          "readOnly": true
-        }
-      }
-    }
-  },
-  "parameters": {
-    "SubscriptionId": {
-      "name": "subscriptionId",
-      "in": "path",
-      "description": "The subscription Id.",
-      "required": true,
-      "type": "string"
-    },
-    "ResourceGroupName": {
-      "name": "resourceGroupName",
-      "in": "path",
-      "description": "The name of the resource group where the recovery services vault is present.",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "type": "string"
-    },
-    "VaultName": {
-      "name": "vaultName",
-      "in": "path",
-      "description": "The name of the recovery services vault.",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "type": "string"
-    },
-    "ApiVersion": {
-      "name": "api-version",
-      "in": "query",
-      "description": "Client Api Version.",
-      "required": true,
-      "type": "string"
-    }
-  },
-  "securityDefinitions": {
-    "azure_auth": {
-      "type": "oauth2",
-      "description": "Azure Active Directory OAuth2 Flow",
-      "flow": "implicit",
-      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
-      "scopes": {
-        "user_impersonation": "impersonate your user account."
-      }
-    }
-  },
-  "security": [
-    {
-      "azure_auth": [
-        "user_impersonation"
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/arm-recoveryservices/2016-06-01/swagger/vaultusages.json b/arm-recoveryservices/2016-06-01/swagger/vaultusages.json
deleted file mode 100644
index ecde5ed5bbe0..000000000000
--- a/arm-recoveryservices/2016-06-01/swagger/vaultusages.json
+++ /dev/null
@@ -1,219 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "version": "2016-06-01",
-    "title": "RecoveryServicesClient",
-    "x-ms-code-generation-settings": {
-      "internalConstructors": false
-    }
-  },
-  "host": "management.azure.com",
-  "schemes": [
-    "https"
-  ],
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "paths": {
-    "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/operations": {
-      "get": {
-        "tags": [
-          "Operations"
-        ],
-        "description": "Returns the list of available operations.",
-        "operationId": "Operations_List",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "./vaults.json#/definitions/ClientDiscoveryResponse"
-            }
-          }
-        },
-        "deprecated": false,
-        "x-ms-pageable": {
-          "nextLinkName": "NextLink"
-        }
-      }
-    },
-    "/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/usages": {
-      "get": {
-        "tags": [
-          "VaultUsages"
-        ],
-        "description": "Fetches the usages of the vault.",
-        "operationId": "Usages_ListByVaults",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/VaultName"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/VaultUsageList"
-            }
-          }
-        },
-        "deprecated": false,
-        "x-ms-pageable": {
-          "nextLinkName": null
-        }
-      }
-    }
-  },
-  "definitions": {
-    "VaultUsage": {
-      "description": "Usages of a vault.",
-      "type": "object",
-      "properties": {
-        "unit": {
-          "description": "Unit of the usage.",
-          "enum": [
-            "Count",
-            "Bytes",
-            "Seconds",
-            "Percent",
-            "CountPerSecond",
-            "BytesPerSecond"
-          ],
-          "type": "string",
-          "x-ms-enum": {
-            "name": "UsagesUnit",
-            "modelAsString": true
-          }
-        },
-        "quotaPeriod": {
-          "description": "Quota period of usage.",
-          "type": "string"
-        },
-        "nextResetTime": {
-          "format": "date-time",
-          "description": "Next reset time of usage.",
-          "type": "string"
-        },
-        "currentValue": {
-          "format": "int64",
-          "description": "Current value of usage.",
-          "type": "integer"
-        },
-        "limit": {
-          "format": "int64",
-          "description": "Limit of usage.",
-          "type": "integer"
-        },
-        "name": {
-          "$ref": "#/definitions/NameInfo",
-          "description": "Name of usage."
-        }
-      }
-    },
-    "VaultUsageList": {
-      "description": "Usage for vault.",
-      "type": "object",
-      "properties": {
-        "value": {
-          "description": "The list of usages for the given vault.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/VaultUsage"
-          }
-        }
-      }
-    },
-    "NameInfo": {
-      "description": "The name of usage.",
-      "type": "object",
-      "properties": {
-        "value": {
-          "description": "Value of usage.",
-          "type": "string"
-        },
-        "localizedValue": {
-          "description": "Localized value of usage.",
-          "type": "string"
-        }
-      }
-    }
-  },
-  "parameters": {
-    "SubscriptionId": {
-      "name": "subscriptionId",
-      "in": "path",
-      "description": "The subscription Id.",
-      "required": true,
-      "type": "string"
-    },
-    "ResourceGroupName": {
-      "name": "resourceGroupName",
-      "in": "path",
-      "description": "The name of the resource group where the recovery services vault is present.",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "type": "string"
-    },
-    "VaultName": {
-      "name": "vaultName",
-      "in": "path",
-      "description": "The name of the recovery services vault.",
-      "required": true,
-      "x-ms-parameter-location": "method",
-      "type": "string"
-    },
-    "ApiVersion": {
-      "name": "api-version",
-      "in": "query",
-      "description": "Client Api Version.",
-      "required": true,
-      "type": "string"
-    }
-  },
-  "securityDefinitions": {
-    "azure_auth": {
-      "type": "oauth2",
-      "description": "Azure Active Directory OAuth2 Flow",
-      "flow": "implicit",
-      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
-      "scopes": {
-        "user_impersonation": "impersonate your user account."
-      }
-    }
-  },
-  "security": [
-    {
-      "azure_auth": [
-        "user_impersonation"
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/arm-recoveryservices/compositeRecoveryServicesClient.json b/arm-recoveryservices/compositeRecoveryServicesClient.json
deleted file mode 100644
index bfa3c308f55e..000000000000
--- a/arm-recoveryservices/compositeRecoveryServicesClient.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "info": {
-    "title": "RecoveryServicesClient",
-    "description": "Composite Swagger for Recovery Services Client"
-  },
-  "documents": [
-    "./2016-06-01/swagger/registeredidentities.json",
-    "./2016-06-01/swagger/replicationusages.json",
-    "./2016-06-01/swagger/vaults.json",
-    "./2016-06-01/swagger/vaultusages.json"
-  ]
-}
\ No newline at end of file