diff --git a/azure-mgmt-iothub/dev_requirements.txt b/azure-mgmt-iothub/dev_requirements.txt
deleted file mode 100644
index 331cfed8ea26..000000000000
--- a/azure-mgmt-iothub/dev_requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
--e ../azure-sdk-tools
diff --git a/azure-mgmt-iothub/HISTORY.rst b/sdk/iothub/azure-mgmt-iothub/HISTORY.rst
similarity index 97%
rename from azure-mgmt-iothub/HISTORY.rst
rename to sdk/iothub/azure-mgmt-iothub/HISTORY.rst
index ab94dfcf1640..1ab04594f5da 100644
--- a/azure-mgmt-iothub/HISTORY.rst
+++ b/sdk/iothub/azure-mgmt-iothub/HISTORY.rst
@@ -3,6 +3,13 @@
 Release History
 ===============
 
+0.8.2 (2019-05-15)
+++++++++++++++++++
+
+**Bugfixes**
+
+- Fix manual_failover operation type
+
 0.8.1 (2019-05-13)
 ++++++++++++++++++
 
diff --git a/azure-mgmt-iothub/MANIFEST.in b/sdk/iothub/azure-mgmt-iothub/MANIFEST.in
similarity index 100%
rename from azure-mgmt-iothub/MANIFEST.in
rename to sdk/iothub/azure-mgmt-iothub/MANIFEST.in
diff --git a/azure-mgmt-iothub/README.rst b/sdk/iothub/azure-mgmt-iothub/README.rst
similarity index 100%
rename from azure-mgmt-iothub/README.rst
rename to sdk/iothub/azure-mgmt-iothub/README.rst
diff --git a/azure-mgmt-iothub/azure/__init__.py b/sdk/iothub/azure-mgmt-iothub/azure/__init__.py
similarity index 100%
rename from azure-mgmt-iothub/azure/__init__.py
rename to sdk/iothub/azure-mgmt-iothub/azure/__init__.py
diff --git a/azure-mgmt-iothub/azure/mgmt/__init__.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/__init__.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/__init__.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/__init__.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/__init__.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/__init__.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/__init__.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/__init__.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/iot_hub_client.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/iot_hub_client.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/iot_hub_client.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/__init__.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/__init__.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/__init__.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/__init__.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_body_description.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_body_description.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_body_description.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_body_description.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_body_description_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_body_description_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_body_description_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_body_description_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_description.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_description.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_description.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_description.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_description_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_description_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_description_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_description_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_list_description.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_list_description.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_list_description.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_list_description.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_list_description_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_list_description_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_list_description_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_list_description_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties_with_nonce.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties_with_nonce.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties_with_nonce.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties_with_nonce.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties_with_nonce_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties_with_nonce_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties_with_nonce_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_properties_with_nonce_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_verification_description.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_verification_description.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_verification_description.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_verification_description.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_verification_description_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_verification_description_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_verification_description_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_verification_description_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_with_nonce_description.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_with_nonce_description.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_with_nonce_description.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_with_nonce_description.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_with_nonce_description_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_with_nonce_description_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_with_nonce_description_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/certificate_with_nonce_description_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/cloud_to_device_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/cloud_to_device_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/cloud_to_device_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/cloud_to_device_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/cloud_to_device_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/cloud_to_device_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/cloud_to_device_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/cloud_to_device_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/endpoint_health_data.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/endpoint_health_data.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/endpoint_health_data.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/endpoint_health_data.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/endpoint_health_data_paged.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/endpoint_health_data_paged.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/endpoint_health_data_paged.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/endpoint_health_data_paged.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/endpoint_health_data_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/endpoint_health_data_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/endpoint_health_data_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/endpoint_health_data_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/enrichment_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/enrichment_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/enrichment_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/enrichment_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/enrichment_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/enrichment_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/enrichment_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/enrichment_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/error_details.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/error_details.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/error_details.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/error_details.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/error_details_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/error_details_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/error_details_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/error_details_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_consumer_group_info.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_consumer_group_info.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_consumer_group_info.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_consumer_group_info.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_consumer_group_info_paged.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_consumer_group_info_paged.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_consumer_group_info_paged.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_consumer_group_info_paged.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_consumer_group_info_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_consumer_group_info_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_consumer_group_info_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_consumer_group_info_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/event_hub_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/export_devices_request.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/export_devices_request.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/export_devices_request.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/export_devices_request.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/export_devices_request_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/export_devices_request_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/export_devices_request_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/export_devices_request_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/failover_input.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/failover_input.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/failover_input.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/failover_input.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/failover_input_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/failover_input_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/failover_input_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/failover_input_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/fallback_route_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/fallback_route_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/fallback_route_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/fallback_route_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/fallback_route_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/fallback_route_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/fallback_route_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/fallback_route_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/feedback_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/feedback_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/feedback_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/feedback_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/feedback_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/feedback_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/feedback_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/feedback_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/import_devices_request.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/import_devices_request.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/import_devices_request.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/import_devices_request.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/import_devices_request_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/import_devices_request_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/import_devices_request_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/import_devices_request_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_capacity.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_capacity.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_capacity.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_capacity.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_capacity_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_capacity_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_capacity_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_capacity_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_client_enums.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_client_enums.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_client_enums.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_description.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_description.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_description.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_description.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_description_paged.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_description_paged.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_description_paged.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_description_paged.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_description_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_description_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_description_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_description_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_name_availability_info.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_name_availability_info.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_name_availability_info.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_name_availability_info.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_name_availability_info_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_name_availability_info_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_name_availability_info_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_name_availability_info_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties_device_streams.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties_device_streams.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties_device_streams.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties_device_streams.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties_device_streams_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties_device_streams_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties_device_streams_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties_device_streams_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_quota_metric_info.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_quota_metric_info.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_quota_metric_info.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_quota_metric_info.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_quota_metric_info_paged.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_quota_metric_info_paged.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_quota_metric_info_paged.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_quota_metric_info_paged.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_quota_metric_info_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_quota_metric_info_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_quota_metric_info_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_quota_metric_info_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_description.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_description.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_description.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_description.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_description_paged.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_description_paged.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_description_paged.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_description_paged.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_description_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_description_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_description_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_description_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_info.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_info.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_info.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_info.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_info_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_info_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_info_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/iot_hub_sku_info_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/ip_filter_rule.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/ip_filter_rule.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/ip_filter_rule.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/ip_filter_rule.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/ip_filter_rule_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/ip_filter_rule_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/ip_filter_rule_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/ip_filter_rule_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/job_response.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/job_response.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/job_response.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/job_response.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/job_response_paged.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/job_response_paged.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/job_response_paged.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/job_response_paged.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/job_response_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/job_response_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/job_response_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/job_response_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/matched_route.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/matched_route.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/matched_route.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/matched_route.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/matched_route_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/matched_route_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/matched_route_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/matched_route_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/messaging_endpoint_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/messaging_endpoint_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/messaging_endpoint_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/messaging_endpoint_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/messaging_endpoint_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/messaging_endpoint_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/messaging_endpoint_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/messaging_endpoint_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/name.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/name.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/name.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/name.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/name_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/name_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/name_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/name_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/operation.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/operation.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_display.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_display.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/operation_display.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_display.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_display_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_display_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/operation_display_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_display_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_inputs.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_inputs.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/operation_inputs.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_inputs.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_inputs_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_inputs_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/operation_inputs_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_inputs_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_paged.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_paged.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/operation_paged.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_paged.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/operation_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/operation_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/registry_statistics.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/registry_statistics.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/registry_statistics.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/registry_statistics.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/registry_statistics_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/registry_statistics_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/registry_statistics_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/registry_statistics_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/resource.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/resource.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/resource.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/resource.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/resource_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/resource_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/resource_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/resource_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/route_compilation_error.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_compilation_error.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/route_compilation_error.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_compilation_error.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/route_compilation_error_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_compilation_error_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/route_compilation_error_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_compilation_error_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_position.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_position.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_position.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_position.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_position_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_position_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_position_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_position_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_range.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_range.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_range.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_range.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_range_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_range_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_range_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_error_range_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/route_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/route_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/route_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/route_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/route_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_endpoints.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_endpoints.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_endpoints.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_endpoints.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_endpoints_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_endpoints_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_endpoints_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_endpoints_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_event_hub_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_event_hub_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_event_hub_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_event_hub_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_event_hub_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_event_hub_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_event_hub_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_event_hub_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_message.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_message.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_message.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_message.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_message_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_message_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_message_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_message_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_queue_endpoint_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_queue_endpoint_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_queue_endpoint_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_queue_endpoint_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_queue_endpoint_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_queue_endpoint_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_queue_endpoint_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_queue_endpoint_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_topic_endpoint_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_topic_endpoint_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_topic_endpoint_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_topic_endpoint_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_topic_endpoint_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_topic_endpoint_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_topic_endpoint_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_service_bus_topic_endpoint_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_storage_container_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_storage_container_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_storage_container_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_storage_container_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_storage_container_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_storage_container_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_storage_container_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_storage_container_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/routing_twin_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/shared_access_signature_authorization_rule.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/shared_access_signature_authorization_rule.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/shared_access_signature_authorization_rule.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/shared_access_signature_authorization_rule.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/shared_access_signature_authorization_rule_paged.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/shared_access_signature_authorization_rule_paged.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/shared_access_signature_authorization_rule_paged.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/shared_access_signature_authorization_rule_paged.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/shared_access_signature_authorization_rule_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/shared_access_signature_authorization_rule_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/shared_access_signature_authorization_rule_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/shared_access_signature_authorization_rule_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/storage_endpoint_properties.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/storage_endpoint_properties.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/storage_endpoint_properties.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/storage_endpoint_properties.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/storage_endpoint_properties_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/storage_endpoint_properties_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/storage_endpoint_properties_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/storage_endpoint_properties_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/tags_resource.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/tags_resource.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/tags_resource.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/tags_resource.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/tags_resource_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/tags_resource_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/tags_resource_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/tags_resource_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_input.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_input.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_input.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_input.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_input_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_input_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_input_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_input_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_result.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_result.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_result.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_result.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_result_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_result_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_result_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_all_routes_result_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_input.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_input.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_input.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_input.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_input_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_input_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_input_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_input_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result_details.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result_details.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result_details.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result_details.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result_details_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result_details_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result_details_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result_details_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/test_route_result_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota_list_result.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota_list_result.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota_list_result.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota_list_result.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota_list_result_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota_list_result_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota_list_result_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota_list_result_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota_py3.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota_py3.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/models/user_subscription_quota_py3.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/operations/__init__.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/operations/__init__.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/operations/__init__.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/operations/__init__.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/operations/certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/operations/certificates_operations.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/operations/certificates_operations.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/operations/certificates_operations.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/operations/iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/operations/iot_hub_operations.py
similarity index 68%
rename from azure-mgmt-iothub/azure/mgmt/iothub/operations/iot_hub_operations.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/operations/iot_hub_operations.py
index 273da15a077e..073723a53a72 100644
--- a/azure-mgmt-iothub/azure/mgmt/iothub/operations/iot_hub_operations.py
+++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/operations/iot_hub_operations.py
@@ -11,6 +11,8 @@
 
 import uuid
 from msrest.pipeline import ClientRawResponse
+from msrest.polling import LROPoller, NoPolling
+from msrestazure.polling.arm_polling import ARMPolling
 
 from .. import models
 
@@ -36,29 +38,9 @@ def __init__(self, client, config, serializer, deserializer):
 
         self.config = config
 
-    def manual_failover(
-            self, iot_hub_name, resource_group_name, failover_region, custom_headers=None, raw=False, **operation_config):
-        """Manual Failover Fail over.
-
-        Perform manual fail over of given hub.
 
-        :param iot_hub_name: IotHub to fail over
-        :type iot_hub_name: str
-        :param resource_group_name: resource group which Iot Hub belongs to
-        :type resource_group_name: str
-        :param failover_region: Region the hub will be failed over to
-        :type failover_region: str
-        :param dict custom_headers: headers that will be added to the request
-        :param bool raw: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: IotHubDescription or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.iothub.models.IotHubDescription or
-         ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorDetailsException<azure.mgmt.iothub.models.ErrorDetailsException>`
-        """
+    def _manual_failover_initial(
+            self, iot_hub_name, resource_group_name, failover_region, custom_headers=None, raw=False, **operation_config):
         failover_input = models.FailoverInput(failover_region=failover_region)
 
         # Construct URL
@@ -76,7 +58,6 @@ def manual_failover(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Accept'] = 'application/json'
         header_parameters['Content-Type'] = 'application/json; charset=utf-8'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
@@ -92,17 +73,56 @@ def manual_failover(
         request = self._client.post(url, query_parameters, header_parameters, body_content)
         response = self._client.send(request, stream=False, **operation_config)
 
-        if response.status_code not in [200]:
+        if response.status_code not in [200, 202]:
             raise models.ErrorDetailsException(self._deserialize, response)
 
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('IotHubDescription', response)
-
         if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
+            client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
 
-        return deserialized
+    def manual_failover(
+            self, iot_hub_name, resource_group_name, failover_region, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Manual Failover Fail over.
+
+        Perform manual fail over of given hub.
+
+        :param iot_hub_name: IotHub to fail over
+        :type iot_hub_name: str
+        :param resource_group_name: resource group which Iot Hub belongs to
+        :type resource_group_name: str
+        :param failover_region: Region the hub will be failed over to
+        :type failover_region: 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:`ErrorDetailsException<azure.mgmt.iothub.models.ErrorDetailsException>`
+        """
+        raw_result = self._manual_failover_initial(
+            iot_hub_name=iot_hub_name,
+            resource_group_name=resource_group_name,
+            failover_region=failover_region,
+            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)
     manual_failover.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Devices/IotHubs/{iotHubName}/failover'}
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/operations/iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/operations/iot_hub_resource_operations.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/operations/iot_hub_resource_operations.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/operations/iot_hub_resource_operations.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/operations/operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/operations/operations.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/operations/operations.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/operations/operations.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/operations/resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/operations/resource_provider_common_operations.py
similarity index 100%
rename from azure-mgmt-iothub/azure/mgmt/iothub/operations/resource_provider_common_operations.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/operations/resource_provider_common_operations.py
diff --git a/azure-mgmt-iothub/azure/mgmt/iothub/version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/version.py
similarity index 96%
rename from azure-mgmt-iothub/azure/mgmt/iothub/version.py
rename to sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/version.py
index feaaf2faf213..0a72a39badd5 100644
--- a/azure-mgmt-iothub/azure/mgmt/iothub/version.py
+++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "0.8.1"
+VERSION = "0.8.2"
 
diff --git a/sdk/iothub/azure-mgmt-iothub/dev_requirements.txt b/sdk/iothub/azure-mgmt-iothub/dev_requirements.txt
new file mode 100644
index 000000000000..1f0e0d86b735
--- /dev/null
+++ b/sdk/iothub/azure-mgmt-iothub/dev_requirements.txt
@@ -0,0 +1 @@
+-e ../../../azure-sdk-tools
diff --git a/azure-mgmt-iothub/sdk_packaging.toml b/sdk/iothub/azure-mgmt-iothub/sdk_packaging.toml
similarity index 100%
rename from azure-mgmt-iothub/sdk_packaging.toml
rename to sdk/iothub/azure-mgmt-iothub/sdk_packaging.toml
diff --git a/azure-mgmt-iothub/setup.cfg b/sdk/iothub/azure-mgmt-iothub/setup.cfg
similarity index 100%
rename from azure-mgmt-iothub/setup.cfg
rename to sdk/iothub/azure-mgmt-iothub/setup.cfg
diff --git a/azure-mgmt-iothub/setup.py b/sdk/iothub/azure-mgmt-iothub/setup.py
similarity index 100%
rename from azure-mgmt-iothub/setup.py
rename to sdk/iothub/azure-mgmt-iothub/setup.py
diff --git a/azure-mgmt-iothub/tests/recordings/test_mgmt_iothub.test_iothub.yaml b/sdk/iothub/azure-mgmt-iothub/tests/recordings/test_mgmt_iothub.test_iothub.yaml
similarity index 100%
rename from azure-mgmt-iothub/tests/recordings/test_mgmt_iothub.test_iothub.yaml
rename to sdk/iothub/azure-mgmt-iothub/tests/recordings/test_mgmt_iothub.test_iothub.yaml
diff --git a/azure-mgmt-iothub/tests/recordings/test_mgmt_iothub.test_iothub_consumer_group.yaml b/sdk/iothub/azure-mgmt-iothub/tests/recordings/test_mgmt_iothub.test_iothub_consumer_group.yaml
similarity index 100%
rename from azure-mgmt-iothub/tests/recordings/test_mgmt_iothub.test_iothub_consumer_group.yaml
rename to sdk/iothub/azure-mgmt-iothub/tests/recordings/test_mgmt_iothub.test_iothub_consumer_group.yaml
diff --git a/azure-mgmt-iothub/tests/test_mgmt_iothub.py b/sdk/iothub/azure-mgmt-iothub/tests/test_mgmt_iothub.py
similarity index 100%
rename from azure-mgmt-iothub/tests/test_mgmt_iothub.py
rename to sdk/iothub/azure-mgmt-iothub/tests/test_mgmt_iothub.py