diff --git a/provider/azure/terraform_extension.rb b/provider/azure/terraform_extension.rb
index ad58843b49f0..276202785b02 100644
--- a/provider/azure/terraform_extension.rb
+++ b/provider/azure/terraform_extension.rb
@@ -57,11 +57,11 @@ def azure_tf_types(map)
       end
 
       def azure_generate_resource(data)
-        dir = "azurerm"
-        target_folder = File.join(data.output_folder, dir)
+        rp_name = data.object.api_name.downcase
+        target_folder = File.join(data.output_folder, 'azurerm', 'internal', 'services', rp_name)
+        FileUtils.mkpath target_folder
 
         name = data.object.name.underscore
-        product_name = data.product.name.underscore
         filepath = File.join(target_folder, "resource_arm_#{name}.go")
 
         data.generate('templates/azure/terraform/resource.erb', filepath, self)
@@ -74,18 +74,17 @@ def azure_generate_documentation(data)
         FileUtils.mkpath target_folder
 
         name = data.object.name.underscore
-        product_name = data.product.name.underscore
         filepath = File.join(target_folder, "#{name}.html.markdown")
 
         data.generate('templates/azure/terraform/resource.html.markdown.erb', filepath, self)
       end
 
       def azure_generate_resource_tests(data)
-        dir = "azurerm"
-        target_folder = File.join(data.output_folder, dir)
+        rp_name = data.object.api_name.downcase
+        target_folder = File.join(data.output_folder, 'azurerm', 'internal', 'services', rp_name, 'tests')
+        FileUtils.mkpath target_folder
 
         name = data.object.name.underscore
-        product_name = data.product.name.underscore
         filepath = File.join(target_folder, "resource_arm_#{name}_test.go")
 
         data.product = data.product.name
@@ -94,22 +93,22 @@ def azure_generate_resource_tests(data)
       end
 
       def compile_datasource(data)
-        dir = 'azurerm'
-        target_folder = File.join(data.output_folder, dir)
-        FileUtils.mkpath target_folder
-
         name = data.object.name.underscore
-        product_name = data.product.name.underscore
+        rp_name = data.object.api_name.downcase
 
-        filepath = File.join(target_folder, "data_source_#{name}.go")
+        datasource_folder = File.join(data.output_folder, 'azurerm', 'internal', 'services', rp_name)
+        FileUtils.mkpath datasource_folder
+        filepath = File.join(datasource_folder, "data_source_#{name}.go")
         data.generate('templates/azure/terraform/datasource.erb', filepath, self)
 
-        filepath = File.join(target_folder, "data_source_#{name}_test.go")
+        datasource_test_folder = File.join(datasource_folder, 'tests')
+        FileUtils.mkpath datasource_test_folder
+        filepath = File.join(datasource_test_folder, "data_source_#{name}_test.go")
         data.generate('templates/azure/terraform/datasource_test.go.erb', filepath, self)
 
-        target_folder = File.join(data.output_folder, 'website', 'docs', 'd')
-        FileUtils.mkpath target_folder
-        filepath = File.join(target_folder, "#{name}.html.markdown")
+        datasource_doc_folder = File.join(data.output_folder, 'website', 'docs', 'd')
+        FileUtils.mkpath datasource_doc_folder
+        filepath = File.join(datasource_doc_folder, "#{name}.html.markdown")
         data.generate('templates/azure/terraform/datasource.html.markdown.erb', filepath, self)
       end
     end
diff --git a/templates/azure/terraform/datasource.erb b/templates/azure/terraform/datasource.erb
index e1ed6d602518..e7d5a7853c31 100644
--- a/templates/azure/terraform/datasource.erb
+++ b/templates/azure/terraform/datasource.erb
@@ -1,5 +1,4 @@
 <%# lines(autogen_notice :go) -%>
-
 package azurerm
 
 <%
diff --git a/templates/azure/terraform/datasource_test.go.erb b/templates/azure/terraform/datasource_test.go.erb
index d5c928e7e744..d0e885cc8ac8 100644
--- a/templates/azure/terraform/datasource_test.go.erb
+++ b/templates/azure/terraform/datasource_test.go.erb
@@ -1,5 +1,4 @@
 <%# lines(autogen_notice :go) -%>
-
 package azurerm
 
 import (
diff --git a/templates/azure/terraform/resource.erb b/templates/azure/terraform/resource.erb
index 181b19533e0e..5da0a72f2e9d 100644
--- a/templates/azure/terraform/resource.erb
+++ b/templates/azure/terraform/resource.erb
@@ -1,5 +1,4 @@
 <%# lines(autogen_notice :go) -%>
-
 package azurerm
 
 <%= lines(compile(object.custom_code.constants)) if object.custom_code.constants -%>
diff --git a/templates/azure/terraform/test_file.go.erb b/templates/azure/terraform/test_file.go.erb
index f9159a4a9bc7..7a363d614f57 100644
--- a/templates/azure/terraform/test_file.go.erb
+++ b/templates/azure/terraform/test_file.go.erb
@@ -1,5 +1,4 @@
 <%# lines(autogen_notice :go) -%>
-
 package azurerm
 
 import (
@@ -82,7 +81,7 @@ func testCheck<%= resource_name -%>Exists(resourceName string) resource.TestChec
 
 <%= lines(build_acctest_parameters_from_schema(object.azure_sdk_definition.read, properties)) -%>
 
-        client := acceptance.AzureProvider.Meta().(*clients.Client).<% provider_name -%>.<%= provider_client_name -%>
+        client := acceptance.AzureProvider.Meta().(*clients.Client).<%= provider_name -%>.<%= provider_client_name -%>
 
         ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext
 
@@ -99,7 +98,7 @@ func testCheck<%= resource_name -%>Exists(resourceName string) resource.TestChec
 }
 
 func testCheck<%= resource_name -%>Destroy(s *terraform.State) error {
-    client := acceptance.AzureProvider.Meta().(*clients.Client).<% provider_name -%>.<%= provider_client_name -%>
+    client := acceptance.AzureProvider.Meta().(*clients.Client).<%= provider_name -%>.<%= provider_client_name -%>
 
     ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext