diff --git a/arm-sql/2014-04-01/swagger/servers.json b/arm-sql/2014-04-01/swagger/servers.json
index 98451b3bc548..77138407a329 100644
--- a/arm-sql/2014-04-01/swagger/servers.json
+++ b/arm-sql/2014-04-01/swagger/servers.json
@@ -231,6 +231,78 @@
           "nextLinkName": null
         }
       }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/serviceObjectives/{serviceObjectiveName}": {
+      "get": {
+        "tags": [
+          "ServiceObjectives"
+        ],
+        "operationId": "Servers_GetServiceObjective",
+        "description": "Gets a database service objective.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/ResourceGroupParameter"
+          },
+          {
+            "$ref": "#/parameters/ServerNameParameter"
+          },
+          {
+            "name": "serviceObjectiveName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the service objective to retrieve."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ServiceObjective"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/serviceObjectives": {
+      "get": {
+        "tags": [
+          "ServiceObjectives"
+        ],
+        "operationId": "Servers_ListServiceObjectives",
+        "description": "Returns database service objectives.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/ResourceGroupParameter"
+          },
+          {
+            "$ref": "#/parameters/ServerNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ServiceObjectiveListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
     }
   },
   "definitions": {
@@ -255,6 +327,21 @@
       },
       "x-ms-azure-resource": true
     },
+    "SubResource": {
+      "description": "Subresource properties",
+      "properties": {
+        "name": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource name"
+        },
+        "id": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The resource ID."
+        }
+      }
+    },
     "TrackedResource":{  
       "description":"ARM tracked top level resource.",
       "properties":{  
@@ -433,6 +520,67 @@
       },
       "required": ["value"],
       "description": "Represents the response to a list server metrics request."
+    },
+    "ServiceObjective": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ServiceObjectiveProperties",
+          "description": "Represents the properties of the resource."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Represents a database service objective."
+    },
+    "ServiceObjectiveProperties": {
+      "properties": {
+        "serviceObjectiveName": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The name for the service objective."
+        },
+        "isDefault": {
+          "readOnly": true,
+          "type": "boolean",
+          "description": "Gets whether the service level objective is the default service objective.",
+          "x-nullable": false
+        },
+        "isSystem": {
+          "readOnly": true,
+          "type": "boolean",
+          "description": "Gets whether the service level objective is a system service objective.",
+          "x-nullable": false
+        },
+        "description": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The description for the service level objective."
+        },
+        "enabled": {
+          "readOnly": true,
+          "type": "boolean",
+          "description": "Gets whether the service level objective is enabled.",
+          "x-nullable": false
+        }
+      },
+      "description": "Represents the properties of a database service objective."
+    },
+    "ServiceObjectiveListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ServiceObjective"
+          },
+          "description": "The list of database service objectives."
+        }
+      },
+      "required": ["value"],
+      "description": "Represents the response to a get database service objectives request."
     }
   },
   "parameters": {
diff --git a/arm-sql/2014-04-01/swagger/sql.core.json b/arm-sql/2014-04-01/swagger/sql.core.json
index 364b8a783125..e2867be038aa 100644
--- a/arm-sql/2014-04-01/swagger/sql.core.json
+++ b/arm-sql/2014-04-01/swagger/sql.core.json
@@ -972,78 +972,6 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/serviceObjectives/{serviceObjectiveName}": {
-      "get": {
-        "tags": [
-          "ServiceObjectives"
-        ],
-        "operationId": "Servers_GetServiceObjective",
-        "description": "Gets a database service objective.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupParameter"
-          },
-          {
-            "$ref": "#/parameters/ServerNameParameter"
-          },
-          {
-            "name": "serviceObjectiveName",
-            "in": "path",
-            "required": true,
-            "type": "string",
-            "description": "The name of the service objective to retrieve."
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/ServiceObjective"
-            }
-          }
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/serviceObjectives": {
-      "get": {
-        "tags": [
-          "ServiceObjectives"
-        ],
-        "operationId": "Servers_ListServiceObjectives",
-        "description": "Returns database service objectives.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/ApiVersionParameter"
-          },
-          {
-            "$ref": "#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "#/parameters/ResourceGroupParameter"
-          },
-          {
-            "$ref": "#/parameters/ServerNameParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/ServiceObjectiveListResult"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": null
-        }
-      }
-    },
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/transparentDataEncryption/current": {
       "put": {
         "tags": [
@@ -2494,67 +2422,6 @@
       "required": ["value"],
       "description": "Represents the response to a list service tier advisor request."
     },
-    "ServiceObjectiveProperties": {
-      "properties": {
-        "serviceObjectiveName": {
-          "readOnly": true,
-          "type": "string",
-          "description": "The name for the service objective."
-        },
-        "isDefault": {
-          "readOnly": true,
-          "type": "boolean",
-          "description": "Gets whether the service level objective is the default service objective.",
-          "x-nullable": false
-        },
-        "isSystem": {
-          "readOnly": true,
-          "type": "boolean",
-          "description": "Gets whether the service level objective is a system service objective.",
-          "x-nullable": false
-        },
-        "description": {
-          "readOnly": true,
-          "type": "string",
-          "description": "The description for the service level objective."
-        },
-        "enabled": {
-          "readOnly": true,
-          "type": "boolean",
-          "description": "Gets whether the service level objective is enabled.",
-          "x-nullable": false
-        }
-      },
-      "description": "Represents the properties of a database service objective."
-    },
-    "ServiceObjective": {
-      "properties": {
-        "properties": {
-          "x-ms-client-flatten": true,
-          "$ref": "#/definitions/ServiceObjectiveProperties",
-          "description": "Represents the properties of the resource."
-        }
-      },
-      "allOf": [
-        {
-          "$ref": "#/definitions/SubResource"
-        }
-      ],
-      "description": "Represents a database service objective."
-    },
-    "ServiceObjectiveListResult": {
-      "properties": {
-        "value": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ServiceObjective"
-          },
-          "description": "The list of database service objectives."
-        }
-      },
-      "required": ["value"],
-      "description": "Represents the response to a get database service objectives request."
-    },
     "TransparentDataEncryptionActivityProperties": {
       "properties": {
         "status": {