diff --git a/Directory.Build.targets b/Directory.Build.targets
index 4f778ccb554..2343c750f21 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -18,19 +18,51 @@
     <Compile Include="$(AzureCoreSharedSources)AsyncLockWithValue.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)AzureKeyCredentialPolicy.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)ClientDiagnostics.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)ChangeTrackingDictionary.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)ChangeTrackingList.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)ContentTypeUtilities.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)DiagnosticScope.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)DiagnosticScopeFactory.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)ErrorResponse.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)FixedDelayWithNoJitterStrategy.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)FormUrlEncodedContent.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)ForwardsClientCallsAttribute.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)HttpMessageSanitizer.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)HttpPipelineExtensions.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)IOperationSource.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)IUtf8JsonSerializable.cs" LinkBase="Shared/Core" />    
+    <Compile Include="$(AzureCoreSharedSources)IXmlSerializable.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)JsonElementExtensions.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)LowLevelPageableHelpers.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)NextLinkOperationImplementation.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)OperationFinalStateVia.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)OperationInternal.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)OperationInternalBase.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)OperationInternalOfT.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)OperationPoller.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)Optional.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)Page.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)PageableHelpers.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)ProtocolOperation.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)ProtocolOperationHelpers.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)RawRequestUriBuilder.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)RequestContentHelper.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)RequestHeaderExtensions.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)RequestUriBuilderExtensions.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)ResponseHeadersExtensions.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)ResponseWithHeaders.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)ResponseWithHeadersOfTHeaders.cs" LinkBase="Shared/Core" />    
+    <Compile Include="$(AzureCoreSharedSources)ResponseWithHeadersOfTOfTHeaders.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)SequentialDelayStrategy.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)StringRequestContent.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)TypeFormatters.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)Utf8JsonRequestContent.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)Utf8JsonWriterExtensions.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)VoidValue.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)XElementExtensions.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)XmlWriterContent.cs" LinkBase="Shared/Core" />
+    <Compile Include="$(AzureCoreSharedSources)XmlWriterExtensions.cs" LinkBase="Shared/Core" />
     <Compile Include="$(MSBuildThisFileDirectory)/src/assets/Generator.Shared/**/*.cs" Link="Shared/AutoRest/%(RecursiveDir)/%(Filename)%(Extension)" />
   </ItemGroup>
   <ItemGroup Condition="'$(IncludeManagementSharedCode)' == 'true'">
diff --git a/eng/DownloadSharedSource.ps1 b/eng/DownloadSharedSource.ps1
index f715a6901f4..b3d5f9119c0 100644
--- a/eng/DownloadSharedSource.ps1
+++ b/eng/DownloadSharedSource.ps1
@@ -36,7 +36,39 @@ $files = @('AsyncLockWithValue.cs', 'ClientDiagnostics.cs', 'DiagnosticScope.cs'
     'OperationInternalBase.cs', 'OperationInternal.cs', 'OperationInternalOfT.cs', 'TaskExtensions.cs', 'Argument.cs', 'Multipart/MultipartFormDataContent.cs',
     'Multipart/MultipartContent.cs', 'AzureKeyCredentialPolicy.cs', 'AppContextSwitchHelper.cs',
     'OperationPoller.cs', 'FixedDelayWithNoJitterStrategy.cs', 'SequentialDelayStrategy.cs',
-    'ForwardsClientCallsAttribute.cs', 'AsyncLockWithValue.cs', 'VoidValue.cs', 'AzureResourceProviderNamespaceAttribute.cs')
+    'ForwardsClientCallsAttribute.cs', 'AsyncLockWithValue.cs', 'VoidValue.cs', 'AzureResourceProviderNamespaceAttribute.cs',
+    'ChangeTrackingDictionary.cs',
+    'ChangeTrackingList.cs',
+    'ErrorResponse.cs',
+    'FormUrlEncodedContent.cs',
+    'HttpPipelineExtensions.cs',
+    'IOperationSource.cs',
+    'IUtf8JsonSerializable.cs',
+    'IXmlSerializable.cs',
+    'JsonElementExtensions.cs',
+    'LowLevelPageableHelpers.cs',
+    'NextLinkOperationImplementation.cs',
+    'OperationFinalStateVia.cs',
+    'Optional.cs',
+    'Page.cs',
+    'PageableHelpers.cs',
+    'ProtocolOperation.cs',
+    'ProtocolOperationHelpers.cs',
+    'RawRequestUriBuilder.cs',
+    'RequestContentHelper.cs',
+    'RequestHeaderExtensions.cs',
+    'RequestUriBuilderExtensions.cs',
+    'ResponseHeadersExtensions.cs',
+    'ResponseWithHeaders.cs',
+    'ResponseWithHeadersOfTHeaders.cs',
+    'ResponseWithHeadersOfTOfTHeaders.cs',
+    'StringRequestContent.cs',
+    'TypeFormatters.cs',
+    'Utf8JsonRequestContent.cs',
+    'Utf8JsonWriterExtensions.cs',
+    'XElementExtensions.cs',
+    'XmlWriterContent.cs',
+    'XmlWriterExtensions.cs')
 $sourcePath = "$clonedPath/sdk/core/Azure.Core/src/Shared/"
 $destinationPath = "$repoRoot/src/assets/Azure.Core.Shared"
 
diff --git a/src/assets/Generator.Shared/ChangeTrackingDictionary.cs b/src/assets/Azure.Core.Shared/ChangeTrackingDictionary.cs
similarity index 100%
rename from src/assets/Generator.Shared/ChangeTrackingDictionary.cs
rename to src/assets/Azure.Core.Shared/ChangeTrackingDictionary.cs
diff --git a/src/assets/Generator.Shared/ChangeTrackingList.cs b/src/assets/Azure.Core.Shared/ChangeTrackingList.cs
similarity index 100%
rename from src/assets/Generator.Shared/ChangeTrackingList.cs
rename to src/assets/Azure.Core.Shared/ChangeTrackingList.cs
diff --git a/src/assets/Generator.Shared/ErrorResponse.cs b/src/assets/Azure.Core.Shared/ErrorResponse.cs
similarity index 100%
rename from src/assets/Generator.Shared/ErrorResponse.cs
rename to src/assets/Azure.Core.Shared/ErrorResponse.cs
diff --git a/src/assets/Generator.Shared/FormUrlEncodedContent.cs b/src/assets/Azure.Core.Shared/FormUrlEncodedContent.cs
similarity index 100%
rename from src/assets/Generator.Shared/FormUrlEncodedContent.cs
rename to src/assets/Azure.Core.Shared/FormUrlEncodedContent.cs
diff --git a/src/assets/Generator.Shared/HttpPipelineExtensions.cs b/src/assets/Azure.Core.Shared/HttpPipelineExtensions.cs
similarity index 100%
rename from src/assets/Generator.Shared/HttpPipelineExtensions.cs
rename to src/assets/Azure.Core.Shared/HttpPipelineExtensions.cs
diff --git a/src/assets/Generator.Shared/IOperationSource.cs b/src/assets/Azure.Core.Shared/IOperationSource.cs
similarity index 100%
rename from src/assets/Generator.Shared/IOperationSource.cs
rename to src/assets/Azure.Core.Shared/IOperationSource.cs
diff --git a/src/assets/Generator.Shared/IUtf8JsonSerializable.cs b/src/assets/Azure.Core.Shared/IUtf8JsonSerializable.cs
similarity index 100%
rename from src/assets/Generator.Shared/IUtf8JsonSerializable.cs
rename to src/assets/Azure.Core.Shared/IUtf8JsonSerializable.cs
diff --git a/src/assets/Generator.Shared/IXmlSerializable.cs b/src/assets/Azure.Core.Shared/IXmlSerializable.cs
similarity index 100%
rename from src/assets/Generator.Shared/IXmlSerializable.cs
rename to src/assets/Azure.Core.Shared/IXmlSerializable.cs
diff --git a/src/assets/Generator.Shared/JsonElementExtensions.cs b/src/assets/Azure.Core.Shared/JsonElementExtensions.cs
similarity index 100%
rename from src/assets/Generator.Shared/JsonElementExtensions.cs
rename to src/assets/Azure.Core.Shared/JsonElementExtensions.cs
diff --git a/src/assets/Generator.Shared/LowLevelPageableHelpers.cs b/src/assets/Azure.Core.Shared/LowLevelPageableHelpers.cs
similarity index 100%
rename from src/assets/Generator.Shared/LowLevelPageableHelpers.cs
rename to src/assets/Azure.Core.Shared/LowLevelPageableHelpers.cs
diff --git a/src/assets/Generator.Shared/NextLinkOperationImplementation.cs b/src/assets/Azure.Core.Shared/NextLinkOperationImplementation.cs
similarity index 100%
rename from src/assets/Generator.Shared/NextLinkOperationImplementation.cs
rename to src/assets/Azure.Core.Shared/NextLinkOperationImplementation.cs
diff --git a/src/assets/Generator.Shared/OperationFinalStateVia.cs b/src/assets/Azure.Core.Shared/OperationFinalStateVia.cs
similarity index 100%
rename from src/assets/Generator.Shared/OperationFinalStateVia.cs
rename to src/assets/Azure.Core.Shared/OperationFinalStateVia.cs
diff --git a/src/assets/Generator.Shared/Optional.cs b/src/assets/Azure.Core.Shared/Optional.cs
similarity index 100%
rename from src/assets/Generator.Shared/Optional.cs
rename to src/assets/Azure.Core.Shared/Optional.cs
diff --git a/src/assets/Generator.Shared/Page.cs b/src/assets/Azure.Core.Shared/Page.cs
similarity index 100%
rename from src/assets/Generator.Shared/Page.cs
rename to src/assets/Azure.Core.Shared/Page.cs
diff --git a/src/assets/Generator.Shared/PageableHelpers.cs b/src/assets/Azure.Core.Shared/PageableHelpers.cs
similarity index 100%
rename from src/assets/Generator.Shared/PageableHelpers.cs
rename to src/assets/Azure.Core.Shared/PageableHelpers.cs
diff --git a/src/assets/Generator.Shared/ProtocolOperation.cs b/src/assets/Azure.Core.Shared/ProtocolOperation.cs
similarity index 100%
rename from src/assets/Generator.Shared/ProtocolOperation.cs
rename to src/assets/Azure.Core.Shared/ProtocolOperation.cs
diff --git a/src/assets/Generator.Shared/ProtocolOperationHelpers.cs b/src/assets/Azure.Core.Shared/ProtocolOperationHelpers.cs
similarity index 100%
rename from src/assets/Generator.Shared/ProtocolOperationHelpers.cs
rename to src/assets/Azure.Core.Shared/ProtocolOperationHelpers.cs
diff --git a/src/assets/Generator.Shared/RawRequestUriBuilder.cs b/src/assets/Azure.Core.Shared/RawRequestUriBuilder.cs
similarity index 100%
rename from src/assets/Generator.Shared/RawRequestUriBuilder.cs
rename to src/assets/Azure.Core.Shared/RawRequestUriBuilder.cs
diff --git a/src/assets/Generator.Shared/RequestContentHelper.cs b/src/assets/Azure.Core.Shared/RequestContentHelper.cs
similarity index 100%
rename from src/assets/Generator.Shared/RequestContentHelper.cs
rename to src/assets/Azure.Core.Shared/RequestContentHelper.cs
diff --git a/src/assets/Generator.Shared/RequestHeaderExtensions.cs b/src/assets/Azure.Core.Shared/RequestHeaderExtensions.cs
similarity index 100%
rename from src/assets/Generator.Shared/RequestHeaderExtensions.cs
rename to src/assets/Azure.Core.Shared/RequestHeaderExtensions.cs
diff --git a/src/assets/Generator.Shared/RequestUriBuilderExtensions.cs b/src/assets/Azure.Core.Shared/RequestUriBuilderExtensions.cs
similarity index 100%
rename from src/assets/Generator.Shared/RequestUriBuilderExtensions.cs
rename to src/assets/Azure.Core.Shared/RequestUriBuilderExtensions.cs
diff --git a/src/assets/Generator.Shared/ResponseHeadersExtensions.cs b/src/assets/Azure.Core.Shared/ResponseHeadersExtensions.cs
similarity index 100%
rename from src/assets/Generator.Shared/ResponseHeadersExtensions.cs
rename to src/assets/Azure.Core.Shared/ResponseHeadersExtensions.cs
diff --git a/src/assets/Generator.Shared/ResponseWithHeaders.cs b/src/assets/Azure.Core.Shared/ResponseWithHeaders.cs
similarity index 100%
rename from src/assets/Generator.Shared/ResponseWithHeaders.cs
rename to src/assets/Azure.Core.Shared/ResponseWithHeaders.cs
diff --git a/src/assets/Generator.Shared/ResponseWithHeadersOfTHeaders.cs b/src/assets/Azure.Core.Shared/ResponseWithHeadersOfTHeaders.cs
similarity index 100%
rename from src/assets/Generator.Shared/ResponseWithHeadersOfTHeaders.cs
rename to src/assets/Azure.Core.Shared/ResponseWithHeadersOfTHeaders.cs
diff --git a/src/assets/Generator.Shared/ResponseWithHeadersOfTOfTHeaders.cs b/src/assets/Azure.Core.Shared/ResponseWithHeadersOfTOfTHeaders.cs
similarity index 100%
rename from src/assets/Generator.Shared/ResponseWithHeadersOfTOfTHeaders.cs
rename to src/assets/Azure.Core.Shared/ResponseWithHeadersOfTOfTHeaders.cs
diff --git a/src/assets/Generator.Shared/StringRequestContent.cs b/src/assets/Azure.Core.Shared/StringRequestContent.cs
similarity index 100%
rename from src/assets/Generator.Shared/StringRequestContent.cs
rename to src/assets/Azure.Core.Shared/StringRequestContent.cs
diff --git a/src/assets/Generator.Shared/TypeFormatters.cs b/src/assets/Azure.Core.Shared/TypeFormatters.cs
similarity index 100%
rename from src/assets/Generator.Shared/TypeFormatters.cs
rename to src/assets/Azure.Core.Shared/TypeFormatters.cs
diff --git a/src/assets/Generator.Shared/Utf8JsonRequestContent.cs b/src/assets/Azure.Core.Shared/Utf8JsonRequestContent.cs
similarity index 100%
rename from src/assets/Generator.Shared/Utf8JsonRequestContent.cs
rename to src/assets/Azure.Core.Shared/Utf8JsonRequestContent.cs
diff --git a/src/assets/Generator.Shared/Utf8JsonWriterExtensions.cs b/src/assets/Azure.Core.Shared/Utf8JsonWriterExtensions.cs
similarity index 100%
rename from src/assets/Generator.Shared/Utf8JsonWriterExtensions.cs
rename to src/assets/Azure.Core.Shared/Utf8JsonWriterExtensions.cs
diff --git a/src/assets/Generator.Shared/XElementExtensions.cs b/src/assets/Azure.Core.Shared/XElementExtensions.cs
similarity index 100%
rename from src/assets/Generator.Shared/XElementExtensions.cs
rename to src/assets/Azure.Core.Shared/XElementExtensions.cs
diff --git a/src/assets/Generator.Shared/XmlWriterContent.cs b/src/assets/Azure.Core.Shared/XmlWriterContent.cs
similarity index 100%
rename from src/assets/Generator.Shared/XmlWriterContent.cs
rename to src/assets/Azure.Core.Shared/XmlWriterContent.cs
diff --git a/src/assets/Generator.Shared/XmlWriterExtensions.cs b/src/assets/Azure.Core.Shared/XmlWriterExtensions.cs
similarity index 100%
rename from src/assets/Generator.Shared/XmlWriterExtensions.cs
rename to src/assets/Azure.Core.Shared/XmlWriterExtensions.cs