diff --git a/azure-mgmt-signalr/MANIFEST.in b/azure-mgmt-signalr/MANIFEST.in
deleted file mode 100644
index bb37a2723dae..000000000000
--- a/azure-mgmt-signalr/MANIFEST.in
+++ /dev/null
@@ -1 +0,0 @@
-include *.rst
diff --git a/azure-mgmt-signalr/HISTORY.rst b/sdk/signalr/azure-mgmt-signalr/HISTORY.rst
similarity index 87%
rename from azure-mgmt-signalr/HISTORY.rst
rename to sdk/signalr/azure-mgmt-signalr/HISTORY.rst
index e0f1b31e6063..08fda86e9ee2 100644
--- a/azure-mgmt-signalr/HISTORY.rst
+++ b/sdk/signalr/azure-mgmt-signalr/HISTORY.rst
@@ -3,6 +3,11 @@
 Release History
 ===============
 
+0.2.0 (2019-05-21)
+++++++++++++++++++
+
+* Add restart operation
+
 0.1.1 (2018-09-04)
 ++++++++++++++++++
 
diff --git a/sdk/signalr/azure-mgmt-signalr/MANIFEST.in b/sdk/signalr/azure-mgmt-signalr/MANIFEST.in
new file mode 100644
index 000000000000..e4884efef41b
--- /dev/null
+++ b/sdk/signalr/azure-mgmt-signalr/MANIFEST.in
@@ -0,0 +1,5 @@
+recursive-include tests *.py *.yaml
+include *.rst
+include azure/__init__.py
+include azure/mgmt/__init__.py
+
diff --git a/azure-mgmt-signalr/README.rst b/sdk/signalr/azure-mgmt-signalr/README.rst
similarity index 74%
rename from azure-mgmt-signalr/README.rst
rename to sdk/signalr/azure-mgmt-signalr/README.rst
index 28084801ae94..1341a358dd1e 100644
--- a/azure-mgmt-signalr/README.rst
+++ b/sdk/signalr/azure-mgmt-signalr/README.rst
@@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see
 For a more complete set of Azure libraries, see the `azure <https://pypi.python.org/pypi/azure>`__ bundle package.
 
 
-Compatibility
-=============
-
-**IMPORTANT**: If you have an earlier version of the azure package
-(version < 1.0), you should uninstall it before installing this package.
-
-You can check the version using pip:
-
-.. code:: shell
-
-    pip freeze
-
-If you see azure==0.11.0 (or any version below 1.0), uninstall it first:
-
-.. code:: shell
-
-    pip uninstall azure
-
-
 Usage
 =====
 
diff --git a/azure-mgmt-signalr/azure/__init__.py b/sdk/signalr/azure-mgmt-signalr/azure/__init__.py
similarity index 100%
rename from azure-mgmt-signalr/azure/__init__.py
rename to sdk/signalr/azure-mgmt-signalr/azure/__init__.py
diff --git a/azure-mgmt-signalr/azure/mgmt/__init__.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/__init__.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/__init__.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/__init__.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/__init__.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/__init__.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/__init__.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/__init__.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/dimension.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/dimension.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/dimension.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/dimension.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/dimension_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/dimension_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/dimension_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/dimension_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/metric_specification.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/metric_specification.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/metric_specification.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/metric_specification.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/metric_specification_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/metric_specification_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/metric_specification_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/metric_specification_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability_parameters.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability_parameters.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability_parameters.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability_parameters.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability_parameters_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability_parameters_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability_parameters_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability_parameters_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/name_availability_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/operation.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/operation.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_display.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_display.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/operation_display.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_display.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_display_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_display_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/operation_display_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_display_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_paged.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_paged.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/operation_paged.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_paged.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_properties.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_properties.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/operation_properties.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_properties.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_properties_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_properties_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/operation_properties_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_properties_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/operation_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/operation_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/regenerate_key_parameters.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/regenerate_key_parameters.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/regenerate_key_parameters.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/regenerate_key_parameters.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/regenerate_key_parameters_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/regenerate_key_parameters_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/regenerate_key_parameters_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/regenerate_key_parameters_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/resource.py
similarity index 97%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/resource.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/resource.py
index 52faf058b594..68f3fe6e233c 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/resource.py
@@ -20,7 +20,7 @@ class Resource(Model):
 
     :ivar id: Fully qualified resource Id for the resource.
     :vartype id: str
-    :ivar name: The name of the resouce.
+    :ivar name: The name of the resource.
     :vartype name: str
     :ivar type: The type of the service - e.g.
      "Microsoft.SignalRService/SignalR"
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_py3.py
similarity index 97%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/resource_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_py3.py
index e0a419dfa795..132b0a6a2a88 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_py3.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_py3.py
@@ -20,7 +20,7 @@ class Resource(Model):
 
     :ivar id: Fully qualified resource Id for the resource.
     :vartype id: str
-    :ivar name: The name of the resouce.
+    :ivar name: The name of the resource.
     :vartype name: str
     :ivar type: The type of the service - e.g.
      "Microsoft.SignalRService/SignalR"
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py
similarity index 95%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py
index 40cd5e688ad4..2f9804893c80 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py
@@ -21,8 +21,8 @@ class ResourceSku(Model):
      number code, such as A0 or P3.  Required (if sku is specified)
     :type name: str
     :param tier: Optional tier of this particular SKU. `Basic` is deprecated,
-     use `Standard` instead for Basic tier. Possible values include: 'Free',
-     'Basic', 'Standard', 'Premium'
+     use `Standard` instead. Possible values include: 'Free', 'Basic',
+     'Standard', 'Premium'
     :type tier: str or ~azure.mgmt.signalr.models.SignalRSkuTier
     :param size: Optional, string. When the name field is the combination of
      tier and some other value, this would be the standalone code.
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py
similarity index 95%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py
index 1c0da513ec89..bed8cd3f7077 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py
@@ -21,8 +21,8 @@ class ResourceSku(Model):
      number code, such as A0 or P3.  Required (if sku is specified)
     :type name: str
     :param tier: Optional tier of this particular SKU. `Basic` is deprecated,
-     use `Standard` instead for Basic tier. Possible values include: 'Free',
-     'Basic', 'Standard', 'Premium'
+     use `Standard` instead. Possible values include: 'Free', 'Basic',
+     'Standard', 'Premium'
     :type tier: str or ~azure.mgmt.signalr.models.SignalRSkuTier
     :param size: Optional, string. When the name field is the combination of
      tier and some other value, this would be the standalone code.
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/service_specification.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/service_specification.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/service_specification.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/service_specification.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/service_specification_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/service_specification_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/service_specification_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/service_specification_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_parameters_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rkeys_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rmanagement_client_enums.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rmanagement_client_enums.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rmanagement_client_enums.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rmanagement_client_enums.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py
similarity index 95%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py
index ee02e4f61971..8059c8a353aa 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py
@@ -20,7 +20,7 @@ class SignalRResource(TrackedResource):
 
     :ivar id: Fully qualified resource Id for the resource.
     :vartype id: str
-    :ivar name: The name of the resouce.
+    :ivar name: The name of the resource.
     :vartype name: str
     :ivar type: The type of the service - e.g.
      "Microsoft.SignalRService/SignalR"
@@ -48,10 +48,10 @@ class SignalRResource(TrackedResource):
     :ivar host_name: FQDN of the SignalR service instance. Format:
      xxx.service.signalr.net
     :vartype host_name: str
-    :ivar public_port: The publicly accessibly port of the SignalR service
+    :ivar public_port: The publicly accessible port of the SignalR service
      which is designed for browser/client side usage.
     :vartype public_port: int
-    :ivar server_port: The publicly accessibly port of the SignalR service
+    :ivar server_port: The publicly accessible port of the SignalR service
      which is designed for customer server side usage.
     :vartype server_port: int
     :param version: Version of the SignalR resource. Probably you need the
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_paged.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_paged.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_paged.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_paged.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py
similarity index 96%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py
index ba2dc5009058..4d0e9ff97977 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py
@@ -20,7 +20,7 @@ class SignalRResource(TrackedResource):
 
     :ivar id: Fully qualified resource Id for the resource.
     :vartype id: str
-    :ivar name: The name of the resouce.
+    :ivar name: The name of the resource.
     :vartype name: str
     :ivar type: The type of the service - e.g.
      "Microsoft.SignalRService/SignalR"
@@ -48,10 +48,10 @@ class SignalRResource(TrackedResource):
     :ivar host_name: FQDN of the SignalR service instance. Format:
      xxx.service.signalr.net
     :vartype host_name: str
-    :ivar public_port: The publicly accessibly port of the SignalR service
+    :ivar public_port: The publicly accessible port of the SignalR service
      which is designed for browser/client side usage.
     :vartype public_port: int
-    :ivar server_port: The publicly accessibly port of the SignalR service
+    :ivar server_port: The publicly accessible port of the SignalR service
      which is designed for customer server side usage.
     :vartype server_port: int
     :param version: Version of the SignalR resource. Probably you need the
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rupdate_parameters_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_name.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_name.py
similarity index 95%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_name.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_name.py
index cf1ec8c37174..d750ca741cbc 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_name.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_name.py
@@ -15,7 +15,7 @@
 class SignalRUsageName(Model):
     """Localizable String object containing the name and a localized value.
 
-    :param value: The indentifier of the usage.
+    :param value: The identifier of the usage.
     :type value: str
     :param localized_value: Localized name of the usage.
     :type localized_value: str
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_name_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_name_py3.py
similarity index 95%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_name_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_name_py3.py
index abaff5948d3e..0ab09ab51882 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_name_py3.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_name_py3.py
@@ -15,7 +15,7 @@
 class SignalRUsageName(Model):
     """Localizable String object containing the name and a localized value.
 
-    :param value: The indentifier of the usage.
+    :param value: The identifier of the usage.
     :type value: str
     :param localized_value: Localized name of the usage.
     :type localized_value: str
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_paged.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_paged.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_paged.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_paged.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_py3.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rusage_py3.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/tracked_resource.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/tracked_resource.py
similarity index 97%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/tracked_resource.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/tracked_resource.py
index ef21d96d0089..da0c0fee8e9d 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/tracked_resource.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/tracked_resource.py
@@ -20,7 +20,7 @@ class TrackedResource(Resource):
 
     :ivar id: Fully qualified resource Id for the resource.
     :vartype id: str
-    :ivar name: The name of the resouce.
+    :ivar name: The name of the resource.
     :vartype name: str
     :ivar type: The type of the service - e.g.
      "Microsoft.SignalRService/SignalR"
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/tracked_resource_py3.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/tracked_resource_py3.py
similarity index 97%
rename from azure-mgmt-signalr/azure/mgmt/signalr/models/tracked_resource_py3.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/tracked_resource_py3.py
index 80a6019f0f16..3cad20d9175e 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/tracked_resource_py3.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/models/tracked_resource_py3.py
@@ -20,7 +20,7 @@ class TrackedResource(Resource):
 
     :ivar id: Fully qualified resource Id for the resource.
     :vartype id: str
-    :ivar name: The name of the resouce.
+    :ivar name: The name of the resource.
     :vartype name: str
     :ivar type: The type of the service - e.g.
      "Microsoft.SignalRService/SignalR"
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/operations/__init__.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/operations/__init__.py
similarity index 100%
rename from azure-mgmt-signalr/azure/mgmt/signalr/operations/__init__.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/operations/__init__.py
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/operations/operations.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/operations/operations.py
similarity index 95%
rename from azure-mgmt-signalr/azure/mgmt/signalr/operations/operations.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/operations/operations.py
index 8adcd84fc537..c51cf01a512e 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/operations/operations.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/operations/operations.py
@@ -23,7 +23,7 @@ class Operations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client Api Version. Constant value: "2018-03-01-preview".
+    :ivar api_version: Client Api Version. Possible values include: '2018-03-01-preview', '2018-10-01'. Constant value: "2018-10-01".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-01-preview"
+        self.api_version = "2018-10-01"
 
         self.config = config
 
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/operations/signal_roperations.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/operations/signal_roperations.py
similarity index 89%
rename from azure-mgmt-signalr/azure/mgmt/signalr/operations/signal_roperations.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/operations/signal_roperations.py
index 8fe0c450a4c2..738d56b752be 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/operations/signal_roperations.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/operations/signal_roperations.py
@@ -25,7 +25,7 @@ class SignalROperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client Api Version. Constant value: "2018-03-01-preview".
+    :ivar api_version: Client Api Version. Possible values include: '2018-03-01-preview', '2018-10-01'. Constant value: "2018-10-01".
     """
 
     models = models
@@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-01-preview"
+        self.api_version = "2018-10-01"
 
         self.config = config
 
@@ -486,7 +486,7 @@ def get(
             return client_raw_response
 
         return deserialized
-    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/SignalR/{resourceName}'}
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/signalR/{resourceName}'}
 
 
     def _create_or_update_initial(
@@ -591,7 +591,7 @@ def get_long_running_output(response):
         elif polling is False: polling_method = NoPolling()
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
-    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/SignalR/{resourceName}'}
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/signalR/{resourceName}'}
 
 
     def _delete_initial(
@@ -672,7 +672,7 @@ def get_long_running_output(response):
         elif polling is False: polling_method = NoPolling()
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
-    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/SignalR/{resourceName}'}
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/signalR/{resourceName}'}
 
 
     def _update_initial(
@@ -777,4 +777,85 @@ def get_long_running_output(response):
         elif polling is False: polling_method = NoPolling()
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
-    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/SignalR/{resourceName}'}
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/signalR/{resourceName}'}
+
+
+    def _restart_initial(
+            self, resource_group_name, resource_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.restart.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'resourceName': self._serialize.url("resource_name", resource_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [202, 204]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        if raw:
+            client_raw_response = ClientRawResponse(None, response)
+            return client_raw_response
+
+    def restart(
+            self, resource_group_name, resource_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Operation to restart a SignalR service.
+
+        :param resource_group_name: The name of the resource group that
+         contains the resource. You can obtain this value from the Azure
+         Resource Manager API or the portal.
+        :type resource_group_name: str
+        :param resource_name: The name of the SignalR resource.
+        :type resource_name: str
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: The poller return type is ClientRawResponse, the
+         direct response alongside the deserialized response
+        :param polling: True for ARMPolling, False for no polling, or a
+         polling object for personal polling strategy
+        :return: An instance of LROPoller that returns None or
+         ClientRawResponse<None> if raw==True
+        :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._restart_initial(
+            resource_group_name=resource_group_name,
+            resource_name=resource_name,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            if raw:
+                client_raw_response = ClientRawResponse(None, response)
+                return client_raw_response
+
+        lro_delay = operation_config.get(
+            'long_running_operation_timeout',
+            self.config.long_running_operation_timeout)
+        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        elif polling is False: polling_method = NoPolling()
+        else: polling_method = polling
+        return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
+    restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/signalR/{resourceName}/restart'}
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/operations/usages_operations.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/operations/usages_operations.py
similarity index 96%
rename from azure-mgmt-signalr/azure/mgmt/signalr/operations/usages_operations.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/operations/usages_operations.py
index adf39bc94d68..bbe03a59d187 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/operations/usages_operations.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/operations/usages_operations.py
@@ -23,7 +23,7 @@ class UsagesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client Api Version. Constant value: "2018-03-01-preview".
+    :ivar api_version: Client Api Version. Possible values include: '2018-03-01-preview', '2018-10-01'. Constant value: "2018-10-01".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-03-01-preview"
+        self.api_version = "2018-10-01"
 
         self.config = config
 
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/signal_rmanagement_client.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/signal_rmanagement_client.py
similarity index 98%
rename from azure-mgmt-signalr/azure/mgmt/signalr/signal_rmanagement_client.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/signal_rmanagement_client.py
index fa1600676c3a..c29ac66baef4 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/signal_rmanagement_client.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/signal_rmanagement_client.py
@@ -83,7 +83,7 @@ def __init__(
         super(SignalRManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2018-03-01-preview'
+        self.api_version = '2018-10-01'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/version.py b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/version.py
similarity index 96%
rename from azure-mgmt-signalr/azure/mgmt/signalr/version.py
rename to sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/version.py
index e7efe25ea7e0..9bd1dfac7ecb 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/version.py
+++ b/sdk/signalr/azure-mgmt-signalr/azure/mgmt/signalr/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "0.1.1"
+VERSION = "0.2.0"
 
diff --git a/azure-mgmt-signalr/sdk_packaging.toml b/sdk/signalr/azure-mgmt-signalr/sdk_packaging.toml
similarity index 100%
rename from azure-mgmt-signalr/sdk_packaging.toml
rename to sdk/signalr/azure-mgmt-signalr/sdk_packaging.toml
diff --git a/azure-mgmt-signalr/setup.cfg b/sdk/signalr/azure-mgmt-signalr/setup.cfg
similarity index 100%
rename from azure-mgmt-signalr/setup.cfg
rename to sdk/signalr/azure-mgmt-signalr/setup.cfg
diff --git a/azure-mgmt-signalr/setup.py b/sdk/signalr/azure-mgmt-signalr/setup.py
similarity index 98%
rename from azure-mgmt-signalr/setup.py
rename to sdk/signalr/azure-mgmt-signalr/setup.py
index 9d0098a3cc8e..af5a171fecaa 100644
--- a/azure-mgmt-signalr/setup.py
+++ b/sdk/signalr/azure-mgmt-signalr/setup.py
@@ -53,6 +53,7 @@
     version=version,
     description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME),
     long_description=readme + '\n\n' + history,
+    long_description_content_type='text/x-rst',
     license='MIT License',
     author='Microsoft Corporation',
     author_email='azpysdkhelp@microsoft.com',