diff --git a/Microsoft.Dotnet.Wpf.sln b/Microsoft.Dotnet.Wpf.sln
index 5a6da6c0826..4d4116c6f97 100644
--- a/Microsoft.Dotnet.Wpf.sln
+++ b/Microsoft.Dotnet.Wpf.sln
@@ -29,9 +29,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.DotNet.Wpf.Projec
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsBase", "src\Microsoft.DotNet.Wpf\src\WindowsBase\WindowsBase.csproj", "{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectWriteForwarder", "src\Microsoft.DotNet.Wpf\src\DirectWriteForwarder\DirectWriteForwarder.vcxproj", "{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PresentationCore", "PresentationCore", "{71F15358-4D5F-4A27-9639-CAC2DA4D88C6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationCore", "src\Microsoft.DotNet.Wpf\src\PresentationCore\PresentationCore.csproj", "{74C63A45-EAE5-407A-9F89-E0C6BC604841}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationCoreCSharp", "src\Microsoft.DotNet.Wpf\src\PresentationCore\CSharp\PresentationCoreCSharp.csproj", "{74C63A45-EAE5-407A-9F89-E0C6BC604841}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectWriteForwarder", "src\Microsoft.DotNet.Wpf\src\PresentationCore\DirectWriteForwarder\DirectWriteForwarder.vcxproj", "{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PresentationCore", "src\Microsoft.DotNet.Wpf\src\PresentationCore\PresentationCore.vcxproj", "{E490620F-542F-4F65-9DAA-577F17B0CCB9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationFramework", "src\Microsoft.DotNet.Wpf\src\PresentationFramework\PresentationFramework.csproj", "{B0C1157E-8664-44C4-AD8E-35CD6A78C769}"
 EndProject
@@ -279,6 +283,18 @@ Global
 		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|x64.Build.0 = Release|x64
 		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|x86.ActiveCfg = Release|Any CPU
 		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|x86.Build.0 = Release|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x64.Build.0 = Debug|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x86.Build.0 = Debug|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x64.ActiveCfg = Release|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x64.Build.0 = Release|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x86.ActiveCfg = Release|Any CPU
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x86.Build.0 = Release|Any CPU
 		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Debug|Any CPU.Build.0 = Debug|Win32
 		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Debug|Any CPU.Deploy.0 = Debug|Win32
@@ -297,18 +313,24 @@ Global
 		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Release|x86.ActiveCfg = Release|Win32
 		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Release|x86.Build.0 = Release|Win32
 		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Release|x86.Deploy.0 = Release|Win32
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x64.ActiveCfg = Debug|x64
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x64.Build.0 = Debug|x64
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Debug|x86.Build.0 = Debug|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|Any CPU.Build.0 = Release|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x64.ActiveCfg = Release|x64
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x64.Build.0 = Release|x64
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x86.ActiveCfg = Release|Any CPU
-		{74C63A45-EAE5-407A-9F89-E0C6BC604841}.Release|x86.Build.0 = Release|Any CPU
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|Any CPU.Build.0 = Debug|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|Any CPU.Deploy.0 = Debug|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|x64.ActiveCfg = Debug|x64
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|x64.Build.0 = Debug|x64
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|x64.Deploy.0 = Debug|x64
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|x86.ActiveCfg = Debug|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|x86.Build.0 = Debug|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Debug|x86.Deploy.0 = Debug|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|Any CPU.ActiveCfg = Release|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|Any CPU.Build.0 = Release|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|Any CPU.Deploy.0 = Release|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|x64.ActiveCfg = Release|x64
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|x64.Build.0 = Release|x64
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|x64.Deploy.0 = Release|x64
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|x86.ActiveCfg = Release|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|x86.Build.0 = Release|Win32
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9}.Release|x86.Deploy.0 = Release|Win32
 		{B0C1157E-8664-44C4-AD8E-35CD6A78C769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B0C1157E-8664-44C4-AD8E-35CD6A78C769}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B0C1157E-8664-44C4-AD8E-35CD6A78C769}.Debug|x64.ActiveCfg = Debug|x64
@@ -1037,6 +1059,9 @@ Global
 		{1D4C8AD7-12E7-4987-98AF-AEE79F53E494} = {0159B0F1-0626-4BED-8D1B-CBFF4F12C369}
 		{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1} = {1D4C8AD7-12E7-4987-98AF-AEE79F53E494}
 		{22D643D8-87D6-4FE8-9632-58A3CD3DC7CB} = {0159B0F1-0626-4BED-8D1B-CBFF4F12C369}
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841} = {71F15358-4D5F-4A27-9639-CAC2DA4D88C6}
+		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E} = {71F15358-4D5F-4A27-9639-CAC2DA4D88C6}
+		{E490620F-542F-4F65-9DAA-577F17B0CCB9} = {71F15358-4D5F-4A27-9639-CAC2DA4D88C6}
 		{2DD6F2F8-DFF4-4EE1-9D48-0FD692DB084D} = {4572CF94-B209-4479-85AB-59CA87BF5AFA}
 		{D242FDF9-F132-4154-BB9F-3F85C39F6F4C} = {4572CF94-B209-4479-85AB-59CA87BF5AFA}
 		{4C99DEEE-ED7A-4225-8127-3B1E6EDB39D0} = {4572CF94-B209-4479-85AB-59CA87BF5AFA}
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml b/eng/WpfArcadeSdk/tools/ILLinkTrim.xml
similarity index 73%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml
rename to eng/WpfArcadeSdk/tools/ILLinkTrim.xml
index a488f34ce05..cf928dc2626 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ILLinkTrim.xml
+++ b/eng/WpfArcadeSdk/tools/ILLinkTrim.xml
@@ -1,5 +1,5 @@
 <linker>
-  <!-- Include dependencies of DirectWriteForwarder, which is not
+  <!-- Include C++/CLI assembly dependencies, which are not
        analyzed by the linker. -->
   <assembly fullname="System.Diagnostics.Debug" />
   <assembly fullname="mscorlib" />
diff --git a/eng/WpfArcadeSdk/tools/ShippingProjects.props b/eng/WpfArcadeSdk/tools/ShippingProjects.props
index 5406023e88f..8b14776ff4a 100644
--- a/eng/WpfArcadeSdk/tools/ShippingProjects.props
+++ b/eng/WpfArcadeSdk/tools/ShippingProjects.props
@@ -4,7 +4,6 @@
       System.Xaml;
       PresentationBuildTasks;
       PresentationCore;
-      DirectWriteForwarder;
       PresentationFramework;
       ReachFramework;
       UIAutomationClient;
@@ -108,7 +107,6 @@
       These assemblies have the public key id 31bf3856ad364e35 (MicrosoftShared)
     -->
     <UseMicrosoftSharedKeyId>
-      DirectWriteForwarder;
       PresentationBuildTasks;
       PresentationCore;
       PresentationCore-ref;
diff --git a/eng/WpfArcadeSdk/tools/SystemResources.props b/eng/WpfArcadeSdk/tools/SystemResources.props
index 60b5c96d737..e2fe90fd6d6 100644
--- a/eng/WpfArcadeSdk/tools/SystemResources.props
+++ b/eng/WpfArcadeSdk/tools/SystemResources.props
@@ -28,6 +28,8 @@
       <ClassName Condition="'$(AssemblyName)'=='PresentationUI'">System.Windows.TrustUI.SRID</ClassName>
       <ClassName Condition="'$(AssemblyName)'=='WindowsFormsIntegration'">System.Windows.SRID</ClassName>
       <ClassName Condition="'$(AssemblyName)'=='PresentationCore'">MS.Internal.PresentationCore.SRID </ClassName>
+      <!-- Required to ensure the PresentationCore CSharp NetModule builds. -->
+      <ClassName Condition="'$(AssemblyName)'=='PresentationCoreCSharp'">MS.Internal.PresentationCore.SRID </ClassName>
       <Classname Condition="'%(ClassName)'==''">System.SRID</Classname>
     </EmbeddedResource>
   </ItemDefinitionGroup>
diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
index a27a77b7b39..73a85e646fa 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
@@ -176,7 +176,7 @@ END
       Additional assembly scope attributes besides TargetFrameworkAttribute are added here 
   -->
   <Target Name="GenerateTargetFrameworkMonikerAttribute2"
-      Condition="'$(ManagedCxx)'=='true'"
+      Condition="'$(ManagedCxx)'=='true' and '$(GenerateAssemblyInfo)'!='false'"
           BeforeTargets="SetMscorlibAdditionalUsingDirectory"
           DependsOnTargets="PrepareForBuild;GetReferenceAssemblyPaths;InitializeAssemblyAttributeInformation"
           Outputs="$(TargetFrameworkMonikerAssemblyAttributesPath)">
@@ -296,7 +296,7 @@ using namespace System::Runtime::Versioning;
     the C++ compiler. 
     
     A simple C# project is generated dynamically. It contains PackageReferences for common packages
-    that are used in WPF's C++/CLI projects. There are only two such projects - DirectWriteForwarder
+    that are used in WPF's C++/CLI projects. There are only three such projects - DirectWriteForwarder, PresentationCore
     and System.Printing - which makes it unnecessary to create a flexible and parametrized target. This
     can remain a simple and one-size-fits-all target for now. 
     
diff --git a/eng/WpfArcadeSdk/tools/WpfProjectReference.targets b/eng/WpfArcadeSdk/tools/WpfProjectReference.targets
index e80e7a0dca0..930f4b55bd8 100644
--- a/eng/WpfArcadeSdk/tools/WpfProjectReference.targets
+++ b/eng/WpfArcadeSdk/tools/WpfProjectReference.targets
@@ -12,9 +12,6 @@
   <ItemGroup>
     <WpfProjectPath Include="System.Xaml" ProjectPath="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
     <WpfProjectPath Include="WindowsBase" ProjectPath="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <WpfProjectPath Include="DirectWriteForwarder" ProjectPath="$(WpfSourceDir)DirectWriteForwarder\DirectWriteForwarder.vcxproj">
-      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
-    </WpfProjectPath>
     <WpfProjectPath Include="System.Windows.Input.Manipulations" ProjectPath="$(WpfSourceDir)System.Windows.Input.Manipulations\System.Windows.Input.Manipulations.csproj" />
     <WpfProjectPath Include="WindowsFormsIntegration" ProjectPath="$(WpfSourceDir)WindowsFormsIntegration\WindowsFormsIntegration.csproj" />
 
@@ -63,15 +60,51 @@
     </CoreCompileDependsOn>
     <ResolveReferencesDependsOn>
       EnsureWpfProjectReference;
+      EnsureILLinkerTrimming;
       $(ResolveReferencesDependsOn)
-      </ResolveReferencesDependsOn>
+    </ResolveReferencesDependsOn>
     <MarkupCompilePass1DependsOn>
       EnsureWpfProjectReference;
+      EnsureILLinkerTrimming;
       $(MarkupCompilePass1DependsOn)
     </MarkupCompilePass1DependsOn>
   </PropertyGroup>
-  
 
+  <!--
+    Automatically add ILLinkTrim.xml as a resource to any project that references 
+    PresentationCore.vcxproj or System.Printing.vcxproj and is a shipping assembly
+    but not a reference assembly.
+  -->
+  <Target Name="EnsureILLinkerTrimming"
+          Condition="'$(IsShipping)'=='true' 
+                      and !$(HandCraftedReferenceProjects.Contains('$(MSBuildProjectName);'))
+                      and !$(MSBuildProjectFile.Contains('vcxproj'))">
+    <ItemGroup>
+      <_PCoreAndSysPrintingReferences Include="@(ProjectReference)" 
+                                      Condition="'%(Filename)%(Extension)'=='PresentationCore.vcxproj' 
+                                                 or '%(Filename)%(Extension)'=='System.Printing.vcxproj'"/>
+      <!-- 
+        Workaround for https://github.com/dotnet/wpf/issues/1385
+        ReadyToRun images of WPF applications crash 
+        
+        When producing ReadyToRun images, the ILLinker is configured to skip 
+        C++/CLI images. See https://github.com/mono/linker/issues/651 and 
+        https://github.com/mono/linker/pull/658. 
+        
+        In turn, this results in the failure of the dependencies of such assemblies from being
+        identified and included in the ReadyToRun images. 
+        
+        This linker hint exists to ensure that such dependencies are included. We need
+        to place these hints in an assembly that has a reference to the corresponding
+        C++/CLI assembly. 
+      -->
+      <EmbeddedResource Include="$(WpfArcadeSdkToolsDir)ILLinkTrim.xml"
+                        Condition="'@(_PCoreAndSysPrintingReferences->Count())' &gt; 0">
+        <XlfInput>false</XlfInput>
+        <LogicalName>$(AssemblyName).xml</LogicalName>
+      </EmbeddedResource>
+    </ItemGroup>
+  </Target>
 
   <Target Name="EnsureWpfProjectReference" 
           DependsOnTargets="$(EnsureWpfProjectReferenceDependsOn)"
diff --git a/src/Microsoft.DotNet.Wpf/ApiCompat/Baselines/PresentationCore-ref.baseline.txt b/src/Microsoft.DotNet.Wpf/ApiCompat/Baselines/PresentationCore-ref.baseline.txt
index b74ecc1ae09..90dea7def15 100644
--- a/src/Microsoft.DotNet.Wpf/ApiCompat/Baselines/PresentationCore-ref.baseline.txt
+++ b/src/Microsoft.DotNet.Wpf/ApiCompat/Baselines/PresentationCore-ref.baseline.txt
@@ -1,4 +1,5 @@
 Compat issues with assembly PresentationCore:
+TypesMustExist : Type 'MS.Internal.TrueTypeSubsetter' does not exist in the implementation but it does exist in the contract.
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Windows.LocalizabilityAttribute' changed from '[AttributeUsageAttribute(412, AllowMultiple=false, Inherited=true)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple=false, Inherited=true)]' in the implementation.
 CannotRemoveAttribute : Attribute 'MS.Internal.PresentationCore.FriendAccessAllowedAttribute' exists on 'System.Windows.Input.InputEventArgs' in the contract but not the implementation.
 MembersMustExist : Member 'System.Windows.Media.Brush.AddRefOnChannelCore(System.Windows.Media.Composition.DUCE.Channel)' does not exist in the implementation but it does exist in the contract.
@@ -19,4 +20,4 @@ MembersMustExist : Member 'System.Windows.Media.Imaging.BitmapDecoder.SealObject
 MembersMustExist : Member 'System.Windows.Media.Imaging.BitmapEncoder.SealObject()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Windows.Media.TextFormatting.TextFormatter.CreateParagraphCache(System.Windows.Media.TextFormatting.TextSource, System.Int32, System.Double, System.Windows.Media.TextFormatting.TextParagraphProperties, System.Windows.Media.TextFormatting.TextLineBreak, System.Windows.Media.TextFormatting.TextRunCache)' does not exist in the implementation but it does exist in the contract.
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Windows.Resources.AssemblyAssociatedContentFileAttribute' changed from '[AttributeUsageAttribute(1, AllowMultiple=true)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Assembly, AllowMultiple=true)]' in the implementation.
-Total Issues: 20
+Total Issues: 21
diff --git a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-ReachFramework-impl-cycle.csproj b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-ReachFramework-impl-cycle.csproj
index 879efd82be3..7435c3b903c 100644
--- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-ReachFramework-impl-cycle.csproj
+++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-ReachFramework-impl-cycle.csproj
@@ -45,7 +45,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
     <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
     <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\UIAutomationTypes.csproj" />
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
diff --git a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-api-cycle.csproj b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-api-cycle.csproj
index dd645037801..2820224e4f1 100644
--- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-api-cycle.csproj
+++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-api-cycle.csproj
@@ -50,7 +50,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
     <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
     <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
diff --git a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-impl-cycle.csproj b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-impl-cycle.csproj
index 9b6c8d2c9e3..ffa25d7175c 100644
--- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-impl-cycle.csproj
+++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-impl-cycle.csproj
@@ -45,7 +45,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
     <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
     <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
diff --git a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI-PresentationFramework-impl-cycle.csproj b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI-PresentationFramework-impl-cycle.csproj
index 4fe9c0cf899..b53976c349e 100644
--- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI-PresentationFramework-impl-cycle.csproj
+++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI-PresentationFramework-impl-cycle.csproj
@@ -29,7 +29,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
     <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
   </ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI.internals.cs b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI.internals.cs
index b90f2d61058..0c6d5cc97b5 100644
--- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI.internals.cs
+++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI.internals.cs
@@ -6,7 +6,7 @@
 // ------------------------------------------------------------------------------
 
 using System.Runtime.CompilerServices;
-using MS.Internal.PresentationCore;
+using Microsoft.Internal;
 
 [assembly:InternalsVisibleTo(BuildInfo.PresentationFramework)]
 
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.sln b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.sln
deleted file mode 100644
index 8ab6a964db9..00000000000
--- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.sln
+++ /dev/null
@@ -1,64 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28407.52
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectWriteForwarder", "DirectWriteForwarder.vcxproj", "{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsBase", "..\WindowsBase\WindowsBase.csproj", "{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xaml", "..\System.Xaml\System.Xaml.csproj", "{9AC36357-34B7-40A1-95CA-FE9F46D089A7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Debug|Any CPU.Build.0 = Debug|Win32
-		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Debug|x64.ActiveCfg = Debug|x64
-		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Debug|x64.Build.0 = Debug|x64
-		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Debug|x86.ActiveCfg = Debug|Win32
-		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Debug|x86.Build.0 = Debug|Win32
-		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Release|Any CPU.ActiveCfg = Release|Win32
-		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Release|Any CPU.Build.0 = Release|Win32
-		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Release|x64.ActiveCfg = Release|x64
-		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Release|x64.Build.0 = Release|x64
-		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Release|x86.ActiveCfg = Release|Win32
-		{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}.Release|x86.Build.0 = Release|Win32
-		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Debug|x64.ActiveCfg = Debug|x64
-		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Debug|x64.Build.0 = Debug|x64
-		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Debug|x86.Build.0 = Debug|Any CPU
-		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|x64.ActiveCfg = Release|x64
-		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|x64.Build.0 = Release|x64
-		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|x86.ActiveCfg = Release|Any CPU
-		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|x86.Build.0 = Release|Any CPU
-		{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Debug|x64.ActiveCfg = Debug|x64
-		{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Debug|x64.Build.0 = Debug|x64
-		{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Debug|x86.Build.0 = Debug|Any CPU
-		{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Release|x64.ActiveCfg = Release|x64
-		{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Release|x64.Build.0 = Release|x64
-		{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Release|x86.ActiveCfg = Release|Any CPU
-		{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9FE706D9-8DF4-4979-A81D-8CA1BAA2FC7C}
-	EndGlobalSection
-EndGlobal
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/OtherAssemblyAttrs.cpp b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/OtherAssemblyAttrs.cpp
deleted file mode 100644
index a1f2761ff63..00000000000
--- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/OtherAssemblyAttrs.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using namespace System::Runtime::CompilerServices;
-#using WINDOWS_BASE_DLL
-
-[assembly:InternalsVisibleTo("PresentationCore, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")];
-[assembly:System::Runtime::CompilerServices::TypeForwardedTo(System::Windows::Media::TextFormattingMode::typeid)] ;
diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj
index 6b6616680ab..b932f469b32 100644
--- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj
@@ -4,12 +4,15 @@
     <Platforms>AnyCPU;x64</Platforms>
     <EnableDefaultItems>false</EnableDefaultItems>
     <GenerateDependencyFile>false</GenerateDependencyFile>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SystemDrawingExtension.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
     <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
     <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
   </ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj
index 61dbb1e744d..76125b2274f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj
@@ -132,29 +132,29 @@
     <Compile Include="$(WpfSourceDir)\WindowsBase\MS\Internal\IO\Packaging\Compoundfile\ContainerUtilities.cs">
       <Link>WindowsBase\MS\Internal\IO\Packaging\Compoundfile\ContainerUtilities.cs</Link>
     </Compile>
-    <Compile Include="$(WpfSourceDir)\PresentationCore\MS\internal\Media\XamlSerializationHelper.cs">
-      <Link>PresentationCore\MS\internal\Media\XamlSerializationHelper.cs</Link>
+    <Compile Include="$(WpfSourceDir)\PresentationCore\CSharp\MS\internal\Media\XamlSerializationHelper.cs">
+      <Link>PresentationCore\CSharp\MS\internal\Media\XamlSerializationHelper.cs</Link>
     </Compile>
-    <Compile Include="$(WpfSourceDir)\PresentationCore\MS\internal\Media\ParserStreamGeometryContext.cs">
-      <Link>PresentationCore\MS\internal\Media\ParserStreamGeometryContext.cs</Link>
+    <Compile Include="$(WpfSourceDir)\PresentationCore\CSharp\MS\internal\Media\ParserStreamGeometryContext.cs">
+      <Link>PresentationCore\CSharp\MS\internal\Media\ParserStreamGeometryContext.cs</Link>
     </Compile>
-    <Compile Include="$(WpfSourceDir)\PresentationCore\System\Windows\Media\StreamGeometryContext.cs">
-      <Link>PresentationCore\System\Windows\Media\StreamGeometryContext.cs</Link>
+    <Compile Include="$(WpfSourceDir)\PresentationCore\CSharp\System\Windows\Media\StreamGeometryContext.cs">
+      <Link>PresentationCore\CSharp\System\Windows\Media\StreamGeometryContext.cs</Link>
     </Compile>
-    <Compile Include="$(WpfSourceDir)\PresentationCore\System\Windows\Media\ParsersCommon.cs">
-      <Link>PresentationCore\System\Windows\Media\ParsersCommon.cs</Link>
+    <Compile Include="$(WpfSourceDir)\PresentationCore\CSharp\System\Windows\Media\ParsersCommon.cs">
+      <Link>PresentationCore\CSharp\System\Windows\Media\ParsersCommon.cs</Link>
     </Compile>
-    <Compile Include="$(WpfSourceDir)\PresentationCore\System\Windows\LocalizationCategory.cs">
-      <Link>PresentationCore\System\Windows\LocalizationCategory.cs</Link>
+    <Compile Include="$(WpfSourceDir)\PresentationCore\CSharp\System\Windows\LocalizationCategory.cs">
+      <Link>PresentationCore\CSharp\System\Windows\LocalizationCategory.cs</Link>
     </Compile>
-    <Compile Include="$(WpfSourceDir)\PresentationCore\System\Windows\Media\Knowncolors.cs">
-      <Link>PresentationCore\System\Windows\Media\Knowncolors.cs</Link>
+    <Compile Include="$(WpfSourceDir)\PresentationCore\CSharp\System\Windows\Media\Knowncolors.cs">
+      <Link>PresentationCore\CSharp\System\Windows\Media\Knowncolors.cs</Link>
     </Compile>
-    <Compile Include="$(WpfSourceDir)\PresentationCore\System\Windows\Modifiability.cs">
-      <Link>PresentationCore\System\Windows\Modifiability.cs</Link>
+    <Compile Include="$(WpfSourceDir)\PresentationCore\CSharp\System\Windows\Modifiability.cs">
+      <Link>PresentationCore\CSharp\System\Windows\Modifiability.cs</Link>
     </Compile>
-    <Compile Include="$(WpfSourceDir)\PresentationCore\System\Windows\Readability.cs">
-      <Link>PresentationCore\System\Windows\Readability.cs</Link>
+    <Compile Include="$(WpfSourceDir)\PresentationCore\CSharp\System\Windows\Readability.cs">
+      <Link>PresentationCore\CSharp\System\Windows\Readability.cs</Link>
     </Compile>
     <Compile Include="$(WpfSourceDir)\PresentationFramework\System\Windows\Markup\AttributeData.cs">
       <Link>PresentationFramework\System\Windows\Markup\AttributeData.cs</Link>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/AvTraceMessages.txt b/src/Microsoft.DotNet.Wpf/src/PresentationCore/AvTraceMessages.txt
deleted file mode 100644
index b5d1190720e..00000000000
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/AvTraceMessages.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-;
-;  This file contains trace information used to generate wrapper
-;  classes.
-;
-;  The format of the info is a set of sections, where each section
-;  contains:
-;
-;      [TraceName,TraceArea,WrapperClassName]
-;      Trace1=1,,{"Base message 1","Param1","Param2"}
-;      Trace2=,,{"Base message 2","Param1","Param2"}
-;      Trace3=AUTO,,{"Base message 3","InParam1","InParam2"}
-;      Trace4=PREVIOUS,,{"Base message 4","OutParam1","OutParam2"}
-;      Trace5=,FORMAT,{"{0} is broken","Param1","Param2"}
-;      ...
-;      [end]
-;
-;  These sections break down as follows ...
-;
-;  TraceName:  This is the name of the trace source, and the name that you use to enable
-;  this group of traces in the .config file.  This should be named with the appropriate
-;  CLR namespace for the feature area.  If the feature area doesn't have its own namespace,
-;  e.g. the code is in the root System.Windows namespace, either use a class name, or
-;  what the namespace would be if it had one.
-;
-;  TraceArea: This is the name of the area and is used to construct the static property
-;  names for the PresenationTraceSources class.
-;
-;  WrapperClassName: This is the name of a class that will be generated to wrap
-;  the trace messages that follow.  By convention, this should start with "Trace".
-;
-;  Trace detail:
-;      In the trace details, the first comma-delimited value is the trace ID (integer),
-;      and each trace ID should generally be unique within the section.
-;      The keyword 'AUTO' may be used to auto-generate the id: (= max_id_in_section + 1)
-;      The keyword 'PREVIOUS' will repeat the last used id.  Blank is the same as 'AUTO'.
-;      Trace strings with hard-coded ID should be listed before the AUTO ones to avoid duplicate ID.
-;
-;      The second value indicates whether the message should be treated as a format string:
-;      blank or '0' means NOT a format string.
-;
-;      The remainder is a string array:
-;      The first string in the array is the basic message, and the remaining strings correspond 
-;      to the variable argument list in the trace call.
-;
-;
-;  Example:
-;
-;  [System.Windows,Area,TraceClass]
-;  TraceBasic=,,{"basic msg", "data1", "data2"}
-;  TraceFormat=,FORMAT,{"{0} is doing something to {1}.", "data1", "data2"}
-;  [end]
-;
-;  In code, the TraceClass is used like this:
-;
-;  // basic message
-;  TraceClass.Trace(TraceEventType.Error, TraceClass.TraceBasic, data1, data2 );
-;
-;  // message with format string
-;  TraceClass.Trace(TraceEventType.Error, TraceClass.TraceFormat( arg1, arg2 ), data1, data2 );
-;  
-
-[System.Windows.RoutedEvent,RoutedEvent,TraceRoutedEvent]
-RaiseEvent=,,{"Raise RoutedEvent", "RoutedEvent", "Element", "RoutedEventArgs", "Handled"}
-ReRaiseEventAs=,,{"Raise RoutedEvent", "RoutedEvent", "Element", "RoutedEventArgs", "Handled"}
-HandleEvent=,,{ "RoutedEvent has set Handled", "Handled", "EventOwnerType", "EventName", "RoutedEventArgs" }
-InvokeHandlers=,,{ "InvokeHandlers", "Element", "RoutedEventArgs", "Handled" }
-[end]
-
-[System.Windows.Media.Animation,Animation,TraceAnimation]
-StoryboardBegin=,,{"Storyboard has begun", "Storyboard", "StoryboardName", "TargetElement", "NameScope"}
-StoryboardPause=,,{"Storyboard has been paused", "Storyboard", "StoryboardName", "TargetElement"}
-StoryboardRemove=,,{"Storyboard has been removed", "Storyboard", "StoryboardName", "TargetElement"}
-StoryboardResume=,,{"Storyboard has been resumed", "Storyboard", "StoryboardName", "TargetElement"}
-StoryboardStop=,,{"Storyboard has been stopped", "Storyboard", "StoryboardName", "TargetElement"}
-StoryboardNotApplied=,,{"Unable to perform action because the specified Storyboard was never applied to this object for interactive control.", "Action", "Storyboard", "TargetElement"}
-AnimateStorageValidationFailed=,,{"Animated property failed validation. Animated value not set.", "AnimationStorage", "AnimatedValue", "AnimatedObject", "AnimatedProperty"}
-AnimateStorageValidationNoLongerFailing=,,{"Animated property no longer failing validation.", "AnimationStorage", "AnimatedValue", "AnimatedObject", "AnimatedProperty"}
-[end]
-
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/AvTraceMessages.xml b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/AvTraceMessages.xml
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/AvTraceMessages.xml
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/AvTraceMessages.xml
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/Directory.Build.Props b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/Directory.Build.Props
new file mode 100644
index 00000000000..82bac5debfb
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/Directory.Build.Props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyKey>SilverlightExtension</AssemblyKey>
+    <IsWPF>true</IsWPF>
+  </PropertyGroup>
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/Win32/UnsafeNativeMethodsPenimc.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/Win32/UnsafeNativeMethodsPenimc.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/Win32/UnsafeNativeMethodsPenimc.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/Win32/UnsafeNativeMethodsPenimc.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/Win32/UnsafeNativeMethodsPointer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/Win32/UnsafeNativeMethodsPointer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/Win32/UnsafeNativeMethodsPointer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/Win32/UnsafeNativeMethodsPointer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/Win32/UnsafeNativeMethodsTablet.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/Win32/UnsafeNativeMethodsTablet.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/Win32/UnsafeNativeMethodsTablet.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/Win32/UnsafeNativeMethodsTablet.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AnimatedTypeHelpers.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/AnimatedTypeHelpers.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AnimatedTypeHelpers.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/AnimatedTypeHelpers.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AppModel/CookieHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/AppModel/CookieHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AppModel/CookieHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/AppModel/CookieHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AppModel/CustomCredentialPolicy.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/AppModel/CustomCredentialPolicy.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AppModel/CustomCredentialPolicy.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/AppModel/CustomCredentialPolicy.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AppModel/SiteOfOriginContainer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/AppModel/SiteOfOriginContainer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AppModel/SiteOfOriginContainer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/AppModel/SiteOfOriginContainer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AppModel/SiteOfOriginPart.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/AppModel/SiteOfOriginPart.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AppModel/SiteOfOriginPart.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/AppModel/SiteOfOriginPart.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/AutomationPatternInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/AutomationPatternInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/AutomationPatternInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/AutomationPatternInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/AutomationPropertyInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/AutomationPropertyInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/AutomationPropertyInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/AutomationPropertyInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/DockProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/DockProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/DockProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/DockProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ElementProxy.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ElementProxy.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ElementProxy.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ElementProxy.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ElementUtil.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ElementUtil.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ElementUtil.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ElementUtil.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/EventMap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/EventMap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/EventMap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/EventMap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/EventPropertyMap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/EventPropertyMap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/EventPropertyMap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/EventPropertyMap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ExpandCollapseProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ExpandCollapseProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ExpandCollapseProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ExpandCollapseProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/GridItemProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/GridItemProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/GridItemProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/GridItemProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/GridProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/GridProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/GridProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/GridProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/InteropAutomationProvider.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/InteropAutomationProvider.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/InteropAutomationProvider.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/InteropAutomationProvider.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/InvokeProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/InvokeProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/InvokeProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/InvokeProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ItemContainerProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ItemContainerProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ItemContainerProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ItemContainerProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/MultipleViewProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/MultipleViewProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/MultipleViewProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/MultipleViewProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/RangeValueProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/RangeValueProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/RangeValueProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/RangeValueProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ScrollItemProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ScrollItemProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ScrollItemProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ScrollItemProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ScrollProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ScrollProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ScrollProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ScrollProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/SelectionItemProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/SelectionItemProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/SelectionItemProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/SelectionItemProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/SelectionProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/SelectionProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/SelectionProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/SelectionProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/SynchronizedInputAdaptor.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/SynchronizedInputAdaptor.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/SynchronizedInputAdaptor.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/SynchronizedInputAdaptor.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/SynchronizedInputProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/SynchronizedInputProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/SynchronizedInputProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/SynchronizedInputProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/TableItemProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/TableItemProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/TableItemProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/TableItemProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/TableProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/TableProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/TableProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/TableProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/TextProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/TextProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/TextProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/TextProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/TextRangeProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/TextRangeProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/TextRangeProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/TextRangeProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ToggleProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ToggleProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ToggleProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ToggleProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/TransformProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/TransformProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/TransformProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/TransformProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ValueProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ValueProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/ValueProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/ValueProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/VirtualizedItemProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/VirtualizedItemProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/VirtualizedItemProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/VirtualizedItemProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/WindowProviderWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/WindowProviderWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/WindowProviderWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Automation/WindowProviderWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/CheckedPointers.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/CheckedPointers.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/CheckedPointers.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/CheckedPointers.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Classification.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Classification.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Classification.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Classification.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Collections/InternalCollectionDelegates.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Collections/InternalCollectionDelegates.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Collections/InternalCollectionDelegates.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Collections/InternalCollectionDelegates.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/CoreAppContextSwitches.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/CoreAppContextSwitches.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/CoreAppContextSwitches.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/CoreAppContextSwitches.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/CustomCategoryAttribute.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/CustomCategoryAttribute.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/CustomCategoryAttribute.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/CustomCategoryAttribute.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DeferredElementTreeState.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DeferredElementTreeState.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DeferredElementTreeState.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DeferredElementTreeState.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiScale2.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiScale2.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiScale2.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiScale2.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+DpiAwarenessContextHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil+DpiAwarenessContextHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+DpiAwarenessContextHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil+DpiAwarenessContextHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+DpiAwarenessScope.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil+DpiAwarenessScope.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+DpiAwarenessScope.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil+DpiAwarenessScope.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+HwndDpiInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil+HwndDpiInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+HwndDpiInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil+HwndDpiInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+ProcessDpiAwarenessHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil+ProcessDpiAwarenessHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+ProcessDpiAwarenessHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil+ProcessDpiAwarenessHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+SystemDpiHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil+SystemDpiHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+SystemDpiHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil+SystemDpiHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+WindowDpiScaleHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil+WindowDpiScaleHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil+WindowDpiScaleHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil+WindowDpiScaleHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/DpiUtil/DpiUtil.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/DpiUtil/DpiUtil.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/BufferCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/BufferCache.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/BufferCache.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/BufferCache.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/CachedFontFace.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/CachedFontFace.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/CachedFontFace.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/CachedFontFace.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/CachedFontFamily.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/CachedFontFamily.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/CachedFontFamily.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/CachedFontFamily.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/CachedTypeface.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/CachedTypeface.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/CachedTypeface.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/CachedTypeface.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/CanonicalFontFamilyReference.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/CanonicalFontFamilyReference.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/CanonicalFontFamilyReference.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/CanonicalFontFamilyReference.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/DWriteFactory.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/DWriteFactory.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/DWriteFactory.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/DWriteFactory.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FamilyCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FamilyCollection.cs
similarity index 99%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FamilyCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FamilyCollection.cs
index 0ad6a9a7454..82960953a7b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FamilyCollection.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FamilyCollection.cs
@@ -57,7 +57,7 @@ internal class FamilyCollection
 
         #endregion Private Fields
 
-        internal static string SxSFontsResourcePrefix { get; } = $"/{Path.GetFileNameWithoutExtension(ExternDll.PresentationCore)};component/fonts/";
+        internal static string SxSFontsResourcePrefix { get; } = $"/{Path.GetFileNameWithoutExtension(ExternDll.WindowsBase)};component/fonts/";
 
         private static List<CompositeFontFamily> GetCompositeFontList(FontSourceCollection fontSourceCollection)
         {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontCacheLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FontCacheLogic.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontCacheLogic.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FontCacheLogic.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontCacheUtil.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FontCacheUtil.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontCacheUtil.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FontCacheUtil.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontFaceLayoutInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FontFaceLayoutInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontFaceLayoutInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FontFaceLayoutInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontResourceCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FontResourceCache.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontResourceCache.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FontResourceCache.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FontSource.cs
similarity index 98%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FontSource.cs
index 5e252bfffb3..140a28a7185 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontSource.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FontSource.cs
@@ -365,8 +365,9 @@ private Stream GetCompositeFontResourceStream()
         {
             string fontFilename = _fontUri.OriginalString.Substring(_fontUri.OriginalString.LastIndexOf('/') + 1).ToLowerInvariant();
 
-            var fontResourceAssembly = Assembly.GetExecutingAssembly();
-            ResourceManager rm = new ResourceManager($"{fontResourceAssembly.GetName().Name}.g", fontResourceAssembly);
+            var resourcesAssemblyName = Path.GetFileNameWithoutExtension(ExternDll.WindowsBase); 
+            var fontResourceAssembly = Assembly.Load(resourcesAssemblyName);
+            ResourceManager rm = new ResourceManager($"{resourcesAssemblyName}.g", fontResourceAssembly);
 
             return rm?.GetStream($"fonts/{fontFilename}");
         }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontSourceCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FontSourceCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontSourceCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/FontSourceCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/IPCCacheManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/IPCCacheManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/IPCCacheManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/IPCCacheManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/TypefaceMetricsCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/TypefaceMetricsCache.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/TypefaceMetricsCache.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/TypefaceMetricsCache.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/fontcacheconstants.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/fontcacheconstants.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/fontcacheconstants.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontCache/fontcacheconstants.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/CachedCompositeFamily.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/CachedCompositeFamily.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/CachedCompositeFamily.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/CachedCompositeFamily.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/CompositeFontInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/CompositeFontInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/CompositeFontInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/CompositeFontInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/CompositeFontParser.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/CompositeFontParser.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/CompositeFontParser.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/CompositeFontParser.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/FontDifferentiator.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/FontDifferentiator.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/FontDifferentiator.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/FontDifferentiator.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/FontDriver.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/FontDriver.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/FontDriver.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/FontDriver.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/FontFamilyIdentifier.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/FontFamilyIdentifier.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/FontFamilyIdentifier.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/FontFamilyIdentifier.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/IDeviceFont.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/IDeviceFont.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/IDeviceFont.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/IDeviceFont.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/IFontFamily.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/IFontFamily.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/IFontFamily.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/IFontFamily.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/ITypefaceMetrics.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/ITypefaceMetrics.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/ITypefaceMetrics.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/ITypefaceMetrics.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/MatchingStyle.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/MatchingStyle.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/MatchingStyle.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/MatchingStyle.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/PhysicalFontFamily.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/PhysicalFontFamily.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/PhysicalFontFamily.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/PhysicalFontFamily.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/Tags.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/Tags.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/Tags.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/Tags.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/TypefaceCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/TypefaceCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontFace/TypefaceCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/FontFace/TypefaceCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Generated/AvTraceMessages.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Generated/AvTraceMessages.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Generated/AvTraceMessages.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Generated/AvTraceMessages.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Generic/Span.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Generic/Span.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Generic/Span.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Generic/Span.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IListConverters.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IListConverters.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IListConverters.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IListConverters.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/ByteRangeDownloader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IO/Packaging/ByteRangeDownloader.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/ByteRangeDownloader.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IO/Packaging/ByteRangeDownloader.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/DeobfuscatingStream.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IO/Packaging/DeobfuscatingStream.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/DeobfuscatingStream.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IO/Packaging/DeobfuscatingStream.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/NetStream.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IO/Packaging/NetStream.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/NetStream.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IO/Packaging/NetStream.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/PreloadedPackages.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IO/Packaging/PreloadedPackages.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/PreloadedPackages.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IO/Packaging/PreloadedPackages.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/PseudoWebRequest.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IO/Packaging/PseudoWebRequest.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/PseudoWebRequest.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IO/Packaging/PseudoWebRequest.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/ResponseStream.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IO/Packaging/ResponseStream.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IO/Packaging/ResponseStream.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IO/Packaging/ResponseStream.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IVisual3DContainer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IVisual3DContainer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/IVisual3DContainer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/IVisual3DContainer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/Bezier.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/Bezier.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/Bezier.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/Bezier.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/ContourSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/ContourSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/ContourSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/ContourSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/CuspData.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/CuspData.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/CuspData.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/CuspData.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/DrawingFlags.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/DrawingFlags.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/DrawingFlags.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/DrawingFlags.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/EllipticalNodeOperations.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/EllipticalNodeOperations.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/EllipticalNodeOperations.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/EllipticalNodeOperations.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/ErasingStroke.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/ErasingStroke.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/ErasingStroke.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/ErasingStroke.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/ExtendedProperty.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/ExtendedProperty.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/ExtendedProperty.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/ExtendedProperty.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/ExtendedPropertyCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/ExtendedPropertyCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/ExtendedPropertyCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/ExtendedPropertyCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/GestureRecognizer/NativeRecognizer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/GestureRecognizer/NativeRecognizer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/GestureRecognizer/NativeRecognizer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/GestureRecognizer/NativeRecognizer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/AlgoModule.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/AlgoModule.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/AlgoModule.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/AlgoModule.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/Codec.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/Codec.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/Codec.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/Codec.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/Compress.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/Compress.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/Compress.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/Compress.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/CustomAttributeSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/CustomAttributeSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/CustomAttributeSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/CustomAttributeSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/DrawingAttributeSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/DrawingAttributeSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/DrawingAttributeSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/DrawingAttributeSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/GorillaCodec.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/GorillaCodec.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/GorillaCodec.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/GorillaCodec.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/GuidTagList.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/GuidTagList.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/GuidTagList.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/GuidTagList.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/HuffCodec.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/HuffCodec.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/HuffCodec.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/HuffCodec.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/HuffModule.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/HuffModule.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/HuffModule.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/HuffModule.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/ISFTagAndGuidCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/ISFTagAndGuidCache.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/ISFTagAndGuidCache.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/ISFTagAndGuidCache.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/InkSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/InkSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/InkSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/InkSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/LZCodec.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/LZCodec.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/LZCodec.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/LZCodec.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/MetricEntry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/MetricEntry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/MetricEntry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/MetricEntry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/MultiByteCodec.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/MultiByteCodec.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/MultiByteCodec.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/MultiByteCodec.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/SerializationHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/SerializationHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/SerializationHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/SerializationHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/StrokeDescriptor.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/StrokeDescriptor.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/StrokeDescriptor.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/StrokeDescriptor.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/StrokeSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/StrokeSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/StrokeSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/StrokeSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/TransformDescriptor.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/TransformDescriptor.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/InkSerializedFormat/TransformDescriptor.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/InkSerializedFormat/TransformDescriptor.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/Lasso.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/Lasso.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/Lasso.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/Lasso.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/Quad.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/Quad.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/Quad.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/Quad.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/Renderer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/Renderer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/Renderer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/Renderer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/SerializationFlags.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/SerializationFlags.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/SerializationFlags.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/SerializationFlags.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeFIndices.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeFIndices.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeFIndices.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeFIndices.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeIntersection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeIntersection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeIntersection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeIntersection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeNode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeNode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNodeData.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeNodeData.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNodeData.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeNodeData.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNodeEnumerator.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeNodeEnumerator.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNodeEnumerator.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeNodeEnumerator.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNodeOperations.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeNodeOperations.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNodeOperations.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeNodeOperations.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNodeOperations2.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeNodeOperations2.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeNodeOperations2.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeNodeOperations2.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeRenderer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeRenderer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeRenderer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StrokeRenderer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StylusShape.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StylusShape.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StylusShape.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Ink/StylusShape.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Interop/TipTsfHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Interop/TipTsfHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Interop/TipTsfHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Interop/TipTsfHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/KnownBoxes.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/KnownBoxes.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/KnownBoxes.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/KnownBoxes.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/LoadedOrUnloadedOperation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/LoadedOrUnloadedOperation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/LoadedOrUnloadedOperation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/LoadedOrUnloadedOperation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media/ParserStreamGeometryContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media/ParserStreamGeometryContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media/ParserStreamGeometryContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media/ParserStreamGeometryContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media/TextOptionsInternal.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media/TextOptionsInternal.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media/TextOptionsInternal.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media/TextOptionsInternal.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media/VisualTreeUtils.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media/VisualTreeUtils.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media/VisualTreeUtils.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media/VisualTreeUtils.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media/XamlSerializationHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media/XamlSerializationHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media/XamlSerializationHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media/XamlSerializationHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media3D/GeneralTransform2DTo3DTo2D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media3D/GeneralTransform2DTo3DTo2D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media3D/GeneralTransform2DTo3DTo2D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media3D/GeneralTransform2DTo3DTo2D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media3D/GeneralTransform3DTo2DTo3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media3D/GeneralTransform3DTo2DTo3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media3D/GeneralTransform3DTo2DTo3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media3D/GeneralTransform3DTo2DTo3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media3D/LineUtil.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media3D/LineUtil.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media3D/LineUtil.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media3D/LineUtil.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media3D/M3DUtil.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media3D/M3DUtil.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Media3D/M3DUtil.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Media3D/M3DUtil.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/MediaTrace.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/MediaTrace.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/MediaTrace.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/MediaTrace.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/PartialArray.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/PartialArray.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/PartialArray.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/PartialArray.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Resources/ContentFileHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Resources/ContentFileHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Resources/ContentFileHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Resources/ContentFileHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Resources/ResourceManagerWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Resources/ResourceManagerWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Resources/ResourceManagerWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Resources/ResourceManagerWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/CompositeFontFamily.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/CompositeFontFamily.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/CompositeFontFamily.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/CompositeFontFamily.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/CompositeTypefaceMetrics.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/CompositeTypefaceMetrics.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/CompositeTypefaceMetrics.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/CompositeTypefaceMetrics.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/Context.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/Context.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/Context.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/Context.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/GlyphInfoList.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/GlyphInfoList.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/GlyphInfoList.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/GlyphInfoList.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/GlyphingCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/GlyphingCache.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/GlyphingCache.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/GlyphingCache.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/IShapeableTextCollector.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/IShapeableTextCollector.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/IShapeableTextCollector.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/IShapeableTextCollector.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/OpenTypeCommon.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/OpenTypeCommon.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/OpenTypeCommon.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/OpenTypeCommon.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/OpenTypeLayout.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/OpenTypeLayout.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/OpenTypeLayout.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/OpenTypeLayout.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/OpenTypeLayoutCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/OpenTypeLayoutCache.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/OpenTypeLayoutCache.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/OpenTypeLayoutCache.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/Positioning.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/Positioning.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/Positioning.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/Positioning.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/ShapeTypeface.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/ShapeTypeface.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/ShapeTypeface.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/ShapeTypeface.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/ShaperBuffers.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/ShaperBuffers.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/ShaperBuffers.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/ShaperBuffers.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/ShapingOptions.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/ShapingOptions.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/ShapingOptions.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/ShapingOptions.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/Substitution.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/Substitution.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/Substitution.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/Substitution.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/TypefaceMap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/TypefaceMap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/TypefaceMap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/TypefaceMap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/UshortList2.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/UshortList2.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Shaping/UshortList2.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Shaping/UshortList2.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Span.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Span.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Span.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/Span.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/SynchronizedInputHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/SynchronizedInputHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/SynchronizedInputHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/SynchronizedInputHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/SystemDrawingHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/SystemDrawingHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/SystemDrawingHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/SystemDrawingHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/Bidi.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/Bidi.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/Bidi.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/Bidi.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/CultureMapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/CultureMapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/CultureMapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/CultureMapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/DrawingState.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/DrawingState.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/DrawingState.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/DrawingState.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/FormatSettings.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/FormatSettings.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/FormatSettings.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/FormatSettings.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/FormattedTextSymbols.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/FormattedTextSymbols.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/FormattedTextSymbols.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/FormattedTextSymbols.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/FullTextBreakpoint.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/FullTextBreakpoint.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/FullTextBreakpoint.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/FullTextBreakpoint.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/FullTextLine.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/FullTextLine.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/FullTextLine.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/FullTextLine.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/FullTextState.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/FullTextState.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/FullTextState.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/FullTextState.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/GenericTextProperties.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/GenericTextProperties.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/GenericTextProperties.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/GenericTextProperties.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/ITextMetrics.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/ITextMetrics.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/ITextMetrics.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/ITextMetrics.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/ITextSymbols.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/ITextSymbols.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/ITextSymbols.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/ITextSymbols.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/LexicalChunk.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/LexicalChunk.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/LexicalChunk.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/LexicalChunk.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/LineServices.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/LineServices.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/LineServices.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/LineServices.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/LineServicesCallbacks.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/LineServicesCallbacks.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/LineServicesCallbacks.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/LineServicesCallbacks.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/LineServicesRun.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/LineServicesRun.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/LineServicesRun.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/LineServicesRun.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/NumberSubstitution.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/NumberSubstitution.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/NumberSubstitution.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/NumberSubstitution.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/SimpleTextLine.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/SimpleTextLine.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/SimpleTextLine.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/SimpleTextLine.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextFormatterImp.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextFormatterImp.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextFormatterImp.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextFormatterImp.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextMarkerSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextMarkerSource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextMarkerSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextMarkerSource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextMetrics.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextMetrics.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextMetrics.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextMetrics.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextPenaltyModule.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextPenaltyModule.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextPenaltyModule.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextPenaltyModule.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextProperties.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextProperties.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextProperties.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextProperties.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextRunCacheImp.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextRunCacheImp.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextRunCacheImp.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextRunCacheImp.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextShapeableCharacters.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextShapeableCharacters.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextShapeableCharacters.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextShapeableCharacters.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextShapeableSymbols.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextShapeableSymbols.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextShapeableSymbols.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextShapeableSymbols.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextStore.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextStore.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextStore.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/TextStore.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/ThousandthOfEmRealDoubles.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/ThousandthOfEmRealDoubles.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/ThousandthOfEmRealDoubles.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/ThousandthOfEmRealDoubles.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/ThousandthOfEmRealPoints.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/ThousandthOfEmRealPoints.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/ThousandthOfEmRealPoints.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/TextFormatting/ThousandthOfEmRealPoints.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/UIElementHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/UIElementHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/UIElementHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/UIElementHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/UnicodeClasses.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/UnicodeClasses.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/UnicodeClasses.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/UnicodeClasses.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/WindowsRuntime/Windows/UI/ViewManagement/InputPane.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/WindowsRuntime/Windows/UI/ViewManagement/InputPane.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/WindowsRuntime/Windows/UI/ViewManagement/InputPane.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/WindowsRuntime/Windows/UI/ViewManagement/InputPane.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/WindowsRuntime/Windows/UI/ViewManagement/InputPaneRcw.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/WindowsRuntime/Windows/UI/ViewManagement/InputPaneRcw.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/WindowsRuntime/Windows/UI/ViewManagement/InputPaneRcw.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/WindowsRuntime/Windows/UI/ViewManagement/InputPaneRcw.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/WpfWebRequestHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/WpfWebRequestHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/WpfWebRequestHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/MS/internal/WpfWebRequestHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/PresentationCoreCSharp.csproj
similarity index 98%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/PresentationCoreCSharp.csproj
index c01546b7fe3..f0dc0773c06 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/PresentationCoreCSharp.csproj
@@ -1,6 +1,10 @@
 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <PropertyGroup>
+    <OutputType>Module</OutputType>
+    <ModuleAssemblyName>PresentationCore</ModuleAssemblyName>
+    <TargetExt>.netmodule</TargetExt>
+    <SignAssembly>false</SignAssembly>
     <DefineConstants>$(DefineConstants);CORE_NATIVEMETHODS;PRESENTATION_CORE;COMMONDPS</DefineConstants>
     <NoWarn>$(NoWarn);0618;0436;1058;1705;3001;3002;3003;3009;3024</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -9,7 +13,10 @@
     <GenerateResourcesSRNamespace>MS.Internal.PresentationCore</GenerateResourcesSRNamespace>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     <Platforms>AnyCPU;x64</Platforms>
-    <InjectModuleInitializer>true</InjectModuleInitializer>
+    <!-- Must always build this as AnyCPU to avoid LNK1302 in the merge project one level above. -->
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <!-- We don't need assembly info here as the output from this project will just be merged into PresentationCore. -->
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   
   <PropertyGroup>
@@ -102,7 +109,6 @@
     <Compile Include="$(WpfSharedDir)\Telemetry\Managed\TelemetryEventSource.cs" />
     <Compile Include="$(WpfSharedDir)\Telemetry\Managed\TraceLoggingProvider.cs" />
     <Compile Include="$(WpfSharedDir)\Telemetry\Managed\TraceLoggers\XpsOMPrintingTraceLogger.cs" />
-    <Compile Include="ModuleInitializer.cs" />
     <Compile Include="otherassemblyattrs.cs" />
     <Compile Include="SR.cs" />
     <Compile Include="MS\Internal\AnimatedTypeHelpers.cs" />
@@ -1413,66 +1419,27 @@
   <ItemGroup>
     <!-- required for internals access -->
     <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)DirectWriteForwarder\DirectWriteForwarder.vcxproj">
+    <ProjectReference Include="..\DirectWriteForwarder\DirectWriteForwarder.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
       <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>AddModules</OutputItemType>
+      <!-- the VC targets assume a project is either a managed assembly or static lib, but we treat this as both.
+           To make that work run GetTargetPath explicitly since Build won't return it  -->
+      <Targets>Build;GetTargetPath</Targets>
     </ProjectReference>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
     <ProjectReference Include="$(WpfSourceDir)System.Windows.Input.Manipulations\System.Windows.Input.Manipulations.csproj" />
     <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\UIAutomationTypes.csproj" />
     <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\ref\PresentationCore-ref.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-
-  <!-- 
-    Need Microsoft.WinFx.targets to embed *.compositefont 
-    files using MainResourcesGeneration target
-  -->
-  <PropertyGroup>
-    <InternalMarkupCompilation>true</InternalMarkupCompilation>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Resource Include="Fonts\*.CompositeFont">
-      <GenerateSource>false</GenerateSource>
-      <XlfSource>false</XlfSource>
-    </Resource>
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="$(WpfSourceDir)PresentationCore\Resources\Strings.resx" />
-    <EmbeddedResource Include="$(WpfSourceDir)PresentationCore\System\Windows\Media\Resources\ColorProfiles\ColorProfiles.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <GenerateSource>false</GenerateSource>
-      <XlfInput>false</XlfInput>
-      <ManifestResourceName>ColorProfiles</ManifestResourceName>
-    </EmbeddedResource>
-    
-    <!-- 
-        Workaround for https://github.com/dotnet/wpf/issues/1385
-        ReadyToRun images of WPF applications crash 
-        
-        When producing ReadyToRun images, the ILLinker is configured to skip 
-        C++/CLI images. See https://github.com/mono/linker/issues/651 and 
-        https://github.com/mono/linker/pull/658. 
-        
-        In turn, this results in the failure of the dependencies of such assemblies from being
-        identified and included in the ReadyToRun images. 
-        
-        This linker hint exists to ensure that such dependencies are included. We need
-        to place these hints in an assembly that has a reference to the corresponding
-        C++/CLI assembly. 
-        
-             PresentationCore -> DirectWriteFowarder
-             ReachFramework -> System.Printing
-    -->    
-    <EmbeddedResource Condition="Exists('ILLinkTrim.xml')" Include="ILLinkTrim.xml">
-      <XlfInput>false</XlfInput>
-      <LogicalName>$(AssemblyName).xml</LogicalName>
+    <!-- Needs to be included here in order to generate SRID. -->
+    <EmbeddedResource Include="$(WpfSourceDir)PresentationCore\Resources\Strings.resx">
+      <ManifestResourceName>FxResources.PresentationCore.SR</ManifestResourceName>
     </EmbeddedResource>
   </ItemGroup>
-
+  
   <!-- Including the Microsoft.TextTemplating.targets requires us to manually import Sdk.Targets because
        it needs to be imported after Sdk.targets. This causes the BuildDependsOn variable,
        which is modified by the T4 targets, to be overwritten, so the TransformAll target 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/SR.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/SR.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/SR.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/SR.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/AppContextDefaultValues.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/AppContextDefaultValues.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/AppContextDefaultValues.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/AppContextDefaultValues.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/IO/Packaging/PackWebRequest.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/IO/Packaging/PackWebRequest.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/IO/Packaging/PackWebRequest.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/IO/Packaging/PackWebRequest.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/IO/Packaging/PackWebRequestFactory.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/IO/Packaging/PackWebRequestFactory.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/IO/Packaging/PackWebRequestFactory.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/IO/Packaging/PackWebRequestFactory.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/IO/Packaging/PackWebResponse.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/IO/Packaging/PackWebResponse.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/IO/Packaging/PackWebResponse.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/IO/Packaging/PackWebResponse.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/IO/Packaging/PackageStore.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/IO/Packaging/PackageStore.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/IO/Packaging/PackageStore.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/IO/Packaging/PackageStore.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/AutoResizedEvent.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/AutoResizedEvent.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/AutoResizedEvent.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/AutoResizedEvent.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/AutomationLiveSetting.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/AutomationLiveSetting.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/AutomationLiveSetting.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/AutomationLiveSetting.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/AutomationProperties.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/AutomationProperties.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/AutomationProperties.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/AutomationProperties.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/IsOffscreenBehavior.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/IsOffscreenBehavior.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/IsOffscreenBehavior.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/IsOffscreenBehavior.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/AutomationPeer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/Peers/AutomationPeer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/AutomationPeer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/Peers/AutomationPeer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/ContentElementAutomationPeer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/Peers/ContentElementAutomationPeer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/ContentElementAutomationPeer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/Peers/ContentElementAutomationPeer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/GenericRootAutomationPeer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/Peers/GenericRootAutomationPeer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/GenericRootAutomationPeer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/Peers/GenericRootAutomationPeer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/UIElement3DAutomationPeer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/Peers/UIElement3DAutomationPeer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/UIElement3DAutomationPeer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/Peers/UIElement3DAutomationPeer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/UIElementAutomationPeer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/Peers/UIElementAutomationPeer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/UIElementAutomationPeer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Automation/Peers/UIElementAutomationPeer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/ClassHandlersStore.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/ClassHandlersStore.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/ClassHandlersStore.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/ClassHandlersStore.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/ContentElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/ContentElement.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/ContentElement.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/ContentElement.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/ContentOperations.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/ContentOperations.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/ContentOperations.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/ContentOperations.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/CoreCompatibilityPreferences.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/CoreCompatibilityPreferences.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/CoreCompatibilityPreferences.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/CoreCompatibilityPreferences.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/CultureInfoConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/CultureInfoConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/CultureInfoConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/CultureInfoConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DataFormat.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DataFormat.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DataFormat.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DataFormat.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DataFormats.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DataFormats.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DataFormats.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DataFormats.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DataObjectCopyingEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DataObjectCopyingEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DataObjectCopyingEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DataObjectCopyingEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DataObjectEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DataObjectEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DataObjectEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DataObjectEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DataObjectPastingEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DataObjectPastingEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DataObjectPastingEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DataObjectPastingEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DataObjectSettingDataEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DataObjectSettingDataEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DataObjectSettingDataEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DataObjectSettingDataEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Diagnostics/VisualDiagnostics.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Diagnostics/VisualDiagnostics.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Diagnostics/VisualDiagnostics.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Diagnostics/VisualDiagnostics.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Diagnostics/VisualTreeChangeEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Diagnostics/VisualTreeChangeEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Diagnostics/VisualTreeChangeEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Diagnostics/VisualTreeChangeEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Diagnostics/XamlSourceInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Diagnostics/XamlSourceInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Diagnostics/XamlSourceInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Diagnostics/XamlSourceInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Diagnostics/XamlSourceInfoHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Diagnostics/XamlSourceInfoHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Diagnostics/XamlSourceInfoHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Diagnostics/XamlSourceInfoHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/ContentPosition.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/ContentPosition.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/ContentPosition.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/ContentPosition.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/DocumentPage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/DocumentPage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/DocumentPage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/DocumentPage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/DocumentPaginator.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/DocumentPaginator.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/DocumentPaginator.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/DocumentPaginator.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/DynamicDocumentPaginator.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/DynamicDocumentPaginator.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/DynamicDocumentPaginator.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/DynamicDocumentPaginator.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/GetPageCompletedEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/GetPageCompletedEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/GetPageCompletedEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/GetPageCompletedEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/GetPageNumberCompletedEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/GetPageNumberCompletedEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/GetPageNumberCompletedEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/GetPageNumberCompletedEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/IDocumentPaginatorSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/IDocumentPaginatorSource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/IDocumentPaginatorSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/IDocumentPaginatorSource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/PagesChangedEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/PagesChangedEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/PagesChangedEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/PagesChangedEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/PaginationProgressEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/PaginationProgressEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Documents/PaginationProgressEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Documents/PaginationProgressEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DpiChangedEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DpiChangedEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DpiChangedEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DpiChangedEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DpiScale.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DpiScale.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DpiScale.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DpiScale.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DragAction.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DragAction.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DragAction.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DragAction.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DragDrop.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DragDrop.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DragDrop.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DragDrop.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DragDropEffects.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DragDropEffects.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DragDropEffects.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DragDropEffects.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DragDropKeyStates.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DragDropKeyStates.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DragDropKeyStates.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DragDropKeyStates.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DragEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DragEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DragEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DragEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DragEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DragEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DragEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DragEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Duration.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Duration.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Duration.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Duration.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DurationConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DurationConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/DurationConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/DurationConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/EventHandlersStore.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/EventHandlersStore.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/EventHandlersStore.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/EventHandlersStore.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/EventManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/EventManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/EventManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/EventManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/EventPrivateKey.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/EventPrivateKey.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/EventPrivateKey.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/EventPrivateKey.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/EventRoute.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/EventRoute.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/EventRoute.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/EventRoute.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/EventRouteFactory.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/EventRouteFactory.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/EventRouteFactory.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/EventRouteFactory.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FocusWithinProperty.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FocusWithinProperty.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FocusWithinProperty.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FocusWithinProperty.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontStretch.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontStretch.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontStretch.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontStretch.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontStretchConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontStretchConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontStretchConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontStretchConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontStretches.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontStretches.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontStretches.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontStretches.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontStyle.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontStyle.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontStyle.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontStyle.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontStyleConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontStyleConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontStyleConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontStyleConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontStyles.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontStyles.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontStyles.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontStyles.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontWeight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontWeight.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontWeight.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontWeight.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontWeightConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontWeightConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontWeightConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontWeightConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontWeights.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontWeights.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FontWeights.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FontWeights.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FreezableCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FreezableCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/FreezableCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/FreezableCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/ContentElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/ContentElement.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/ContentElement.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/ContentElement.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecoration.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/TextDecoration.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecoration.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/TextDecoration.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/TextDecorationCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/TextDecorationCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationLocation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/TextDecorationLocation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationLocation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/TextDecorationLocation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationUnit.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/TextDecorationUnit.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/TextDecorationUnit.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/TextDecorationUnit.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/UIElement.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/UIElement.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/UIElement3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Generated/UIElement3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Generated/UIElement3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/GiveFeedbackEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/GiveFeedbackEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/GiveFeedbackEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/GiveFeedbackEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/GiveFeedbackEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/GiveFeedbackEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/GiveFeedbackEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/GiveFeedbackEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/GlobalEventManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/GlobalEventManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/GlobalEventManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/GlobalEventManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/IContentHost.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/IContentHost.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/IContentHost.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/IContentHost.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/IDataObject.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/IDataObject.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/IDataObject.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/IDataObject.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/IInputElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/IInputElement.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/IInputElement.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/IInputElement.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/ApplicationGesture.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/ApplicationGesture.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/ApplicationGesture.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/ApplicationGesture.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/DrawingAttributes.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/DrawingAttributes.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/DrawingAttributes.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/DrawingAttributes.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/Events.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/Events.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/Events.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/Events.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/GestureRecognitionResult.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/GestureRecognitionResult.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/GestureRecognitionResult.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/GestureRecognitionResult.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/GestureRecognizer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/GestureRecognizer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/GestureRecognizer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/GestureRecognizer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/IncrementalHitTester.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/IncrementalHitTester.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/IncrementalHitTester.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/IncrementalHitTester.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/RecognitionConfidence.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/RecognitionConfidence.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/RecognitionConfidence.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/RecognitionConfidence.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/Stroke.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/Stroke.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/Stroke.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/Stroke.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/Stroke2.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/Stroke2.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/Stroke2.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/Stroke2.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/StrokeCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/StrokeCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/StrokeCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/StrokeCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/StrokeCollection2.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/StrokeCollection2.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/StrokeCollection2.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/StrokeCollection2.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/StrokeCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/StrokeCollectionConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/StrokeCollectionConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/StrokeCollectionConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/StylusTip.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/StylusTip.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Ink/StylusTip.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Ink/StylusTip.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/AccessKeyManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/AccessKeyManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/AccessKeyManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/AccessKeyManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/AngleUtil.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/AngleUtil.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/AngleUtil.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/AngleUtil.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/CaptureMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/CaptureMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/CaptureMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/CaptureMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ApplicationCommands.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/ApplicationCommands.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ApplicationCommands.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/ApplicationCommands.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CanExecuteChangedEventManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/CanExecuteChangedEventManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CanExecuteChangedEventManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/CanExecuteChangedEventManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CanExecuteRoutedEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/CanExecuteRoutedEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CanExecuteRoutedEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/CanExecuteRoutedEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CommandBinding.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/CommandBinding.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CommandBinding.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/CommandBinding.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CommandBindingCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/CommandBindingCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CommandBindingCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/CommandBindingCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CommandDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/CommandDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CommandDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/CommandDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CommandManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/CommandManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/CommandManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/CommandManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ComponentCommands.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/ComponentCommands.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ComponentCommands.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/ComponentCommands.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ExecutedRoutedEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/ExecutedRoutedEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ExecutedRoutedEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/ExecutedRoutedEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ICommandSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/ICommandSource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ICommandSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/ICommandSource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ISecureCommand.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/ISecureCommand.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/ISecureCommand.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/ISecureCommand.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/InputBinding.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/InputBinding.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/InputBinding.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/InputBinding.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/InputBindingCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/InputBindingCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/InputBindingCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/InputBindingCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/InputGesture.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/InputGesture.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/InputGesture.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/InputGesture.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/InputGestureCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/InputGestureCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/InputGestureCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/InputGestureCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/KeyBinding.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/KeyBinding.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/KeyBinding.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/KeyBinding.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/KeyGesture.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/KeyGesture.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/KeyGesture.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/KeyGesture.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/KeyGestureConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/KeyGestureConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/KeyGestureConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/KeyGestureConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/KeyGestureValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/KeyGestureValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/KeyGestureValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/KeyGestureValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MediaCommands.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MediaCommands.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MediaCommands.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MediaCommands.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseAction.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseAction.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseAction.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseAction.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseActionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseActionConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseActionConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseActionConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseActionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseActionValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseActionValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseActionValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseBinding.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseBinding.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseBinding.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseBinding.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseGesture.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseGesture.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseGesture.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseGesture.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseGestureConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseGestureConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseGestureConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseGestureConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseGestureValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseGestureValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseGestureValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/MouseGestureValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/NavigationCommands.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/NavigationCommands.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/NavigationCommands.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/NavigationCommands.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/RoutedCommand.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedCommand.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/RoutedCommand.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedUICommand.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/RoutedUICommand.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/RoutedUICommand.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/RoutedUICommand.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/SecureUICommand.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/SecureUICommand.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/SecureUICommand.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Command/SecureUICommand.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Cursor.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Cursor.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Cursor.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Cursor.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/CursorConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/CursorConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/CursorConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/CursorConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/CursorType.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/CursorType.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/CursorType.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/CursorType.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Cursors.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Cursors.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Cursors.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Cursors.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/DeadCharTextComposition.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/DeadCharTextComposition.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/DeadCharTextComposition.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/DeadCharTextComposition.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/DefaultTextStore.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/DefaultTextStore.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/DefaultTextStore.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/DefaultTextStore.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/DefaultTextStoreTextComposition.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/DefaultTextStoreTextComposition.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/DefaultTextStoreTextComposition.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/DefaultTextStoreTextComposition.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/FocusChangedEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/FocusChangedEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/FocusChangedEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/FocusChangedEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/FocusChangedEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/FocusChangedEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/FocusChangedEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/FocusChangedEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/FocusManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/FocusManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/FocusManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/FocusManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/IAvalonAdapter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/IAvalonAdapter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/IAvalonAdapter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/IAvalonAdapter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/IInputLanguageSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/IInputLanguageSource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/IInputLanguageSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/IInputLanguageSource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/IInputProvider.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/IInputProvider.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/IInputProvider.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/IInputProvider.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/IKeyboardInputProvider.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/IKeyboardInputProvider.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/IKeyboardInputProvider.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/IKeyboardInputProvider.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/IManipulator.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/IManipulator.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/IManipulator.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/IManipulator.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/IMouseInputProvider.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/IMouseInputProvider.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/IMouseInputProvider.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/IMouseInputProvider.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InertiaExpansionBehavior.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InertiaExpansionBehavior.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InertiaExpansionBehavior.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InertiaExpansionBehavior.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InertiaRotationBehavior.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InertiaRotationBehavior.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InertiaRotationBehavior.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InertiaRotationBehavior.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InertiaTranslationBehavior.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InertiaTranslationBehavior.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InertiaTranslationBehavior.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InertiaTranslationBehavior.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputElement.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputElement.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputElement.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputLanguageEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputLanguageEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputLanguageEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputLanguageEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputLanguageManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputLanguageManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputLanguageManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputLanguageManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputLanguageProfileNotifySink.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputLanguageProfileNotifySink.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputLanguageProfileNotifySink.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputLanguageProfileNotifySink.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputLanguageSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputLanguageSource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputLanguageSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputLanguageSource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputMethod.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputMethod.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputMethod.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputMethod.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputMethodStateChangeEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputMethodStateChangeEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputMethodStateChangeEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputMethodStateChangeEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputMethodStateTypeInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputMethodStateTypeInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputMethodStateTypeInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputMethodStateTypeInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputProcessorProfiles.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputProcessorProfiles.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputProcessorProfiles.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputProcessorProfiles.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputProcessorProfilesLoader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputProcessorProfilesLoader.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputProcessorProfilesLoader.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputProcessorProfilesLoader.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputProviderSite.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputProviderSite.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputProviderSite.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputProviderSite.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputReport.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputReport.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputReport.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputReport.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputReportEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputReportEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputReportEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputReportEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputReportEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputReportEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputReportEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputReportEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputScope.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputScope.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputScope.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputScope.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputScopeConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputScopeConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputScopeConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputScopeConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputScopeNameConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputScopeNameConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputScopeNameConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputScopeNameConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputScopeNameValue.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputScopeNameValue.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputScopeNameValue.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputScopeNameValue.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputType.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputType.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputType.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/InputType.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyStates.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyStates.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyStates.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyStates.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Keyboard.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Keyboard.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Keyboard.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Keyboard.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyboardDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyboardDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyboardEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyboardEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyboardEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyboardEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardInputProviderAcquireFocusEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyboardInputProviderAcquireFocusEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardInputProviderAcquireFocusEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyboardInputProviderAcquireFocusEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardInputProviderAcquireFocusEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyboardInputProviderAcquireFocusEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/KeyboardInputProviderAcquireFocusEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/KeyboardInputProviderAcquireFocusEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Manipulation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Manipulation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Manipulation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Manipulation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationBoundaryFeedbackEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationBoundaryFeedbackEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationBoundaryFeedbackEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationBoundaryFeedbackEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationCompletedEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationCompletedEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationCompletedEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationCompletedEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationDelta.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationDelta.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationDelta.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationDelta.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationDeltaEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationDeltaEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationDeltaEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationDeltaEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationInertiaStartingEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationInertiaStartingEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationInertiaStartingEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationInertiaStartingEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationLogic.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationLogic.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationLogic.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationModes.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationModes.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationModes.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationModes.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationPivot.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationPivot.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationPivot.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationPivot.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationStartedEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationStartedEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationStartedEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationStartedEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationStartingEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationStartingEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationStartingEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationStartingEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationVelocities.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationVelocities.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ManipulationVelocities.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ManipulationVelocities.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Mouse.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Mouse.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Mouse.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Mouse.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseButton.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseButton.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseButton.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseButton.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseButtonEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseButtonEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseButtonEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseButtonEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseButtonEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseButtonEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseButtonEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseButtonEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseButtonState.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseButtonState.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseButtonState.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseButtonState.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseWheelEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseWheelEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseWheelEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseWheelEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseWheelEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseWheelEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/MouseWheelEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/MouseWheelEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/NotifyInputEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/NotifyInputEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/NotifyInputEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/NotifyInputEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/PreProcessInputEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/PreProcessInputEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/PreProcessInputEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/PreProcessInputEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ProcessInputEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ProcessInputEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/ProcessInputEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/ProcessInputEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/QueryCursorEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/QueryCursorEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/QueryCursorEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/QueryCursorEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/QueryCursorEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/QueryCursorEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/QueryCursorEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/QueryCursorEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawAppCommandInputReport.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawAppCommandInputReport.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawAppCommandInputReport.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawAppCommandInputReport.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawKeyboardActions.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawKeyboardActions.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawKeyboardActions.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawKeyboardActions.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawKeyboardInputReport.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawKeyboardInputReport.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawKeyboardInputReport.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawKeyboardInputReport.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawMouseActions.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawMouseActions.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawMouseActions.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawMouseActions.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawMouseInputReport.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawMouseInputReport.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawMouseInputReport.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawMouseInputReport.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawTextInputReport.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawTextInputReport.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawTextInputReport.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawTextInputReport.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawUIStateActions.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawUIStateActions.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawUIStateActions.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawUIStateActions.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawUIStateInputReport.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawUIStateInputReport.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawUIStateInputReport.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawUIStateInputReport.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawUIStateTargets.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawUIStateTargets.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RawUIStateTargets.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RawUIStateTargets.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RestoreFocusMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RestoreFocusMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/RestoreFocusMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/RestoreFocusMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/StagingAreaInputItem.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/StagingAreaInputItem.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/StagingAreaInputItem.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/StagingAreaInputItem.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Biblio.txt b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Biblio.txt
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Biblio.txt
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Biblio.txt
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/DynamicRenderer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/DynamicRenderer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/DynamicRenderer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/DynamicRenderer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/DynamicRendererThreadManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/DynamicRendererThreadManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/DynamicRendererThreadManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/DynamicRendererThreadManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/MultiTouchSystemGestureLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/MultiTouchSystemGestureLogic.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/MultiTouchSystemGestureLogic.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/MultiTouchSystemGestureLogic.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/RawStylusActions.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/RawStylusActions.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/RawStylusActions.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/RawStylusActions.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/RawStylusInput.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/RawStylusInput.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/RawStylusInput.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/RawStylusInput.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/RawStylusInputCustomData.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/RawStylusInputCustomData.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/RawStylusInputCustomData.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/RawStylusInputCustomData.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/RawStylusInputCustomDataList.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/RawStylusInputCustomDataList.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/RawStylusInputCustomDataList.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/RawStylusInputCustomDataList.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/RawStylusInputReport.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/RawStylusInputReport.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/RawStylusInputReport.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/RawStylusInputReport.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/RawStylusSystemGestureInputReport.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/RawStylusSystemGestureInputReport.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/RawStylusSystemGestureInputReport.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/RawStylusSystemGestureInputReport.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/Stylus.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/Stylus.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/Stylus.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/Stylus.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusButton.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusButton.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusButton.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusButton.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusButtonCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusButtonCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusButtonCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusButtonCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusButtonEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusButtonEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusButtonEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusButtonEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusButtonEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusButtonEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusButtonEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusButtonEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusButtonState.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusButtonState.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusButtonState.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusButtonState.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusDeviceBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusDeviceBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusDeviceBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusDeviceBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusDeviceCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusDeviceCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusDeviceCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusDeviceCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusDeviceInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusDeviceInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusDeviceInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusDeviceInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusDownEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusDownEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusDownEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusDownEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusDownEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusDownEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusDownEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusDownEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusLogic.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusLogic.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusLogic.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPlugInCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPlugInCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPlugInCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPlugInCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPlugInCollectionBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPlugInCollectionBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPlugInCollectionBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPlugInCollectionBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPlugin.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPlugin.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPlugin.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPlugin.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPoint.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPoint.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPoint.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPoint.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointDescription.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointDescription.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointDescription.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointDescription.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointProperties.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointProperties.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointProperties.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointProperties.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointProperty.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointProperty.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointProperty.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointProperty.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointPropertyId.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointPropertyId.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointPropertyId.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointPropertyId.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointPropertyInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointPropertyInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointPropertyInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointPropertyInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointPropertyInfoDefaults.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointPropertyInfoDefaults.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointPropertyInfoDefaults.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointPropertyInfoDefaults.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointPropertyUnit.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointPropertyUnit.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusPointPropertyUnit.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusPointPropertyUnit.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusSystemGesture.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusSystemGesture.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusSystemGesture.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusSystemGesture.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusSystemGestureEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusSystemGestureEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusSystemGestureEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusSystemGestureEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusSystemGestureEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusSystemGestureEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusSystemGestureEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusSystemGestureEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusTouchDeviceBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusTouchDeviceBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusTouchDeviceBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusTouchDeviceBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusTraceLogger.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusTraceLogger.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/StylusTraceLogger.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/StylusTraceLogger.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/Tablet.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/Tablet.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/Tablet.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/Tablet.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/TabletDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/TabletDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/TabletDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/TabletDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/TabletDeviceBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/TabletDeviceBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/TabletDeviceBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/TabletDeviceBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/TabletDeviceCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/TabletDeviceCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/TabletDeviceCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/TabletDeviceCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/TabletDeviceInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/TabletDeviceInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/TabletDeviceInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/TabletDeviceInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/TabletDeviceType.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/TabletDeviceType.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/TabletDeviceType.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/TabletDeviceType.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/TabletHardwareCapabilities.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/TabletHardwareCapabilities.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Common/TabletHardwareCapabilities.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Common/TabletHardwareCapabilities.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerData.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerData.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerData.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerData.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerFlickEngine.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerFlickEngine.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerFlickEngine.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerFlickEngine.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerInteractionEngine.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerInteractionEngine.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerInteractionEngine.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerInteractionEngine.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerLogic.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerLogic.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerLogic.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerStylusDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerStylusDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerStylusDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerStylusDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerStylusPlugInCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerStylusPlugInCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerStylusPlugInCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerStylusPlugInCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerStylusPlugInManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerStylusPlugInManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerStylusPlugInManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerStylusPlugInManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerStylusPointPropertyInfoHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerStylusPointPropertyInfoHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerStylusPointPropertyInfoHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerStylusPointPropertyInfoHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerTabletDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerTabletDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerTabletDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerTabletDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerTabletDeviceCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerTabletDeviceCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerTabletDeviceCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerTabletDeviceCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerTabletDeviceInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerTabletDeviceInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerTabletDeviceInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerTabletDeviceInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerTouchDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerTouchDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Pointer/PointerTouchDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Pointer/PointerTouchDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenContextInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenContextInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenContextInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenContextInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenContexts.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenContexts.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenContexts.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenContexts.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenImcRcw.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenImcRcw.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenImcRcw.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenImcRcw.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenThread.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenThread.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenThread.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenThread.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenThreadPool.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenThreadPool.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenThreadPool.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenThreadPool.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenThreadWorker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenThreadWorker.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/PenThreadWorker.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/PenThreadWorker.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/WispLogic.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispLogic.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/WispLogic.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/WispStylusDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/WispStylusDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusPlugInCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/WispStylusPlugInCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusPlugInCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/WispStylusPlugInCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusTouchDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/WispStylusTouchDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispStylusTouchDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/WispStylusTouchDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispTabletDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/WispTabletDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispTabletDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/WispTabletDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispTabletDeviceCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/WispTabletDeviceCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispTabletDeviceCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Stylus/Wisp/WispTabletDeviceCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextComposition.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextComposition.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextComposition.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextComposition.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextCompositionEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextCompositionEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextCompositionEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextCompositionEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextCompositionEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextCompositionEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextCompositionEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextCompositionEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextCompositionManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextCompositionManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextCompositionManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextCompositionManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextServicesCompartment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextServicesCompartment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextServicesCompartment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextServicesCompartment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextServicesCompartmentContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextServicesCompartmentContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextServicesCompartmentContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextServicesCompartmentContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextServicesCompartmentEventSink.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextServicesCompartmentEventSink.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextServicesCompartmentEventSink.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextServicesCompartmentEventSink.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextServicesContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextServicesContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextServicesContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextServicesContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextServicesManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextServicesManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TextServicesManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TextServicesManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Touch.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Touch.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Touch.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Touch.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchAction.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchAction.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchAction.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchAction.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchFrameEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchFrameEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchFrameEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchFrameEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchFrameEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchFrameEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchFrameEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchFrameEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchPoint.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchPoint.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchPoint.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchPoint.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchPointCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchPointCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchPointCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchPointCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchesCapturedWithinProperty.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchesCapturedWithinProperty.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchesCapturedWithinProperty.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchesCapturedWithinProperty.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchesOverProperty.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchesOverProperty.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/TouchesOverProperty.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/TouchesOverProperty.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Win32KeyboardDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Win32KeyboardDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Win32KeyboardDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Win32KeyboardDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Win32MouseDevice.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Win32MouseDevice.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Win32MouseDevice.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Input/Win32MouseDevice.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/CursorInteropHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/CursorInteropHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/CursorInteropHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/CursorInteropHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/D3DImage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/D3DImage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/D3DImage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/D3DImage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndAppCommandInputProvider.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndAppCommandInputProvider.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndAppCommandInputProvider.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndAppCommandInputProvider.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndKeyboardInputProvider.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndKeyboardInputProvider.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndKeyboardInputProvider.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndKeyboardInputProvider.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndMouseInputProvider.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndMouseInputProvider.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndMouseInputProvider.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndMouseInputProvider.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndPanningFeedback.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndPanningFeedback.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndPanningFeedback.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndPanningFeedback.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndPointerInputProvider.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndPointerInputProvider.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndPointerInputProvider.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndPointerInputProvider.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndSource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndSource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndSourceHook.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndSourceHook.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndSourceHook.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndSourceHook.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndSourceKeyboardInputSite.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndSourceKeyboardInputSite.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndSourceKeyboardInputSite.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndSourceKeyboardInputSite.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndSourceParameters.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndSourceParameters.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndSourceParameters.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndSourceParameters.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndStylusInputProvider.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndStylusInputProvider.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndStylusInputProvider.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndStylusInputProvider.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndTarget.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndTarget.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndTarget.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/HwndTarget.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/IStylusInputProvider.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/IStylusInputProvider.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/IStylusInputProvider.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/IStylusInputProvider.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/IWin32Window.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/IWin32Window.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/IWin32Window.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/IWin32Window.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/Imaging.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/Imaging.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/Imaging.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/Imaging.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/OperatingSystemVersionCheck.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/OperatingSystemVersionCheck.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/OperatingSystemVersionCheck.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/InterOp/OperatingSystemVersionCheck.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/LayoutManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/LayoutManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/LayoutManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/LayoutManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/LocalizabilityAttribute.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/LocalizabilityAttribute.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/LocalizabilityAttribute.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/LocalizabilityAttribute.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/LocalizationCategory.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/LocalizationCategory.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/LocalizationCategory.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/LocalizationCategory.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Markup/IAddChild.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Markup/IAddChild.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Markup/IAddChild.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Markup/IAddChild.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Markup/IProvidePropertyFallback.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Markup/IProvidePropertyFallback.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Markup/IProvidePropertyFallback.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Markup/IProvidePropertyFallback.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Markup/XamlSerializerUtil.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Markup/XamlSerializerUtil.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Markup/XamlSerializerUtil.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Markup/XamlSerializerUtil.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Markup/XmlLanguage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Markup/XmlLanguage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Markup/XmlLanguage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Markup/XmlLanguage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Markup/XmlLanguageConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Markup/XmlLanguageConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Markup/XmlLanguageConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Markup/XmlLanguageConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/MeasureData.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/MeasureData.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/MeasureData.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/MeasureData.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/AncestorChangedEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/AncestorChangedEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/AncestorChangedEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/AncestorChangedEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Animatable.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Animatable.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Animatable.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Animatable.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationClock.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationClock.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationClock.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationClock.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationClockResource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationClockResource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationClockResource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationClockResource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationException.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationException.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationException.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationException.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationLayer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationLayer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationLayer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationLayer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationStorage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationStorage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationStorage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationTimeline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationTimeline.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationTimeline.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationTimeline.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationType.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationType.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/AnimationType.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/AnimationType.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/BackEase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/BackEase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/BackEase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/BackEase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/BounceEase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/BounceEase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/BounceEase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/BounceEase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/CircleEase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/CircleEase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/CircleEase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/CircleEase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Clock.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Clock.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Clock.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Clock.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ClockController.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ClockController.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ClockController.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ClockController.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ClockGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ClockGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ClockGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ClockGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ClockState.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ClockState.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ClockState.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ClockState.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/CubicEase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/CubicEase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/CubicEase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/CubicEase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/DoubleAnimationUsingPath.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/DoubleAnimationUsingPath.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/DoubleAnimationUsingPath.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/DoubleAnimationUsingPath.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/EasingFunctionBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/EasingFunctionBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/EasingFunctionBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/EasingFunctionBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/EasingMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/EasingMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/EasingMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/EasingMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/EasingQuaternionKeyFrame.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/EasingQuaternionKeyFrame.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/EasingQuaternionKeyFrame.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/EasingQuaternionKeyFrame.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ElasticEase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ElasticEase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ElasticEase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ElasticEase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Enums.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Enums.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Enums.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Enums.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ExponentialEase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ExponentialEase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ExponentialEase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ExponentialEase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/FillBehavior.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/FillBehavior.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/FillBehavior.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/FillBehavior.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Animatable.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Animatable.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Animatable.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Animatable.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/BooleanAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/BooleanAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/BooleanAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/BooleanAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/BooleanKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/BooleanKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/BooleanKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ByteAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ByteAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ByteAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ByteAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ByteAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ByteAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ByteKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ByteKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ByteKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/CharAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/CharAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/CharAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/CharAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/CharKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/CharKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/CharKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ColorAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ColorAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ColorAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ColorAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ColorAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ColorAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ColorIndependentAnimationStorage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorIndependentAnimationStorage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ColorIndependentAnimationStorage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ColorKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ColorKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ColorKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DecimalAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DecimalAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DecimalAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DecimalAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DecimalAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DecimalAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DecimalKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DecimalKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DecimalKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DiscreteKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DiscreteKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DiscreteKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DiscreteKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DoubleAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DoubleAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DoubleAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DoubleAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationClockResource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DoubleAnimationClockResource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationClockResource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DoubleAnimationClockResource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DoubleAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DoubleAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DoubleIndependentAnimationStorage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleIndependentAnimationStorage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DoubleIndependentAnimationStorage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DoubleKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/DoubleKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/DoubleKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/EasingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/EasingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/EasingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/EasingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16Animation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int16Animation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16Animation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int16Animation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16AnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int16AnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16AnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int16AnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16AnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int16AnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16AnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int16AnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16KeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int16KeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int16KeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int16KeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32Animation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int32Animation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32Animation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int32Animation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32AnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int32AnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32AnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int32AnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32AnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int32AnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32AnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int32AnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32KeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int32KeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int32KeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int32KeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64Animation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int64Animation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64Animation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int64Animation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64AnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int64AnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64AnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int64AnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64AnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int64AnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64AnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int64AnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64KeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int64KeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Int64KeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Int64KeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/KeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/KeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/KeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/KeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/LinearKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/LinearKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/LinearKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/LinearKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/MatrixAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/MatrixAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/MatrixAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/MatrixAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/MatrixIndependentAnimationStorage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixIndependentAnimationStorage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/MatrixIndependentAnimationStorage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/MatrixKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/MatrixKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/MatrixKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ObjectAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ObjectAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ObjectAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ObjectAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ObjectKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ObjectKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ObjectKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ParallelTimeline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ParallelTimeline.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/ParallelTimeline.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/ParallelTimeline.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Point3DAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Point3DAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Point3DAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Point3DAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Point3DAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Point3DAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Point3DIndependentAnimationStorage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DIndependentAnimationStorage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Point3DIndependentAnimationStorage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Point3DKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Point3DKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Point3DKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/PointAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/PointAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/PointAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/PointAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationClockResource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/PointAnimationClockResource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationClockResource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/PointAnimationClockResource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/PointAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/PointAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/PointIndependentAnimationStorage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointIndependentAnimationStorage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/PointIndependentAnimationStorage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/PointKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/PointKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/PointKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/QuaternionAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/QuaternionAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/QuaternionAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/QuaternionAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/QuaternionAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/QuaternionAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/QuaternionIndependentAnimationStorage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionIndependentAnimationStorage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/QuaternionIndependentAnimationStorage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/QuaternionKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/QuaternionKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/QuaternionKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/RectAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/RectAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/RectAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/RectAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationClockResource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/RectAnimationClockResource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationClockResource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/RectAnimationClockResource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/RectAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/RectAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/RectIndependentAnimationStorage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectIndependentAnimationStorage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/RectIndependentAnimationStorage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/RectKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/RectKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/RectKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Rotation3DAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Rotation3DAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Rotation3DAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Rotation3DAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Rotation3DAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Rotation3DAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Rotation3DKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Rotation3DKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Rotation3DKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SingleAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SingleAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SingleAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SingleAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SingleAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SingleAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SingleKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SingleKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SingleKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SizeAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SizeAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SizeAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SizeAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationClockResource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SizeAnimationClockResource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationClockResource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SizeAnimationClockResource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SizeAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SizeAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SizeIndependentAnimationStorage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeIndependentAnimationStorage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SizeIndependentAnimationStorage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SizeKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SizeKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SizeKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SplineKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SplineKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/SplineKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/SplineKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/StringAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/StringAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/StringAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/StringAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/StringKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/StringKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/StringKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Timeline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Timeline.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Timeline.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Timeline.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/TimelineCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/TimelineCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/TimelineGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/TimelineGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/TimelineGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Vector3DAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Vector3DAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Vector3DAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Vector3DAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Vector3DAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Vector3DAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DIndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Vector3DIndependentAnimationStorage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DIndependentAnimationStorage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Vector3DIndependentAnimationStorage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Vector3DKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/Vector3DKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/Vector3DKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/VectorAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/VectorAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimationBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/VectorAnimationBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimationBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/VectorAnimationBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimationUsingKeyFrames.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/VectorAnimationUsingKeyFrames.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorAnimationUsingKeyFrames.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/VectorAnimationUsingKeyFrames.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorKeyFrameCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/VectorKeyFrameCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Generated/VectorKeyFrameCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Generated/VectorKeyFrameCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/HandoffBehavior.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/HandoffBehavior.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/HandoffBehavior.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/HandoffBehavior.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IAnimatable.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IAnimatable.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IAnimatable.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IAnimatable.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IClock.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IClock.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IClock.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IClock.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IEasingFunction.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IEasingFunction.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IEasingFunction.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IEasingFunction.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IKeyFrame.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IKeyFrame.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IKeyFrame.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IKeyFrame.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IKeyFrameAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IKeyFrameAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IKeyFrameAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IKeyFrameAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IndependentAnimationStorage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IndependentAnimationStorage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IndependentAnimationStorage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IndependentAnimationStorage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IndependentlyAnimatedPropertyMetadata.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IndependentlyAnimatedPropertyMetadata.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/IndependentlyAnimatedPropertyMetadata.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/IndependentlyAnimatedPropertyMetadata.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeySpline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/KeySpline.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeySpline.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/KeySpline.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeySplineConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/KeySplineConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeySplineConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/KeySplineConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeyTime.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/KeyTime.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeyTime.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/KeyTime.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeyTimeConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/KeyTimeConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeyTimeConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/KeyTimeConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeyTimeType.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/KeyTimeType.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/KeyTimeType.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/KeyTimeType.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/LinearQuaternionKeyFrame.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/LinearQuaternionKeyFrame.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/LinearQuaternionKeyFrame.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/LinearQuaternionKeyFrame.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/MatrixAnimationUsingPath.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/MatrixAnimationUsingPath.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/MatrixAnimationUsingPath.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/MatrixAnimationUsingPath.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ParallelTimeline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ParallelTimeline.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ParallelTimeline.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ParallelTimeline.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/PathAnimationSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/PathAnimationSource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/PathAnimationSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/PathAnimationSource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/PointAnimationUsingPath.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/PointAnimationUsingPath.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/PointAnimationUsingPath.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/PointAnimationUsingPath.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/PowerEase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/PowerEase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/PowerEase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/PowerEase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/QuadraticEase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/QuadraticEase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/QuadraticEase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/QuadraticEase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/QuarticEase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/QuarticEase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/QuarticEase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/QuarticEase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/QuaternionAnimation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/QuaternionAnimation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/QuaternionAnimation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/QuaternionAnimation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/QuinticEase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/QuinticEase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/QuinticEase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/QuinticEase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/RepeatBehavior.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/RepeatBehavior.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/RepeatBehavior.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/RepeatBehavior.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/RepeatBehaviorConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/RepeatBehaviorConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/RepeatBehaviorConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/RepeatBehaviorConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ResolvedKeyFrameEntry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ResolvedKeyFrameEntry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/ResolvedKeyFrameEntry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/ResolvedKeyFrameEntry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/SineEase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/SineEase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/SineEase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/SineEase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/SlipBehavior.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/SlipBehavior.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/SlipBehavior.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/SlipBehavior.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/SplineQuaternionKeyFrame.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/SplineQuaternionKeyFrame.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/SplineQuaternionKeyFrame.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/SplineQuaternionKeyFrame.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Subtree.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Subtree.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Subtree.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Subtree.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimeEnumHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/TimeEnumHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimeEnumHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/TimeEnumHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimeIntervalCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/TimeIntervalCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimeIntervalCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/TimeIntervalCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimeManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/TimeManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimeManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/TimeManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Timeline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Timeline.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/Timeline.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/Timeline.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimelineClockCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/TimelineClockCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimelineClockCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/TimelineClockCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimelineEnumerator.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/TimelineEnumerator.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimelineEnumerator.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/TimelineEnumerator.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimelineGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/TimelineGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/TimelineGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/TimelineGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/WeakRefEnumerator.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/WeakRefEnumerator.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/WeakRefEnumerator.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Animation/WeakRefEnumerator.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ArcSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ArcSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ArcSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ArcSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/BezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/BezierSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/BezierSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/BezierSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/BitmapCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/BitmapCache.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/BitmapCache.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/BitmapCache.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/BitmapCacheBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/BitmapCacheBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/BitmapCacheBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/BitmapCacheBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/BoundsDrawingContextWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/BoundsDrawingContextWalker.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/BoundsDrawingContextWalker.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/BoundsDrawingContextWalker.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Brush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Brush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Brush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Brush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ByteStreamGeometryContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ByteStreamGeometryContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ByteStreamGeometryContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ByteStreamGeometryContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CacheMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CacheMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CacheMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CacheMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CapacityStreamGeometryContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CapacityStreamGeometryContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CapacityStreamGeometryContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CapacityStreamGeometryContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ChannelManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ChannelManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ChannelManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ChannelManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CharacterMetrics.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CharacterMetrics.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CharacterMetrics.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CharacterMetrics.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CharacterMetricsDictionary.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CharacterMetricsDictionary.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CharacterMetricsDictionary.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CharacterMetricsDictionary.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Color.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Color.cs
similarity index 99%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Color.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Color.cs
index 0e9709fd532..637ac10530c 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Color.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Color.cs
@@ -1159,13 +1159,13 @@ private void ComputeNativeValues(int numChannels)
         {
             public float a, r, g, b;
 
-            public override int GetHashCode()
-            {
-                return a.GetHashCode() ^ r.GetHashCode() ^ g.GetHashCode() ^ b.GetHashCode();
-            }
-            public override bool Equals(object obj)
-            {
-                return base.Equals(obj);
+            public override int GetHashCode()
+            {
+                return a.GetHashCode() ^ r.GetHashCode() ^ g.GetHashCode() ^ b.GetHashCode();
+            }
+            public override bool Equals(object obj)
+            {
+                return base.Equals(obj);
             }
         };
 
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ColorContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ColorContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ColorContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ColorContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ColorContextHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ColorContextHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ColorContextHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ColorContextHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ColorConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ColorConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ColorConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ColorConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ColorTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ColorTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ColorTransform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ColorTransform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ColorTransformHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ColorTransformHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ColorTransformHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ColorTransformHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CombinedGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CombinedGeometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CombinedGeometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CombinedGeometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Composition.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Composition.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Composition.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Composition.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CompositionTarget.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CompositionTarget.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CompositionTarget.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CompositionTarget.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ContainerVisual.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ContainerVisual.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ContainerVisual.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ContainerVisual.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/BrushValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/BrushValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/BrushValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/BrushValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/CacheModeValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/CacheModeValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/CacheModeValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/CacheModeValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/DoubleCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/DoubleCollectionValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/DoubleCollectionValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/DoubleCollectionValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/GeometryValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/GeometryValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/GeometryValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/GeometryValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/Int32CollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/Int32CollectionValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/Int32CollectionValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/Int32CollectionValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PathFigureCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/PathFigureCollectionValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PathFigureCollectionValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/PathFigureCollectionValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PointCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/PointCollectionValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/PointCollectionValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/PointCollectionValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/TransformValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/TransformValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/TransformValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/TransformValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/VectorCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/VectorCollectionValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Converters/Generated/VectorCollectionValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Converters/Generated/VectorCollectionValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CultureSpecificStringDictionary.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CultureSpecificStringDictionary.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/CultureSpecificStringDictionary.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/CultureSpecificStringDictionary.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DashStyle.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DashStyle.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DashStyle.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DashStyle.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DashStyles.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DashStyles.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DashStyles.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DashStyles.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Drawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Drawing.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Drawing.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Drawing.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingContextDrawingContextWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingContextDrawingContextWalker.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingContextDrawingContextWalker.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingContextDrawingContextWalker.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingContextWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingContextWalker.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingContextWalker.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingContextWalker.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingDrawingContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingDrawingContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingDrawingContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingDrawingContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingGroupDrawingContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingGroupDrawingContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingGroupDrawingContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingGroupDrawingContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingImage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingImage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingImage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingImage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingServices.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingServices.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingServices.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingServices.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingVisual.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingVisual.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingVisual.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingVisual.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingVisualDrawingContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingVisualDrawingContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingVisualDrawingContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/DrawingVisualDrawingContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BevelBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BevelBitmapEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BevelBitmapEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BevelBitmapEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BitmapEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BitmapEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BitmapEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BitmapEffectGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BitmapEffectGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BitmapEffectGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BitmapEffectGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BitmapEffectInput.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BitmapEffectInput.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BitmapEffectInput.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BitmapEffectInput.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BitmapEffectInputData.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BitmapEffectInputData.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BitmapEffectInputData.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BitmapEffectInputData.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BitmapEffectState.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BitmapEffectState.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BitmapEffectState.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BitmapEffectState.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BlurBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BlurBitmapEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BlurBitmapEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BlurBitmapEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BlurEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BlurEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/BlurEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/BlurEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/DropShadowBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/DropShadowBitmapEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/DropShadowBitmapEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/DropShadowBitmapEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/DropShadowEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/DropShadowEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/DropShadowEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/DropShadowEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Effect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Effect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Effect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Effect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BevelBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BevelBitmapEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BevelBitmapEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BevelBitmapEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BitmapEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BitmapEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BitmapEffectCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BitmapEffectCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BitmapEffectGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BitmapEffectGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectInput.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BitmapEffectInput.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BitmapEffectInput.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BitmapEffectInput.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BlurBitmapEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurBitmapEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BlurBitmapEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BlurEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/BlurEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/BlurEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/DropShadowBitmapEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowBitmapEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/DropShadowBitmapEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/DropShadowEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/DropShadowEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/DropShadowEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EdgeProfile.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/EdgeProfile.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EdgeProfile.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/EdgeProfile.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/Effect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/Effect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/Effect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/Effect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EmbossBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/EmbossBitmapEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/EmbossBitmapEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/EmbossBitmapEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ImplicitInputBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/ImplicitInputBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ImplicitInputBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/ImplicitInputBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/KernelType.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/KernelType.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/KernelType.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/KernelType.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/OuterGlowBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/OuterGlowBitmapEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/OuterGlowBitmapEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/OuterGlowBitmapEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/PixelShader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/PixelShader.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/PixelShader.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/PixelShader.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/RenderingBias.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/RenderingBias.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/RenderingBias.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/RenderingBias.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/ShaderEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/ShaderEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderRenderMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/ShaderRenderMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/Generated/ShaderRenderMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/Generated/ShaderRenderMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/ImplicitInputBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/ImplicitInputBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/ImplicitInputBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/ImplicitInputBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/OuterGlowBitmapEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/OuterGlowBitmapEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/OuterGlowBitmapEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/OuterGlowBitmapEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/PixelShader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/PixelShader.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/PixelShader.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/PixelShader.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/SamplingMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/SamplingMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/SamplingMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/SamplingMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/ShaderEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/ShaderEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/ShaderEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/ShaderEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/embossbitmapeffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/embossbitmapeffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Effects/embossbitmapeffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Effects/embossbitmapeffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/EllipseGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/EllipseGeometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/EllipseGeometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/EllipseGeometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/EventProxy.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/EventProxy.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/EventProxy.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/EventProxy.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FactoryMaker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FactoryMaker.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FactoryMaker.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FactoryMaker.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FamilyMap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FamilyMap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FamilyMap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FamilyMap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FamilyMapCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FamilyMapCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FamilyMapCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FamilyMapCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FamilyTypeface.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FamilyTypeface.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FamilyTypeface.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FamilyTypeface.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FamilyTypefaceCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FamilyTypefaceCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FamilyTypefaceCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FamilyTypefaceCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontEmbeddingManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FontEmbeddingManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontEmbeddingManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FontEmbeddingManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontEmbeddingRights.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FontEmbeddingRights.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontEmbeddingRights.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FontEmbeddingRights.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontFamily.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FontFamily.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontFamily.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FontFamily.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontFamilyConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FontFamilyConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontFamilyConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FontFamilyConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontFamilyValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FontFamilyValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontFamilyValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FontFamilyValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Fonts.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Fonts.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Fonts.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Fonts.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FormattedText.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FormattedText.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FormattedText.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/FormattedText.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeneralTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeneralTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeneralTransform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeneralTransform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeneralTransformGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeneralTransformGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeneralTransformGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeneralTransformGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/AlignmentX.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/AlignmentX.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/AlignmentX.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/AlignmentX.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/AlignmentY.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/AlignmentY.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/AlignmentY.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/AlignmentY.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ArcSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ArcSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ArcSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ArcSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/BezierSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BezierSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/BezierSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/BitmapCache.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCache.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/BitmapCache.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCacheBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/BitmapCacheBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapCacheBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/BitmapCacheBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapScalingMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/BitmapScalingMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BitmapScalingMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/BitmapScalingMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Brush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Brush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Brush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Brush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/BrushConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/BrushConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushMappingMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/BrushMappingMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/BrushMappingMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/BrushMappingMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/CacheMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/CacheMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheModeConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/CacheModeConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CacheModeConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/CacheModeConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CachingHint.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/CachingHint.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CachingHint.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/CachingHint.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ClearTypeHint.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ClearTypeHint.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ClearTypeHint.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ClearTypeHint.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ColorCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ColorCollectionConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ColorCollectionConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ColorCollectionConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ColorInterpolationMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ColorInterpolationMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ColorInterpolationMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ColorInterpolationMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CombinedGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/CombinedGeometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/CombinedGeometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/CombinedGeometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DashStyle.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DashStyle.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DashStyle.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DashStyle.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DoubleCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DoubleCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DoubleCollectionConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollectionConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DoubleCollectionConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Drawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Drawing.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Drawing.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Drawing.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextDrawingContextWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingContextDrawingContextWalker.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextDrawingContextWalker.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingContextDrawingContextWalker.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingContextWalker.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingContextWalker.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingContextWalker.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingImage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingImage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DrawingImage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/DrawingImage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EdgeMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/EdgeMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EdgeMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/EdgeMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EllipseGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/EllipseGeometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/EllipseGeometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/EllipseGeometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/FillRule.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/FillRule.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/FillRule.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/FillRule.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeneralTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeneralTransform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeneralTransformCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeneralTransformCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeneralTransformGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeneralTransformGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeneralTransformGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Geometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Geometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Geometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Geometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeometryCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeometryCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCombineMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeometryCombineMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryCombineMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeometryCombineMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeometryConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeometryConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeometryDrawing.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryDrawing.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeometryDrawing.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeometryGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GeometryGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GeometryGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GlyphRunDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GlyphRunDrawing.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GlyphRunDrawing.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GlyphRunDrawing.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GradientBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GradientBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientSpreadMethod.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GradientSpreadMethod.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientSpreadMethod.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GradientSpreadMethod.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStop.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GradientStop.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStop.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GradientStop.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStopCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GradientStopCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStopCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GradientStopCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GuidelineSet.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GuidelineSet.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GuidelineSet.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/GuidelineSet.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ImageBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ImageBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ImageDrawing.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageDrawing.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ImageDrawing.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ImageSource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ImageSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ImageSource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32Collection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Int32Collection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32Collection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Int32Collection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32CollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Int32CollectionConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32CollectionConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Int32CollectionConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/LineGeometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineGeometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/LineGeometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/LineSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LineSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/LineSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LinearGradientBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/LinearGradientBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/LinearGradientBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/LinearGradientBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MatrixTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/MatrixTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MatrixTransform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/MatrixTransform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MediaTimeline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/MediaTimeline.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/MediaTimeline.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/MediaTimeline.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigure.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PathFigure.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigure.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PathFigure.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PathFigureCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PathFigureCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PathFigureCollectionConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathFigureCollectionConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PathFigureCollectionConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PathGeometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathGeometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PathGeometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PathSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PathSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegmentCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PathSegmentCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PathSegmentCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PathSegmentCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Pen.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Pen.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Pen.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Pen.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenDashCap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PenDashCap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenDashCap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PenDashCap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenLineCap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PenLineCap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenLineCap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PenLineCap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenLineJoin.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PenLineJoin.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PenLineJoin.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PenLineJoin.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PointCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PointCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PointCollectionConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollectionConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PointCollectionConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PolyBezierSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PolyBezierSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegmentFigureLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PolyBezierSegmentFigureLogic.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyBezierSegmentFigureLogic.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PolyBezierSegmentFigureLogic.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PolyLineSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PolyLineSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegmentFigureLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PolyLineSegmentFigureLogic.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyLineSegmentFigureLogic.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PolyLineSegmentFigureLogic.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PolyQuadraticBezierSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PolyQuadraticBezierSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegmentFigureLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PolyQuadraticBezierSegmentFigureLogic.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PolyQuadraticBezierSegmentFigureLogic.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/PolyQuadraticBezierSegmentFigureLogic.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/QuadraticBezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/QuadraticBezierSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/QuadraticBezierSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/QuadraticBezierSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RadialGradientBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/RadialGradientBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RadialGradientBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/RadialGradientBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RectangleGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/RectangleGeometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RectangleGeometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/RectangleGeometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderData.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/RenderData.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderData.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/RenderData.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderDataDrawingContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/RenderDataDrawingContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RenderDataDrawingContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/RenderDataDrawingContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RotateTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/RotateTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/RotateTransform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/RotateTransform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Rotation.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Rotation.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Rotation.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Rotation.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ScaleTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ScaleTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ScaleTransform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ScaleTransform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SkewTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/SkewTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SkewTransform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/SkewTransform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SolidColorBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/SolidColorBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SolidColorBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/SolidColorBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/StreamGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/StreamGeometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/StreamGeometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/StreamGeometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Stretch.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Stretch.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Stretch.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Stretch.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SweepDirection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/SweepDirection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/SweepDirection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/SweepDirection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TextEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TextEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffectCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TextEffectCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextEffectCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TextEffectCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextHintingMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TextHintingMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextHintingMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TextHintingMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextRenderingMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TextRenderingMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TextRenderingMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TextRenderingMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TileBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TileBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileMode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TileMode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TileMode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TileMode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ToleranceType.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ToleranceType.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/ToleranceType.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/ToleranceType.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Transform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Transform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Transform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/Transform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TransformCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TransformCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TransformConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TransformConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TransformGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TransformGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TransformGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TranslateTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TranslateTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/TranslateTransform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/TranslateTransform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/VectorCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/VectorCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/VectorCollectionConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollectionConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/VectorCollectionConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VideoDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/VideoDrawing.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VideoDrawing.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/VideoDrawing.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VisualBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/VisualBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VisualBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Generated/VisualBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Geometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Geometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Geometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Geometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeometryCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeometryCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeometryCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeometryCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeometryDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeometryDrawing.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeometryDrawing.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeometryDrawing.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeometryGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeometryGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeometryGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeometryGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeometryHitTestParameters.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeometryHitTestParameters.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeometryHitTestParameters.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeometryHitTestParameters.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeometryHitTestResult.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeometryHitTestResult.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GeometryHitTestResult.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GeometryHitTestResult.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GlyphCache.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphCache.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GlyphCache.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphRun.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GlyphRun.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphRun.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GlyphRun.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphRunDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GlyphRunDrawing.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphRunDrawing.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GlyphRunDrawing.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphTypeface.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GlyphTypeface.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphTypeface.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GlyphTypeface.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphsSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GlyphsSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphsSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GlyphsSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GradientBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GradientBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GradientBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GradientBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GradientStop.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GradientStop.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GradientStop.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GradientStop.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GuidelineCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GuidelineCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GuidelineCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/GuidelineCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestDrawingContextWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestDrawingContextWalker.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestDrawingContextWalker.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestDrawingContextWalker.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestFilterBehavior.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestFilterBehavior.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestFilterBehavior.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestFilterBehavior.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestParameters.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestParameters.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestParameters.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestParameters.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestResult.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestResult.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestResult.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestResult.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestResultBehavior.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestResultBehavior.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestResultBehavior.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestResultBehavior.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestWithGeometryDrawingContextWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestWithGeometryDrawingContextWalker.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestWithGeometryDrawingContextWalker.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestWithGeometryDrawingContextWalker.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestWithPointDrawingContextWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestWithPointDrawingContextWalker.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestWithPointDrawingContextWalker.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HitTestWithPointDrawingContextWalker.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HostVisual.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HostVisual.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HostVisual.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/HostVisual.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ICompositionTarget.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ICompositionTarget.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ICompositionTarget.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ICompositionTarget.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ICyclicBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ICyclicBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ICyclicBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ICyclicBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/IDrawingContent.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/IDrawingContent.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/IDrawingContent.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/IDrawingContent.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/IFreezeFreezables.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/IFreezeFreezables.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/IFreezeFreezables.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/IFreezeFreezables.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ImageBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ImageBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ImageBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ImageBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ImageDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ImageDrawing.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ImageDrawing.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ImageDrawing.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ImageMetadata.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ImageMetadata.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ImageMetadata.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ImageMetadata.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ImageSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ImageSource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ImageSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ImageSource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ImageSourceConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ImageSourceConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ImageSourceConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ImageSourceConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ImageSourceValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ImageSourceValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ImageSourceValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ImageSourceValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapCacheOption.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapCacheOption.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapCacheOption.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapCacheOption.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapCodecInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapCodecInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapCodecInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapCodecInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapCodecInfoInternal.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapCodecInfoInternal.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapCodecInfoInternal.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapCodecInfoInternal.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapCreateOptions.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapCreateOptions.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapCreateOptions.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapCreateOptions.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapDecoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapDecoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapDecoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapDecoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapDownload.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapDownload.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapDownload.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapDownload.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapEncoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapEncoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapEncoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapEncoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapFrame.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapFrame.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapFrame.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapFrame.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapFrameDecode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapFrameDecode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapFrameDecode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapFrameDecode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapFrameEncode.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapFrameEncode.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapFrameEncode.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapFrameEncode.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapImage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapImage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapImage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapImage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapInitialize.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapInitialize.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapInitialize.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapInitialize.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapMetadata.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapMetadata.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapMetadata.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapMetadata.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapMetadataBlob.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapMetadataBlob.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapMetadataBlob.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapMetadataBlob.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapMetadataEnumerator.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapMetadataEnumerator.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapMetadataEnumerator.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapMetadataEnumerator.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapPalette.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapPalette.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapPalette.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapPalette.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapPalettes.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapPalettes.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapPalettes.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapPalettes.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapSizeOptions.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapSizeOptions.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapSizeOptions.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapSizeOptions.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapSource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapSource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapSourceSafeMILHandle.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapSourceSafeMILHandle.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapSourceSafeMILHandle.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapSourceSafeMILHandle.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapVisualManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapVisualManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapVisualManager.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BitmapVisualManager.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BmpBitmapDecoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BmpBitmapDecoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BmpBitmapDecoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BmpBitmapDecoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BmpBitmapEncoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BmpBitmapEncoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BmpBitmapEncoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/BmpBitmapEncoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/CachedBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/CachedBitmap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/CachedBitmap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/CachedBitmap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/ColorConvertedBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/ColorConvertedBitmap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/ColorConvertedBitmap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/ColorConvertedBitmap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/CroppedBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/CroppedBitmap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/CroppedBitmap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/CroppedBitmap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/DownloadProgressEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/DownloadProgressEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/DownloadProgressEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/DownloadProgressEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/FormatConvertedBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/FormatConvertedBitmap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/FormatConvertedBitmap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/FormatConvertedBitmap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/BitmapImage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/Generated/BitmapImage.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/BitmapImage.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/Generated/BitmapImage.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/ColorConvertedBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/Generated/ColorConvertedBitmap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/ColorConvertedBitmap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/Generated/ColorConvertedBitmap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/CroppedBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/Generated/CroppedBitmap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/CroppedBitmap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/Generated/CroppedBitmap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/FormatConvertedBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/Generated/FormatConvertedBitmap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/FormatConvertedBitmap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/Generated/FormatConvertedBitmap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/TransformedBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/Generated/TransformedBitmap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/Generated/TransformedBitmap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/Generated/TransformedBitmap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/GifBitmapDecoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/GifBitmapDecoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/GifBitmapDecoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/GifBitmapDecoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/GifBitmapEncoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/GifBitmapEncoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/GifBitmapEncoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/GifBitmapEncoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/IconBitmapDecoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/IconBitmapDecoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/IconBitmapDecoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/IconBitmapDecoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/ImagingCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/ImagingCache.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/ImagingCache.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/ImagingCache.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/InplaceBitmapMetadataWriter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/InplaceBitmapMetadataWriter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/InplaceBitmapMetadataWriter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/InplaceBitmapMetadataWriter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/InteropBitmapSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/InteropBitmapSource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/InteropBitmapSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/InteropBitmapSource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/JpegBitmapDecoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/JpegBitmapDecoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/JpegBitmapDecoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/JpegBitmapDecoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/JpegBitmapEncoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/JpegBitmapEncoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/JpegBitmapEncoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/JpegBitmapEncoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/LateBoundBitmapDecoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/LateBoundBitmapDecoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/LateBoundBitmapDecoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/LateBoundBitmapDecoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/PngBitmapDecoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/PngBitmapDecoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/PngBitmapDecoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/PngBitmapDecoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/PngBitmapEncoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/PngBitmapEncoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/PngBitmapEncoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/PngBitmapEncoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/PropVariant.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/PropVariant.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/PropVariant.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/PropVariant.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/RenderTargetBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/RenderTargetBitmap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/RenderTargetBitmap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/RenderTargetBitmap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/TiffBitmapDecoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/TiffBitmapDecoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/TiffBitmapDecoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/TiffBitmapDecoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/TiffBitmapEncoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/TiffBitmapEncoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/TiffBitmapEncoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/TiffBitmapEncoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/TransformedBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/TransformedBitmap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/TransformedBitmap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/TransformedBitmap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/UnknownBitmapDecoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/UnknownBitmapDecoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/UnknownBitmapDecoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/UnknownBitmapDecoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/UnknownBitmapEncoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/UnknownBitmapEncoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/UnknownBitmapEncoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/UnknownBitmapEncoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/UnmanagedBitmapWrapper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/UnmanagedBitmapWrapper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/UnmanagedBitmapWrapper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/UnmanagedBitmapWrapper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/WmpBitmapDecoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/WmpBitmapDecoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/WmpBitmapDecoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/WmpBitmapDecoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/WmpBitmapEncoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/WmpBitmapEncoder.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/WmpBitmapEncoder.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/WmpBitmapEncoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/WriteableBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/WriteableBitmap.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/WriteableBitmap.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Imaging/WriteableBitmap.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/IntersectionDetail.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/IntersectionDetail.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/IntersectionDetail.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/IntersectionDetail.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/InvalidWMPVersionException.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/InvalidWMPVersionException.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/InvalidWMPVersionException.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/InvalidWMPVersionException.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Invokable.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Invokable.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Invokable.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Invokable.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Knowncolors.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Knowncolors.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Knowncolors.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Knowncolors.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/LineGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/LineGeometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/LineGeometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/LineGeometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/LineSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/LineSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/LineSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/LineSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/LinearGradientBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/LinearGradientBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/LinearGradientBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/LinearGradientBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MILUtilities.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MILUtilities.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MILUtilities.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MILUtilities.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MatrixStack.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MatrixStack.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MatrixStack.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MatrixStack.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MatrixTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MatrixTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MatrixTransform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MatrixTransform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MediaContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MediaContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaContextNotificationWindow.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MediaContextNotificationWindow.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaContextNotificationWindow.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MediaContextNotificationWindow.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaPlayer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MediaPlayer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaPlayer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MediaPlayer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaPlayerState.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MediaPlayerState.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaPlayerState.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MediaPlayerState.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaSystem.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MediaSystem.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaSystem.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MediaSystem.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaTimeline.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MediaTimeline.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaTimeline.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/MediaTimeline.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/NativeMethodsMilCoreApi.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/NativeMethodsMilCoreApi.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/NativeMethodsMilCoreApi.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/NativeMethodsMilCoreApi.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Parsers.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Parsers.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Parsers.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Parsers.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ParsersCommon.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ParsersCommon.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ParsersCommon.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ParsersCommon.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PathFigure.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PathFigure.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PathFigure.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PathFigure.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PathFigureCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PathFigureCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PathFigureCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PathFigureCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PathGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PathGeometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PathGeometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PathGeometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PathSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PathSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PathSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PathSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PathSegmentCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PathSegmentCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PathSegmentCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PathSegmentCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PathStreamGeometryContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PathStreamGeometryContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PathStreamGeometryContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PathStreamGeometryContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Pen.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Pen.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Pen.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Pen.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PixelFormat.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PixelFormat.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PixelFormat.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PixelFormat.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PixelFormatConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PixelFormatConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PixelFormatConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PixelFormatConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PixelFormats.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PixelFormats.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PixelFormats.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PixelFormats.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PointCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PointCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PointCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PointCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PointHitTestParameters.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PointHitTestParameters.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PointHitTestParameters.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PointHitTestParameters.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PointHitTestResult.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PointHitTestResult.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PointHitTestResult.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PointHitTestResult.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PolyBezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PolyBezierSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PolyBezierSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PolyBezierSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PolyLineSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PolyLineSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PolyLineSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PolyLineSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PolyQuadraticBezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PolyQuadraticBezierSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/PolyQuadraticBezierSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/PolyQuadraticBezierSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/QuadraticBezierSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/QuadraticBezierSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/QuadraticBezierSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/QuadraticBezierSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RadialGradientBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RadialGradientBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RadialGradientBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RadialGradientBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RectangleGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RectangleGeometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RectangleGeometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RectangleGeometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RenderCapability.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RenderCapability.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RenderCapability.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RenderCapability.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RenderContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RenderContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RenderContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RenderContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RenderData.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RenderData.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RenderData.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RenderData.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RenderDataDrawingContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RenderDataDrawingContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RenderDataDrawingContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RenderDataDrawingContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RenderOptions.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RenderOptions.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RenderOptions.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RenderOptions.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Renderer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Renderer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Renderer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Renderer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RenderingEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RenderingEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RenderingEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RenderingEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RequestCachePolicyConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RequestCachePolicyConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RequestCachePolicyConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RequestCachePolicyConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Resources/ColorProfiles/ColorProfiles.resx b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Resources/ColorProfiles/ColorProfiles.resx
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Resources/ColorProfiles/ColorProfiles.resx
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Resources/ColorProfiles/ColorProfiles.resx
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Resources/ColorProfiles/sRGB.icm b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Resources/ColorProfiles/sRGB.icm
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Resources/ColorProfiles/sRGB.icm
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Resources/ColorProfiles/sRGB.icm
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RotateTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RotateTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/RotateTransform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/RotateTransform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/SafeMILHandle.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/SafeMILHandle.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/SafeMILHandle.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/SafeMILHandle.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/SafeMILHandleMemoryPressure.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/SafeMILHandleMemoryPressure.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/SafeMILHandleMemoryPressure.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/SafeMILHandleMemoryPressure.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/SafeNativeMethodsMilCoreApi.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/SafeNativeMethodsMilCoreApi.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/SafeNativeMethodsMilCoreApi.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/SafeNativeMethodsMilCoreApi.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/SafeReversePInvokeHandle.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/SafeReversePInvokeHandle.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/SafeReversePInvokeHandle.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/SafeReversePInvokeHandle.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ScaleTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ScaleTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/ScaleTransform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/ScaleTransform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/SkewTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/SkewTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/SkewTransform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/SkewTransform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/SolidColorBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/SolidColorBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/SolidColorBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/SolidColorBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/StreamAsIStream.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/StreamAsIStream.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/StreamAsIStream.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/StreamAsIStream.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/StreamGeometry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/StreamGeometry.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/StreamGeometry.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/StreamGeometry.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/StreamGeometryContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/StreamGeometryContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/StreamGeometryContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/StreamGeometryContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/StyleSimulations.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/StyleSimulations.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/StyleSimulations.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/StyleSimulations.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/TextEffect.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/TextEffect.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/TextEffect.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/TextEffect.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/TextEffectCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/TextEffectCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/TextEffectCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/TextEffectCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/TileBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/TileBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/TileBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/TileBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Transform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Transform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Transform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Transform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/TransformGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/TransformGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/TransformGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/TransformGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/TranslateTransform.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/TranslateTransform.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/TranslateTransform.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/TranslateTransform.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Typeface.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Typeface.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Typeface.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Typeface.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/UniqueEventHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/UniqueEventHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/UniqueEventHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/UniqueEventHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/UnsafeNativeMethodsMilCoreApi.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/UnsafeNativeMethodsMilCoreApi.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/UnsafeNativeMethodsMilCoreApi.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/UnsafeNativeMethodsMilCoreApi.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VideoDrawing.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VideoDrawing.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VideoDrawing.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VideoDrawing.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Visual.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Visual.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Visual.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/Visual.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualBrush.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualBrush.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualBrush.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualBrush.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualFlags.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualFlags.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualFlags.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualFlags.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualProxy.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualProxy.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualProxy.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualProxy.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualProxyFlags.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualProxyFlags.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualProxyFlags.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualProxyFlags.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualTarget.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualTarget.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualTarget.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualTarget.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualTreeHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualTreeHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/VisualTreeHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/VisualTreeHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/brushes.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/brushes.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/brushes.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/brushes.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/mediaclock.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/mediaclock.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/mediaclock.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/mediaclock.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/mediaeventargs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/mediaeventargs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/mediaeventargs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/mediaeventargs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/mediaeventshelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/mediaeventshelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/mediaeventshelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/mediaeventshelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/printcontext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/printcontext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/printcontext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/printcontext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/safemediahandle.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/safemediahandle.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/safemediahandle.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/safemediahandle.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/CharacterBufferReference.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/CharacterBufferReference.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/CharacterBufferReference.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/CharacterBufferReference.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/CharacterHit.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/CharacterHit.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/CharacterHit.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/CharacterHit.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/CharacterString.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/CharacterString.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/CharacterString.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/CharacterString.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/CultureSpecificCharacterBufferRange.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/CultureSpecificCharacterBufferRange.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/CultureSpecificCharacterBufferRange.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/CultureSpecificCharacterBufferRange.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/IndexedGlyphRun.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/IndexedGlyphRun.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/IndexedGlyphRun.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/IndexedGlyphRun.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/MinMaxParagraphWidth.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/MinMaxParagraphWidth.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/MinMaxParagraphWidth.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/MinMaxParagraphWidth.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/NumberSubstitution.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/NumberSubstitution.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/NumberSubstitution.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/NumberSubstitution.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextBounds.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextBounds.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextBounds.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextBounds.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextBreakpoint.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextBreakpoint.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextBreakpoint.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextBreakpoint.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextCharacters.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextCharacters.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextCharacters.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextCharacters.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextCollapsingProperties.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextCollapsingProperties.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextCollapsingProperties.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextCollapsingProperties.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextEmbeddedObject.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextEmbeddedObject.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextEmbeddedObject.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextEmbeddedObject.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextEndOfLine.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextEndOfLine.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextEndOfLine.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextEndOfLine.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextEndOfParagraph.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextEndOfParagraph.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextEndOfParagraph.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextEndOfParagraph.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextEndOfSegment.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextEndOfSegment.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextEndOfSegment.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextEndOfSegment.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextFormatter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextFormatter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextFormatter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextFormatter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextFormatterContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextFormatterContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextFormatterContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextFormatterContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextHidden.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextHidden.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextHidden.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextHidden.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextLexicalBreaks.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextLexicalBreaks.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextLexicalBreaks.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextLexicalBreaks.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextLexicalService.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextLexicalService.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextLexicalService.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextLexicalService.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextLine.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextLine.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextLine.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextLine.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextLineBreak.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextLineBreak.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextLineBreak.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextLineBreak.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextMarkerProperties.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextMarkerProperties.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextMarkerProperties.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextMarkerProperties.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextModifier.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextModifier.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextModifier.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextModifier.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextModifierScope.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextModifierScope.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextModifierScope.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextModifierScope.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextParagraphCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextParagraphCache.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextParagraphCache.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextParagraphCache.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextParagraphProperties.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextParagraphProperties.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextParagraphProperties.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextParagraphProperties.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextRun.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextRun.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextRun.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextRun.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextRunCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextRunCache.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextRunCache.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextRunCache.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextRunProperties.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextRunProperties.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextRunProperties.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextRunProperties.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextRunTypographyProperties.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextRunTypographyProperties.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextRunTypographyProperties.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextRunTypographyProperties.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextSimpleMarkerProperties.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextSimpleMarkerProperties.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextSimpleMarkerProperties.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextSimpleMarkerProperties.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextSource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextSource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextSpan.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextSpan.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextSpan.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextSpan.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextTabProperties.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextTabProperties.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextTabProperties.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextTabProperties.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextTrailingCharacterEllipsis.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextTrailingCharacterEllipsis.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextTrailingCharacterEllipsis.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextTrailingCharacterEllipsis.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextTrailingWordEllipsis.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextTrailingWordEllipsis.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/textformatting/TextTrailingWordEllipsis.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media/textformatting/TextTrailingWordEllipsis.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/AffineTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/AffineTransform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/AffineTransform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/AffineTransform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/AmbientLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/AmbientLight.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/AmbientLight.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/AmbientLight.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/AxisAngleRotation3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/AxisAngleRotation3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/AxisAngleRotation3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/AxisAngleRotation3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Camera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Camera.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Camera.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Camera.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/ContainerUIElement3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/ContainerUIElement3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/ContainerUIElement3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/ContainerUIElement3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Matrix3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Matrix3DValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Matrix3DValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Matrix3DValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Point3DCollectionValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DCollectionValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Point3DCollectionValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Point3DValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point3DValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Point3DValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point4DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Point4DValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Point4DValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Point4DValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/QuaternionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/QuaternionValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/QuaternionValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/QuaternionValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Rect3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Rect3DValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Rect3DValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Rect3DValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Size3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Size3DValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Size3DValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Size3DValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DCollectionValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Vector3DCollectionValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DCollectionValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Vector3DCollectionValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DValueSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Vector3DValueSerializer.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Converters/Generated/Vector3DValueSerializer.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Converters/Generated/Vector3DValueSerializer.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/DiffuseMaterial.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/DiffuseMaterial.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/DiffuseMaterial.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/DiffuseMaterial.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/DirectionalLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/DirectionalLight.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/DirectionalLight.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/DirectionalLight.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/EmissiveMaterial.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/EmissiveMaterial.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/EmissiveMaterial.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/EmissiveMaterial.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/GeneralTransform2DTo3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/GeneralTransform2DTo3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/GeneralTransform2DTo3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/GeneralTransform2DTo3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/GeneralTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/GeneralTransform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/GeneralTransform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/GeneralTransform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/GeneralTransform3DGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/GeneralTransform3DGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/GeneralTransform3DGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/GeneralTransform3DGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/GeneralTransform3DTo2D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/GeneralTransform3DTo2D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/GeneralTransform3DTo2D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/GeneralTransform3DTo2D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AffineTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/AffineTransform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AffineTransform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/AffineTransform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AmbientLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/AmbientLight.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AmbientLight.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/AmbientLight.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AxisAngleRotation3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/AxisAngleRotation3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/AxisAngleRotation3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/AxisAngleRotation3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Camera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Camera.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Camera.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Camera.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DiffuseMaterial.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/DiffuseMaterial.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DiffuseMaterial.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/DiffuseMaterial.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DirectionalLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/DirectionalLight.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/DirectionalLight.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/DirectionalLight.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/EmissiveMaterial.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/EmissiveMaterial.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/EmissiveMaterial.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/EmissiveMaterial.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/GeneralTransform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/GeneralTransform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/GeneralTransform3DCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/GeneralTransform3DCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/GeneralTransform3DGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeneralTransform3DGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/GeneralTransform3DGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Geometry3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Geometry3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Geometry3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Geometry3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeometryModel3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/GeometryModel3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/GeometryModel3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/GeometryModel3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Light.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Light.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Light.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Light.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Material.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Material.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Material.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Material.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/MaterialCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/MaterialCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/MaterialGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MaterialGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/MaterialGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Matrix3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Matrix3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Matrix3DConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3DConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Matrix3DConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/MatrixCamera.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixCamera.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/MatrixCamera.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/MatrixTransform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MatrixTransform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/MatrixTransform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MeshGeometry3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/MeshGeometry3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/MeshGeometry3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/MeshGeometry3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Model3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Model3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Model3DCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Model3DCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Model3DGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Model3DGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Model3DGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/OrthographicCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/OrthographicCamera.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/OrthographicCamera.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/OrthographicCamera.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PerspectiveCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/PerspectiveCamera.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PerspectiveCamera.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/PerspectiveCamera.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Point3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Point3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Point3DCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Point3DCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Point3DCollectionConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollectionConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Point3DCollectionConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Point3DConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Point3DConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Point4D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Point4D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Point4DConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4DConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Point4DConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/PointLight.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLight.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/PointLight.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLightBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/PointLightBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/PointLightBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/PointLightBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ProjectionCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/ProjectionCamera.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ProjectionCamera.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/ProjectionCamera.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Quaternion.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Quaternion.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Quaternion.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Quaternion.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/QuaternionConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/QuaternionConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionRotation3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/QuaternionRotation3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/QuaternionRotation3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/QuaternionRotation3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Rect3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Rect3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Rect3DConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3DConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Rect3DConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/RotateTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/RotateTransform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/RotateTransform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/RotateTransform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rotation3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Rotation3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rotation3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Rotation3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ScaleTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/ScaleTransform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/ScaleTransform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/ScaleTransform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Size3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Size3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Size3DConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3DConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Size3DConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpecularMaterial.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/SpecularMaterial.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpecularMaterial.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/SpecularMaterial.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpotLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/SpotLight.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/SpotLight.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/SpotLight.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Transform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Transform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Transform3DCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Transform3DCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Transform3DGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Transform3DGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Transform3DGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/TranslateTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/TranslateTransform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/TranslateTransform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/TranslateTransform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Vector3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Vector3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Vector3DCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Vector3DCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Vector3DCollectionConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollectionConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Vector3DCollectionConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Vector3DConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Vector3DConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Visual3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Visual3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Visual3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Generated/Visual3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Geometry3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Geometry3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Geometry3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Geometry3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/GeometryModel3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/GeometryModel3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/GeometryModel3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/GeometryModel3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/HitTestParameters3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/HitTestParameters3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/HitTestParameters3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/HitTestParameters3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Light.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Light.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Light.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Light.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Material.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Material.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Material.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Material.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/MaterialGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/MaterialGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/MaterialGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/MaterialGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Matrix3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Matrix3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Matrix3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Matrix3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Matrix3DStack.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Matrix3DStack.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Matrix3DStack.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Matrix3DStack.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/MatrixCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/MatrixCamera.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/MatrixCamera.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/MatrixCamera.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/MatrixTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/MatrixTransform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/MatrixTransform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/MatrixTransform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/MeshGeometry3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/MeshGeometry3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/MeshGeometry3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/MeshGeometry3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Model3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Model3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Model3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Model3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Model3DGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Model3DGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Model3DGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Model3DGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/ModelUIElement3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/ModelUIElement3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/ModelUIElement3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/ModelUIElement3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/ModelVisual3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/ModelVisual3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/ModelVisual3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/ModelVisual3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/OrthographicCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/OrthographicCamera.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/OrthographicCamera.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/OrthographicCamera.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/PerspectiveCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/PerspectiveCamera.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/PerspectiveCamera.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/PerspectiveCamera.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Point3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Point3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Point3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Point3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Point3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Point3DCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Point3DCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Point3DCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Point4D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Point4D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Point4D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Point4D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/PointLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/PointLight.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/PointLight.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/PointLight.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/PointLightBase.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/PointLightBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/PointLightBase.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/PointLightBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/ProjectionCamera.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/ProjectionCamera.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/ProjectionCamera.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/ProjectionCamera.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Quaternion.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Quaternion.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Quaternion.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Quaternion.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/QuaternionRotation3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/QuaternionRotation3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/QuaternionRotation3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/QuaternionRotation3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Ray3DHitTestResult.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Ray3DHitTestResult.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Ray3DHitTestResult.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Ray3DHitTestResult.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/RayHitTestParameters.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/RayHitTestParameters.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/RayHitTestParameters.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/RayHitTestParameters.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/RayMeshGeometry3DHitTestResult.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/RayMeshGeometry3DHitTestResult.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/RayMeshGeometry3DHitTestResult.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/RayMeshGeometry3DHitTestResult.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/ReadMe.txt b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/ReadMe.txt
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/ReadMe.txt
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/ReadMe.txt
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Rect3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Rect3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Rect3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Rect3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/RotateTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/RotateTransform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/RotateTransform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/RotateTransform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Rotation3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Rotation3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Rotation3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Rotation3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/ScaleTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/ScaleTransform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/ScaleTransform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/ScaleTransform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Size3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Size3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Size3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Size3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/SpecularMaterial.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/SpecularMaterial.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/SpecularMaterial.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/SpecularMaterial.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/SpotLight.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/SpotLight.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/SpotLight.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/SpotLight.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Transform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Transform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Transform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Transform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Transform3DGroup.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Transform3DGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Transform3DGroup.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Transform3DGroup.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/TranslateTransform3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/TranslateTransform3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/TranslateTransform3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/TranslateTransform3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Vector3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Vector3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Vector3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Vector3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Vector3dCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Vector3dCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Vector3dCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Vector3dCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Viewport2DVisual3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Viewport2DVisual3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Viewport2DVisual3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Viewport2DVisual3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Viewport3DVisual.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Viewport3DVisual.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Viewport3DVisual.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Viewport3DVisual.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Visual3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Visual3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Visual3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Visual3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Visual3DCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Visual3DCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Visual3DCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Media3D/Visual3DCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Modifiability.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Modifiability.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Modifiability.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Modifiability.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/MouseCaptureWithinProperty.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/MouseCaptureWithinProperty.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/MouseCaptureWithinProperty.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/MouseCaptureWithinProperty.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/MouseOverProperty.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/MouseOverProperty.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/MouseOverProperty.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/MouseOverProperty.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Navigation/BaseUriHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Navigation/BaseUriHelper.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Navigation/BaseUriHelper.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Navigation/BaseUriHelper.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/OleServicesContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/OleServicesContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/OleServicesContext.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/OleServicesContext.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/PresentationSource.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/PresentationSource.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/QueryContinueDragEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/QueryContinueDragEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/QueryContinueDragEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/QueryContinueDragEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/QueryContinueDragEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/QueryContinueDragEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/QueryContinueDragEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/QueryContinueDragEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/ReadOnlyPropertyMetadata.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/ReadOnlyPropertyMetadata.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/ReadOnlyPropertyMetadata.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/ReadOnlyPropertyMetadata.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Readability.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Readability.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Readability.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Readability.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Resources/AssemblyAssociatedContentFileAttribute.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Resources/AssemblyAssociatedContentFileAttribute.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Resources/AssemblyAssociatedContentFileAttribute.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/Resources/AssemblyAssociatedContentFileAttribute.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/ReverseInheritProperty.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/ReverseInheritProperty.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/ReverseInheritProperty.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/ReverseInheritProperty.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/RouteItem.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/RouteItem.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/RouteItem.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/RouteItem.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/RoutedEvent.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/RoutedEvent.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/RoutedEvent.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/RoutedEvent.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/RoutedEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/RoutedEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/RoutedEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/RoutedEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/RoutedEventHandlerInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/RoutedEventHandlerInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/RoutedEventHandlerInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/RoutedEventHandlerInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/RoutingStrategy.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/RoutingStrategy.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/RoutingStrategy.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/RoutingStrategy.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/SizeChangedInfo.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/SizeChangedInfo.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/SizeChangedInfo.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/SizeChangedInfo.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/SizeToContent.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/SizeToContent.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/SizeToContent.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/SizeToContent.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/SourceChangedEventArgs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/SourceChangedEventArgs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/SourceChangedEventArgs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/SourceChangedEventArgs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/SourceChangedEventHandler.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/SourceChangedEventHandler.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/SourceChangedEventHandler.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/SourceChangedEventHandler.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/SourceItem.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/SourceItem.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/SourceItem.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/SourceItem.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/StylusCaptureWithinProperty.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/StylusCaptureWithinProperty.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/StylusCaptureWithinProperty.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/StylusCaptureWithinProperty.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/StylusOverProperty.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/StylusOverProperty.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/StylusOverProperty.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/StylusOverProperty.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/TextAndFontProperties.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/TextAndFontProperties.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/TextAndFontProperties.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/TextAndFontProperties.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/TextDataFormat.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/TextDataFormat.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/TextDataFormat.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/TextDataFormat.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/TextDecoration.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/TextDecoration.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/TextDecoration.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/TextDecoration.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/TextDecorationCollection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/TextDecorationCollection.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/TextDecorationCollection.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/TextDecorationCollection.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/TextDecorationCollectionConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/TextDecorationCollectionConverter.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/TextDecorationCollectionConverter.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/TextDecorationCollectionConverter.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/TextDecorations.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/TextDecorations.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/TextDecorations.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/TextDecorations.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIElement.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/UIElement.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIElement.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/UIElement.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIElement3D.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/UIElement3D.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIElement3D.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/UIElement3D.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIPropertyMetadata.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/UIPropertyMetadata.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIPropertyMetadata.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/UIPropertyMetadata.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/clipboard.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/clipboard.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/clipboard.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/clipboard.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/dataobject.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/dataobject.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/dataobject.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/System/Windows/dataobject.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/cstemplate.pl b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/cstemplate.pl
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/cstemplate.pl
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/cstemplate.pl
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/otherassemblyattrs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/otherassemblyattrs.cs
new file mode 100644
index 00000000000..7689af77cc7
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/CSharp/otherassemblyattrs.cs
@@ -0,0 +1,80 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+//
+// This file specifies various assembly level attributes.
+//
+
+using MS.Internal.PresentationCore;
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: CLSCompliant(true)]
+
+[assembly:InternalsVisibleTo(BuildInfo.PresentationFramework)]
+[assembly:InternalsVisibleTo(BuildInfo.ReachFramework)]
+[assembly:InternalsVisibleTo(BuildInfo.SystemPrinting)]
+[assembly:InternalsVisibleTo(BuildInfo.PresentationUI)]
+[assembly:InternalsVisibleTo(BuildInfo.SystemWindowsPresentation)]
+[assembly:InternalsVisibleTo(BuildInfo.PresentationFrameworkSystemDrawing)]
+[assembly:InternalsVisibleTo(BuildInfo.SystemWindowsControlsRibbon)]
+[assembly:InternalsVisibleTo(BuildInfo.WindowsFormsIntegration)]
+
+[assembly: TypeForwardedTo(typeof(System.Windows.Markup.IUriContext))]
+[assembly: TypeForwardedTo(typeof(System.Windows.Media.TextFormattingMode))]
+[assembly: TypeForwardedTo(typeof(System.Windows.Input.ICommand))]
+
+// Namespace information for Xaml
+
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Media")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Media.Animation")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Media.Media3D")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Media.Imaging")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Media.Effects")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Input")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Ink")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Media.TextFormatting")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Automation")]
+[assembly:System.Windows.Markup.XmlnsPrefix    ("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "av")]
+
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/composite-font", "System.Windows.Media")]
+
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System.Windows.Markup")]
+[assembly:System.Windows.Markup.XmlnsPrefix    ("http://schemas.microsoft.com/winfx/2006/xaml", "x")]
+
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Media")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Media.Animation")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Media.Media3D")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Media.Imaging")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Media.Effects")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Input")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Media.TextFormatting")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Automation")]
+[assembly:System.Windows.Markup.XmlnsPrefix    ("http://schemas.microsoft.com/xps/2005/06", "xps")]
+
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Media")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Media.Animation")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Media.Media3D")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Media.Imaging")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Media.Effects")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Input")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Ink")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Media.TextFormatting")]
+[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Automation")]
+[assembly:System.Windows.Markup.XmlnsPrefix    ("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "wpf")]
+
+[assembly: System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows")]
+[assembly: System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Media")]
+[assembly: System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Media.Animation")]
+[assembly: System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Media.Media3D")]
+[assembly: System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Media.Imaging")]
+[assembly: System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Media.Effects")]
+[assembly: System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Input")]
+[assembly: System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Ink")]
+[assembly: System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Media.TextFormatting")]
+[assembly: System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Automation")]
+[assembly: System.Windows.Markup.XmlnsPrefix("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "wpf")]
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/CharAttribute.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/CharAttribute.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/CharAttribute.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/CharAttribute.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Common.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/Common.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Common.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/Common.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteFontFeature.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteFontFeature.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteFontFeature.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteFontFeature.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteFontFeatureTag.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteFontFeatureTag.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteFontFeatureTag.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteFontFeatureTag.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteGlyphOffset.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteGlyphOffset.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteGlyphOffset.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteGlyphOffset.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteInterfaces.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteInterfaces.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteInterfaces.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteInterfaces.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteMatrix.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteMatrix.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteMatrix.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteMatrix.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteTypeConverter.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteTypeConverter.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteTypeConverter.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteTypeConverter.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteTypeConverter.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteTypeConverter.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/DWriteTypeConverter.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/DWriteTypeConverter.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Factory.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/Factory.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Factory.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/Factory.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Factory.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/Factory.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Factory.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/Factory.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FactoryType.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FactoryType.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FactoryType.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FactoryType.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Font.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/Font.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Font.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/Font.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Font.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/Font.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Font.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/Font.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontCollection.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontCollection.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontCollection.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontCollection.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontCollection.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontCollection.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontCollection.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontCollection.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontCollectionLoader.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontCollectionLoader.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontCollectionLoader.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontCollectionLoader.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontCollectionLoader.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontCollectionLoader.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontCollectionLoader.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontCollectionLoader.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFace.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFace.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFace.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFace.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFace.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFace.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFace.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFace.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFaceType.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFaceType.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFaceType.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFaceType.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFamily.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFamily.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFamily.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFamily.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFamily.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFamily.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFamily.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFamily.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFile.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFile.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFile.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFile.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFile.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFile.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFile.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFile.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileEnumerator.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileEnumerator.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileEnumerator.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileEnumerator.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileEnumerator.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileEnumerator.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileEnumerator.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileEnumerator.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileLoader.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileLoader.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileLoader.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileLoader.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileLoader.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileLoader.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileLoader.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileLoader.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileStream.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileStream.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileStream.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileStream.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileStream.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileType.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileType.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFileType.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontFileType.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontList.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontList.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontList.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontList.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontList.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontList.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontList.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontList.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontMetrics.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontMetrics.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontMetrics.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontMetrics.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontSimulation.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontSimulation.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontSimulation.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontSimulation.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontStretch.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontStretch.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontStretch.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontStretch.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontStyle.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontStyle.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontStyle.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontStyle.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontWeight.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontWeight.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontWeight.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/FontWeight.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/GlyphMetrics.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/GlyphMetrics.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/GlyphMetrics.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/GlyphMetrics.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/GlyphOffset.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/GlyphOffset.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/GlyphOffset.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/GlyphOffset.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/IClassification.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/IClassification.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/IClassification.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/IClassification.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/IFontSource.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/IFontSource.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/IFontSource.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/IFontSource.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/IFontSourceCollection.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/IFontSourceCollection.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/IFontSourceCollection.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/IFontSourceCollection.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/InformationalStringID.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/InformationalStringID.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/InformationalStringID.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/InformationalStringID.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/ItemProps.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/ItemProps.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/ItemProps.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/ItemProps.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/ItemProps.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/ItemProps.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/ItemProps.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/ItemProps.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/ItemSpan.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/ItemSpan.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/ItemSpan.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/ItemSpan.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/ItemSpan.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/ItemSpan.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/ItemSpan.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/ItemSpan.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/ItemizerHelper.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/ItemizerHelper.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/ItemizerHelper.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/ItemizerHelper.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/LocalizedErrorMsgs.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/LocalizedErrorMsgs.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/LocalizedErrorMsgs.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/LocalizedErrorMsgs.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/LocalizedErrorMsgs.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/LocalizedErrorMsgs.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/LocalizedErrorMsgs.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/LocalizedErrorMsgs.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/LocalizedStrings.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/LocalizedStrings.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/LocalizedStrings.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/LocalizedStrings.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/LocalizedStrings.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/LocalizedStrings.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/LocalizedStrings.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/LocalizedStrings.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/NativePointerWrapper.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/NativePointerWrapper.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/NativePointerWrapper.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/NativePointerWrapper.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/NativePointerWrapper.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/NativePointerWrapper.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/NativePointerWrapper.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/NativePointerWrapper.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/OpenTypeTableTag.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/OpenTypeTableTag.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/OpenTypeTableTag.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/OpenTypeTableTag.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/TextAnalyzer.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/TextAnalyzer.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/TextAnalyzer.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/TextAnalyzer.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/TextAnalyzer.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/TextAnalyzer.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/TextAnalyzer.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/TextAnalyzer.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/TextItemizer.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/TextItemizer.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/TextItemizer.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/TextItemizer.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/TextItemizer.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/TextItemizer.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/TextItemizer.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DWriteWrapper/TextItemizer.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DirectWriteForwarder.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DirectWriteForwarder.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DirectWriteForwarder.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DirectWriteForwarder.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DirectWriteForwarder.vcxproj
similarity index 79%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DirectWriteForwarder.vcxproj
index a152ce23e40..3274156233b 100644
--- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/DirectWriteForwarder.vcxproj
@@ -23,24 +23,35 @@
 
   <PropertyGroup>
     <CLRSupport>pure</CLRSupport>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <!-- We don't need assembly info here as the output from this project will just be merged into PresentationCore. -->
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <PropertyGroup>
-      <!-- Target .Net Core 3.0 -->
+    <!-- Target .Net Core 3.0 -->
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
   </PropertyGroup>
   
+  <!-- 
+    We need this to be above our C++/CLI configuration options as the C++ props files will 
+    set TargetExt (and other props) based on ConfigurationType and we want to override that.
+  -->
   <Import Project="$(WpfCppProps)" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
+  <PropertyGroup>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <!-- Don't Link, we only need the OBJ file as an Additional module for C# -->
+    <LinkCompiled>false</LinkCompiled>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetExt>.obj</TargetExt>
+  </PropertyGroup>
+  
   <PropertyGroup Label="Globals">
     <ProjectGuid>{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}</ProjectGuid>
     <UseClrCrt>true</UseClrCrt>
     <OutputName>DirectWriteForwarder</OutputName>
-    <TargetType>DYNLINK</TargetType>
-    <LinkSubSystem>CONSOLE</LinkSubSystem>
     <CDefines>$(CDefines);PRESENTATION_CORE=1;INTEL</CDefines>
   </PropertyGroup>
   
@@ -69,14 +80,10 @@
     <ClInclude Include="precomp.hxx" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="CPP\DirectWriteForwarder.cpp" />
-    <ClCompile Include="CPP\precomp.cxx">
+    <ClCompile Include="DirectWriteForwarder.cpp" />
+    <ClCompile Include="precomp.cxx">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <CLCompile Include="$(WpfSharedDir)\cpp\dwriteloader.cpp" />
-    <CLCompile Include="$(WpfSharedDir)\cpp\Utils.cxx" />
-    <CLCompile Include="main.cpp" />
-    <CLCompile Include="OtherAssemblyAttrs.cpp" />
   </ItemGroup>
 
   <!-- 
@@ -106,4 +113,9 @@
   
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 
+  <PropertyGroup>
+    <!-- CPP targets disable copying since its typically done by link, but we're disabling link -->
+    <SkipCopyBuildProduct>false</SkipCopyBuildProduct>
+  </PropertyGroup>
+  
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ControlTableInit.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ControlTableInit.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ControlTableInit.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ControlTableInit.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/GlobalInit.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/GlobalInit.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/GlobalInit.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/GlobalInit.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/automap.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/automap.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/automap.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/automap.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/automap.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/automap.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/automap.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/automap.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/intsafe_private_copy.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/makeglst.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/makeglst.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/makeglst.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/makeglst.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/makeglst.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/makeglst.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/makeglst.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/makeglst.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modcmap.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modcmap.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modcmap.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modcmap.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modcmap.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modcmap.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modcmap.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modcmap.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modglyf.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modglyf.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modglyf.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modglyf.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modglyf.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modglyf.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modglyf.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modglyf.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modsbit.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modsbit.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modsbit.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modsbit.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modsbit.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modsbit.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modsbit.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modsbit.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modtable.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modtable.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modtable.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modtable.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modtable.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modtable.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/modtable.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/modtable.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/mtxcalc.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/mtxcalc.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/mtxcalc.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/mtxcalc.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/mtxcalc.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/mtxcalc.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/mtxcalc.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/mtxcalc.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfacc.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfacc.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfacc.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfacc.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfacc.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfacc.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfacc.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfacc.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfcntrl.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfcntrl.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfcntrl.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfcntrl.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfcntrl.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfcntrl.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfcntrl.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfcntrl.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfdcnfg.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfdcnfg.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfdcnfg.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfdcnfg.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfdelta.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfdelta.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfdelta.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfdelta.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfdelta.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfdelta.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttfdelta.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttfdelta.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttferror.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttferror.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttferror.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttferror.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttff.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttff.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttff.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttff.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttftabl1.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttftabl1.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttftabl1.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttftabl1.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttftabl1.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttftabl1.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttftabl1.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttftabl1.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttftable.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttftable.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttftable.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttftable.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttftable.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttftable.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttftable.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttftable.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttmem.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttmem.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttmem.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttmem.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttmem.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttmem.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttmem.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/ttmem.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/typedefs.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/typedefs.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/typedefs.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/typedefs.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/util.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/util.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/util.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/util.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/util.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/util.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/util.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/TtfDelta/util.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/fsassert.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/fsassert.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/fsassert.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/fsassert.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/sfntoff.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/sfntoff.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/sfntoff.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/sfntoff.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/truetype.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/truetype.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/truetype.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/truetype.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/truetype.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/truetype.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/truetype.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/truetype.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/util2.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/util2.cpp
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/util2.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/util2.cpp
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/util2.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/util2.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/util2.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/TrueTypeSubsetter/util2.h
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/precomp.cxx b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/precomp.cxx
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/precomp.cxx
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/precomp.cxx
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/precomp.hxx b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/precomp.hxx
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/precomp.hxx
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/precomp.hxx
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/version.rc b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/version.rc
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/version.rc
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/version.rc
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/wpfvcclr.h b/src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/wpfvcclr.h
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/wpfvcclr.h
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/DirectWriteForwarder/wpfvcclr.h
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ModuleInitializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ModuleInitializer.cs
deleted file mode 100644
index aae7e047532..00000000000
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ModuleInitializer.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-internal static class ModuleInitializer
-{
-    /// <summary>
-    /// DirectWriteForwarder has a module constructor that implements
-    /// the setting of the default DPI awareness for the process.
-    /// We need to load DirectWriteForwarder the instant PresentationCore
-    /// loads in order to ensure that this is set before any DPI sensitive
-    /// operations are carried out.  To do this, we simply call LoadDwrite
-    /// as the module constructor for DirectWriteForwarder would do this anyway.
-    /// </summary>
-    public static void Initialize()
-    {
-        MS.Internal.NativeWPFDLLLoader.LoadDwrite();
-    }
-}
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.vcxproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.vcxproj
new file mode 100644
index 00000000000..9be30eab417
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.vcxproj
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup>
+    <CLRSupport>pure</CLRSupport>
+  </PropertyGroup>
+
+  <PropertyGroup>
+      <!-- Target .Net Core 3.0 -->
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E490620F-542F-4F65-9DAA-577F17B0CCB9}</ProjectGuid>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CDefines>$(CDefines);PRESENTATION_CORE=1;INTEL</CDefines>
+    <UseClrCrt>true</UseClrCrt>
+    <OutputName>PresentationCore</OutputName>
+    <TargetType>DYNLINK</TargetType>
+    <LinkSubSystem>CONSOLE</LinkSubSystem>
+  </PropertyGroup>
+
+  <Import Project="$(WpfCppProps)" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions) /clr:initLocals</AdditionalOptions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(WpfSharedDir)\inc;.\</AdditionalIncludeDirectories>
+      <CompileAsManaged>pure</CompileAsManaged>
+      <PreprocessorDefinitions>$(CDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
+    </ClCompile>
+    <Link>
+      <AdditionalOptions>%(AdditionalOptions) /CLRUNMANAGEDCODECHECK:NO /ignore:4042,4075</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="DirectWriteForwarder\DirectWriteForwarder.vcxproj">
+      <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Link</OutputItemType>
+    </ProjectReference>
+    <ProjectReference Include="CSharp\PresentationCoreCSharp.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Link</OutputItemType>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\ref\PresentationCore-ref.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Link Include="Shlwapi.lib" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="$(WpfSourceDir)PresentationCore\Resources\Strings.resx" />
+    <EmbeddedResource Include="$(WpfSourceDir)PresentationCore\CSharp\System\Windows\Media\Resources\ColorProfiles\ColorProfiles.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <GenerateSource>false</GenerateSource>
+      <XlfInput>false</XlfInput>
+      <ManifestResourceName>ColorProfiles</ManifestResourceName>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <CLCompile Include="main.cpp" />
+    <CLCompile Include="otherassemblyattrs.cpp" />
+    <CLCompile Include="$(WpfSharedDir)\cpp\dwriteloader.cpp" />
+    <CLCompile Include="$(WpfSharedDir)\cpp\Utils.cxx" />
+  </ItemGroup>
+  
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/main.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/main.cpp
similarity index 98%
rename from src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/main.cpp
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/main.cpp
index ab78bb08d7f..747c49e54e4 100644
--- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/main.cpp
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/main.cpp
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#include "CPP/precomp.hxx"
 #include <shlwapi.h>
 #include "Utils.hxx" // from shared\inc
 #include "dwriteloader.h" // from shared\inc
@@ -13,8 +12,8 @@
 // We cannot simply put this namespace specification in these 2 header files
 // or elase we will break the compilation of truetype subsetter.
 namespace MS { namespace Internal { namespace TtfDelta { 
-#include "CPP\TrueTypeSubsetter\TtfDelta\GlobalInit.h"
-#include "CPP\TrueTypeSubsetter\TtfDelta\ControlTableInit.h"
+#include "DirectWriteForwarder\TrueTypeSubsetter\TtfDelta\GlobalInit.h"
+#include "DirectWriteForwarder\TrueTypeSubsetter\TtfDelta\ControlTableInit.h"
 }}} // namespace MS::Internal::TtfDelta
 
 using namespace System;
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/otherassemblyattrs.cpp b/src/Microsoft.DotNet.Wpf/src/PresentationCore/otherassemblyattrs.cpp
new file mode 100644
index 00000000000..8d79f14f360
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/otherassemblyattrs.cpp
@@ -0,0 +1,77 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+//
+// This file specifies various assembly level attributes.
+//
+
+using namespace System;
+using namespace System::Runtime::CompilerServices;
+
+[assembly:CLSCompliant(true)]; ;
+
+[assembly:InternalsVisibleTo("PresentationFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")];
+[assembly:InternalsVisibleTo("ReachFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")];
+[assembly:InternalsVisibleTo("System.Printing, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")];
+[assembly:InternalsVisibleTo("PresentationUI, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")];
+[assembly:InternalsVisibleTo("System.Windows.Presentation, PublicKey=00000000000000000400000000000000")];
+[assembly:InternalsVisibleTo("PresentationFramework-SystemDrawing, PublicKey=00000000000000000400000000000000")];
+[assembly:InternalsVisibleTo("System.Windows.Controls.Ribbon, PublicKey=00000000000000000400000000000000")];
+[assembly:InternalsVisibleTo("WindowsFormsIntegration, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")];
+
+// NOTE:  Type forwards are done in PresentationCoreCSharp and are appropriately merged from the NetModule.
+
+// Namespace information for Xaml
+
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Media")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Media.Animation")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Media.Media3D")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Media.Imaging")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Media.Effects")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Input")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Ink")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Media.TextFormatting")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows.Automation")];
+[assembly:System::Windows::Markup::XmlnsPrefix("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "av")];
+
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/composite-font", "System.Windows.Media")];
+
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System.Windows.Markup")];
+[assembly:System::Windows::Markup::XmlnsPrefix("http://schemas.microsoft.com/winfx/2006/xaml", "x")];
+
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Media")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Media.Animation")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Media.Media3D")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Media.Imaging")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Media.Effects")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Input")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Media.TextFormatting")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/xps/2005/06", "System.Windows.Automation")];
+[assembly:System::Windows::Markup::XmlnsPrefix("http://schemas.microsoft.com/xps/2005/06", "xps")];
+
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Media")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Media.Animation")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Media.Media3D")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Media.Imaging")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Media.Effects")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Input")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Ink")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Media.TextFormatting")];
+[assembly:System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "System.Windows.Automation")];
+[assembly:System::Windows::Markup::XmlnsPrefix("http://schemas.microsoft.com/netfx/2007/xaml/presentation", "wpf")];
+
+[assembly: System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows")];
+[assembly: System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Media")];
+[assembly: System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Media.Animation")];
+[assembly: System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Media.Media3D")];
+[assembly: System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Media.Imaging")];
+[assembly: System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Media.Effects")];
+[assembly: System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Input")];
+[assembly: System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Ink")];
+[assembly: System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Media.TextFormatting")];
+[assembly: System::Windows::Markup::XmlnsDefinition("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "System.Windows.Automation")];
+[assembly: System::Windows::Markup::XmlnsPrefix("http://schemas.microsoft.com/netfx/2009/xaml/presentation", "wpf")];
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj
index 73dcdc1175f..fcccd856b02 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj
@@ -17,7 +17,6 @@
   <ItemGroup>
     <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
     <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
-    <Compile Include="$(WpfSourceDir)PresentationCore\OtherAssemblyAttrs.cs" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/otherassemblyattrs.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/otherassemblyattrs.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/otherassemblyattrs.cs
rename to src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/otherassemblyattrs.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
index 11a38c78048..9e806458e4b 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
@@ -1433,10 +1433,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)DirectWriteForwarder\DirectWriteForwarder.vcxproj">
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
       <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
-    </ProjectReference>    
+    </ProjectReference>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />    
     <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />    
     <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\UIAutomationTypes.csproj" />
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj
index 032075f6949..489e83bc88a 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj
@@ -1,276 +1,278 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <PropertyGroup>
-
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <Platforms>AnyCPU;x64</Platforms>
-
-    <EnableDefaultItems>false</EnableDefaultItems>
-    
-    <DefineConstants>$(DefineConstants);PRESENTATIONUI</DefineConstants>
-    <NoWarn>$(NoWarn);0618</NoWarn>
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-
-    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
-    <InternalMarkupCompilation>true</InternalMarkupCompilation>
-    <NoInternalTypeHelper>true</NoInternalTypeHelper>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-  </PropertyGroup>
-
-  <!-- Theme files -->
-  <ItemGroup>
-    <Page Include="InstallationError.xaml" />
-    <Page Include="TenFeetInstallationError.xaml" />
-    <Page Include="TenFeetInstallationProgress.xaml" />
-    <Page Include="MS\Internal\Documents\FindToolbar.xaml" />
-    <Page Include="themes\MediaCenterTheme.xaml" />
-    <Page Include="themes\Aero.NormalColor.xaml">
-      <GenerateTheme>true</GenerateTheme>
-    </Page>
-    <Page Include="themes\Aero2.NormalColor.xaml">
-      <GenerateTheme>true</GenerateTheme>
-    </Page>
-    <Page Include="themes\AeroLite.NormalColor.xaml">
-      <GenerateTheme>true</GenerateTheme>
-    </Page>
-    <Page Include="themes\Classic.xaml">
-      <GenerateTheme>true</GenerateTheme>
-    </Page>
-    <Page Include="themes\Generic.xaml">
-      <GenerateTheme>true</GenerateTheme>
-    </Page>
-    <Page Include="themes\Luna.Homestead.xaml">
-      <GenerateTheme>true</GenerateTheme>
-    </Page>
-    <Page Include="themes\Luna.Metallic.xaml">
-      <GenerateTheme>true</GenerateTheme>
-    </Page>
-    <Page Include="themes\Luna.NormalColor.xaml">
-      <GenerateTheme>true</GenerateTheme>
-    </Page>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <!-- 
-      When InternalMarkupCompilation=true, always use @(EmbeddedResource) instead of
-      @(Resource) - @(Resource) gets stripped out by PresentationBuildTasks during 
-      _CompileTemporaryAssembly, and leads to build failures. 
-    --> 
-    <EmbeddedResource Include="Resources\Documents.resx">
-      <XlfInput>false</XlfInput>
-      <GenerateSource>false</GenerateSource>
-      <Generator>ResXFileCodeGenerator</Generator>
-      <StronglyTypedClassName>Resources</StronglyTypedClassName>
-      <StronglyTypedFileName>$(IntermediateOutputPath)\MS.Internal.Documents.Resources.cs</StronglyTypedFileName>
-      <StronglyTypedNameSpace>MS.Internal.Documents</StronglyTypedNameSpace>
-      <StronglyTypedLanguage>CSharp</StronglyTypedLanguage>
-      <ManifestResourceName>MS.Internal.Documents.Resources</ManifestResourceName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Strings.resx" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <Compile Include="$(WpfCommonDir)src\System\SR.cs">
-      <Link>Common\System\SR.cs</Link>
-    </Compile>
-    <Compile Include="SR.cs" />
-    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSharedDir)\MS\Internal\FriendAccessAllowedAttribute.cs" />
-    <Compile Include="OtherAssemblyAttrs.cs" />
-    <Compile Include="InstallationError.xaml.cs" />
-    <Compile Include="PresentationUIStyleResources.cs" />
-    <Compile Include="TenFeetInstallationProgress.xaml.cs" />
-    <Compile Include="TenFeetInstallationError.xaml.cs" />
-    <Compile Include="MS\Internal\Documents\AccountType.cs" />
-    <Compile Include="MS\Internal\Documents\CertificatePriorityStatus.cs" />
-    <Compile Include="MS\Internal\Documents\CredentialManagerDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\CredentialManagerDialog.Designer.cs" />
-    <Compile Include="MS\Internal\Documents\DocumentStatusResources.cs" />
-    <Compile Include="MS\Internal\Documents\DocumentSignatureManager.cs" />
-    <Compile Include="MS\Internal\Documents\DigitalSignature.cs" />
-    <Compile Include="MS\Internal\Documents\DigitalSignatureProvider.cs" />
-    <Compile Include="MS\Internal\Documents\DialogBaseForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\DialogDivider.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\FindToolbar.xaml.cs" />
-    <Compile Include="MS\Internal\Documents\IDigitalSignatureProvider.cs" />
-    <Compile Include="MS\Internal\Documents\PeoplePickerWrapper.cs" />
-    <Compile Include="MS\Internal\Documents\RequestedSignatureDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\RequestedSignatureDialog.Designer.cs" />
-    <Compile Include="MS\Internal\Documents\RMEnrollmentPage1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\RMEnrollmentPage1.Designer.cs" />
-    <Compile Include="MS\Internal\Documents\RMEnrollmentPage2.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\RMEnrollmentPage2.Designer.cs" />
-    <Compile Include="MS\Internal\Documents\RMEnrollmentPage3.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\RMEnrollmentPage3.Designer.cs" />
-    <Compile Include="MS\Internal\Documents\RMPermissions.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\RMPermissions.Designer.cs" />
-    <Compile Include="MS\Internal\Documents\RMPublishingDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\RMPublishingDialog.Designer.cs" />
-    <Compile Include="MS\Internal\Documents\RMPublishingDialog.RightsTable.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\SignaturePolicy.cs" />
-    <Compile Include="MS\Internal\Documents\SignatureResourceHelper.cs" />
-    <Compile Include="MS\Internal\Documents\signaturestatus.cs" />
-    <Compile Include="MS\Internal\Documents\SignatureSummaryDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\SignatureSummaryDialog.Designer.cs" />
-    <Compile Include="MS\Internal\Documents\SigningDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\SigningDialog.Designer.cs " />
-    <Compile Include="MS\Internal\Documents\SigningProgress.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\SigningProgress.Designer.cs" />
-    <Compile Include="MS\Internal\Documents\RightsManagementLicense.cs" />
-    <Compile Include="MS\Internal\Documents\RightsManagementManager.cs" />
-    <Compile Include="MS\Internal\Documents\RightsManagementPermissions.cs" />
-    <Compile Include="MS\Internal\Documents\RightsManagementPolicy.cs" />
-    <Compile Include="MS\Internal\Documents\RightsManagementProvider.cs" />
-    <Compile Include="MS\Internal\Documents\IRightsManagementProvider.cs" />
-    <Compile Include="MS\Internal\Documents\RightsManagementResourceHelper.cs" />
-    <Compile Include="MS\Internal\Documents\RightsManagementStatus.cs" />
-    <Compile Include="MS\Internal\Documents\RightsManagementUser.cs" />
-    <Compile Include="MS\Internal\Documents\DocumentApplicationDocumentViewer.cs" />
-    <Compile Include="MS\Internal\Documents\Application\AddressUtility.cs" />
-    <Compile Include="MS\Internal\Documents\Application\CommandEnforcer.cs" />
-    <Compile Include="MS\Internal\Documents\Application\DocumentApplicationState.cs" />
-    <Compile Include="MS\Internal\Documents\Application\DocumentApplicationJournalEntryEventArgs.cs" />
-    <Compile Include="MS\Internal\Documents\Application\DocumentProperties.cs" />
-    <Compile Include="MS\Internal\Documents\Application\DocumentPropertiesDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MS\Internal\Documents\Application\DocumentPropertiesDialog.Designer.cs" />
-    <Compile Include="MS\Internal\Documents\Application\NativeDirectoryServicesQueryAPIs.cs" />
-    <Compile Include="MS\Internal\Documents\Application\NavigationHelper.cs" />
-    <Compile Include="MS\Internal\Documents\Application\PageTextBox.cs" />
-    <Compile Include="MS\Internal\Documents\Application\RightsManagementErrorHandler.cs" />
-    <Compile Include="MS\Internal\Documents\Application\StatusInfoItem.cs" />
-    <Compile Include="MS\Internal\Documents\Application\XpsViewerException.cs" />
-    <Compile Include="MS\Internal\Documents\Application\ZoomComboBox.cs" />
-    <Compile Include="MS\Internal\Documents\Application\ChainOfDependencies.cs" />
-    <Compile Include="MS\Internal\Documents\Application\ChainOfResponsibility.cs" />
-    <Compile Include="MS\Internal\Documents\Application\CriticalFileToken.cs" />
-    <Compile Include="MS\Internal\Documents\Application\Document.cs" />
-    <Compile Include="MS\Internal\Documents\Application\DocumentManager.cs" />
-    <Compile Include="MS\Internal\Documents\Application\DocumentStream.cs" />
-    <Compile Include="MS\Internal\Documents\Application\FileController.cs" />
-    <Compile Include="MS\Internal\Documents\Application\FileDocument.cs" />
-    <Compile Include="MS\Internal\Documents\Application\FilePresentation.cs" />
-    <Compile Include="MS\Internal\Documents\Application\HostedController.cs" />
-    <Compile Include="MS\Internal\Documents\Application\IChainOfDependenciesNode.cs" />
-    <Compile Include="MS\Internal\Documents\Application\IChainOfResponsibiltyNode.cs" />
-    <Compile Include="MS\Internal\Documents\Application\IDocumentController.cs" />
-    <Compile Include="MS\Internal\Documents\Application\PackageController.cs" />
-    <Compile Include="MS\Internal\Documents\Application\PackageDocument.cs" />
-    <Compile Include="MS\Internal\Documents\Application\RestrictedTransactionalPackage.cs" />
-    <Compile Include="MS\Internal\Documents\Application\RightsController.cs" />
-    <Compile Include="MS\Internal\Documents\Application\RightsDocument.cs" />
-    <Compile Include="MS\Internal\Documents\Application\RightsManagementSuppressedStream.cs" />
-    <Compile Include="MS\Internal\Documents\Application\SuppressedPackageProperties.cs" />
-    <Compile Include="MS\Internal\Documents\Application\StreamDocument.cs" />
-    <Compile Include="MS\Internal\Documents\Application\StreamHelper.cs" />
-    <Compile Include="MS\Internal\Documents\Application\StreamProxy.cs" />
-    <Compile Include="MS\Internal\Documents\Application\Trace.cs" />
-    <Compile Include="MS\Internal\Documents\Application\TransactionalPackage.cs" />
-    <Compile Include="MS\Internal\Documents\Application\WriteableOnDemandPackagePart.cs" />
-    <Compile Include="MS\Internal\Documents\Application\WriteableOnDemandStream.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Printing\System.Printing.vcxproj">
-      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
-    </ProjectReference>
-    <ProjectReference Include="$(WpfSourceDir)ReachFramework\ReachFramework.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\UIAutomationTypes.csproj" />
-
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-
-    <ProjectReference Include="$(WpfSourceDir)PresentationUI\ref\PresentationUI-ref.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Private.Winforms" Version="$(MicrosoftPrivateWinformsVersion)" />
-    <PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
-    <PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />
-    <PackageReference Include="$(SystemDirectoryServicesPackage)" Version="$(SystemDirectoryServicesVersion)" />
-    <PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
-  </ItemGroup>
-
-  <!-- 
-    Minimal set of references needed to build PresentationUI
-  -->
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-  </ItemGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-  
-  <Target Name="AfterBuild" Inputs="@(Page)" Outputs="$(OutputPath)sdk\PUI.%(Page.Filename)%(Page.Extension)">
-    <Exec Command="$(PerlCommand) ThemeGenerator.pl %(Page.Identity) @(Page -> '$(IntermediateOutputPath)PUI.%(Filename)%(Extension)')" Condition="'%(Page.GenerateTheme)' == 'true'" StandardOutputImportance="normal" />
-    <ItemGroup>
-      <DataFile Condition="'%(Page.GenerateTheme)' == 'true' and Exists('$(IntermediateOutputPath)PUI.%(Page.Filename)%(Page.Extension)')" Include="$(IntermediateOutputPath)PUI.%(Page.Filename)%(Page.Extension)">
-        <SubFolder>sdk</SubFolder>
-      </DataFile>
-    </ItemGroup>
-  </Target>
-  
-  <PropertyGroup>
-    <!-- We don't use the designer for creating the strongly-typed resource class so we must ensure that ResGen runs before MarkupCompile -->
-    <PrepareResourcesDependsOn>
-      PrepareResourceNames;
-      ResGen;
-      $(PrepareResourcesDependsOn);
-    </PrepareResourcesDependsOn>
-  </PropertyGroup>
-</Project>
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <Platforms>AnyCPU;x64</Platforms>
+
+    <EnableDefaultItems>false</EnableDefaultItems>
+    
+    <DefineConstants>$(DefineConstants);PRESENTATIONUI</DefineConstants>
+    <NoWarn>$(NoWarn);0618</NoWarn>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+
+    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
+    <InternalMarkupCompilation>true</InternalMarkupCompilation>
+    <NoInternalTypeHelper>true</NoInternalTypeHelper>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+
+  <!-- Theme files -->
+  <ItemGroup>
+    <Page Include="InstallationError.xaml" />
+    <Page Include="TenFeetInstallationError.xaml" />
+    <Page Include="TenFeetInstallationProgress.xaml" />
+    <Page Include="MS\Internal\Documents\FindToolbar.xaml" />
+    <Page Include="themes\MediaCenterTheme.xaml" />
+    <Page Include="themes\Aero.NormalColor.xaml">
+      <GenerateTheme>true</GenerateTheme>
+    </Page>
+    <Page Include="themes\Aero2.NormalColor.xaml">
+      <GenerateTheme>true</GenerateTheme>
+    </Page>
+    <Page Include="themes\AeroLite.NormalColor.xaml">
+      <GenerateTheme>true</GenerateTheme>
+    </Page>
+    <Page Include="themes\Classic.xaml">
+      <GenerateTheme>true</GenerateTheme>
+    </Page>
+    <Page Include="themes\Generic.xaml">
+      <GenerateTheme>true</GenerateTheme>
+    </Page>
+    <Page Include="themes\Luna.Homestead.xaml">
+      <GenerateTheme>true</GenerateTheme>
+    </Page>
+    <Page Include="themes\Luna.Metallic.xaml">
+      <GenerateTheme>true</GenerateTheme>
+    </Page>
+    <Page Include="themes\Luna.NormalColor.xaml">
+      <GenerateTheme>true</GenerateTheme>
+    </Page>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <!-- 
+      When InternalMarkupCompilation=true, always use @(EmbeddedResource) instead of
+      @(Resource) - @(Resource) gets stripped out by PresentationBuildTasks during 
+      _CompileTemporaryAssembly, and leads to build failures. 
+    --> 
+    <EmbeddedResource Include="Resources\Documents.resx">
+      <XlfInput>false</XlfInput>
+      <GenerateSource>false</GenerateSource>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <StronglyTypedClassName>Resources</StronglyTypedClassName>
+      <StronglyTypedFileName>$(IntermediateOutputPath)\MS.Internal.Documents.Resources.cs</StronglyTypedFileName>
+      <StronglyTypedNameSpace>MS.Internal.Documents</StronglyTypedNameSpace>
+      <StronglyTypedLanguage>CSharp</StronglyTypedLanguage>
+      <ManifestResourceName>MS.Internal.Documents.Resources</ManifestResourceName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Strings.resx" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Compile Include="$(WpfCommonDir)src\System\SR.cs">
+      <Link>Common\System\SR.cs</Link>
+    </Compile>
+    <Compile Include="SR.cs" />
+    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSharedDir)\MS\Internal\FriendAccessAllowedAttribute.cs" />
+    <Compile Include="OtherAssemblyAttrs.cs" />
+    <Compile Include="InstallationError.xaml.cs" />
+    <Compile Include="PresentationUIStyleResources.cs" />
+    <Compile Include="TenFeetInstallationProgress.xaml.cs" />
+    <Compile Include="TenFeetInstallationError.xaml.cs" />
+    <Compile Include="MS\Internal\Documents\AccountType.cs" />
+    <Compile Include="MS\Internal\Documents\CertificatePriorityStatus.cs" />
+    <Compile Include="MS\Internal\Documents\CredentialManagerDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\CredentialManagerDialog.Designer.cs" />
+    <Compile Include="MS\Internal\Documents\DocumentStatusResources.cs" />
+    <Compile Include="MS\Internal\Documents\DocumentSignatureManager.cs" />
+    <Compile Include="MS\Internal\Documents\DigitalSignature.cs" />
+    <Compile Include="MS\Internal\Documents\DigitalSignatureProvider.cs" />
+    <Compile Include="MS\Internal\Documents\DialogBaseForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\DialogDivider.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\FindToolbar.xaml.cs" />
+    <Compile Include="MS\Internal\Documents\IDigitalSignatureProvider.cs" />
+    <Compile Include="MS\Internal\Documents\PeoplePickerWrapper.cs" />
+    <Compile Include="MS\Internal\Documents\RequestedSignatureDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\RequestedSignatureDialog.Designer.cs" />
+    <Compile Include="MS\Internal\Documents\RMEnrollmentPage1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\RMEnrollmentPage1.Designer.cs" />
+    <Compile Include="MS\Internal\Documents\RMEnrollmentPage2.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\RMEnrollmentPage2.Designer.cs" />
+    <Compile Include="MS\Internal\Documents\RMEnrollmentPage3.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\RMEnrollmentPage3.Designer.cs" />
+    <Compile Include="MS\Internal\Documents\RMPermissions.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\RMPermissions.Designer.cs" />
+    <Compile Include="MS\Internal\Documents\RMPublishingDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\RMPublishingDialog.Designer.cs" />
+    <Compile Include="MS\Internal\Documents\RMPublishingDialog.RightsTable.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\SignaturePolicy.cs" />
+    <Compile Include="MS\Internal\Documents\SignatureResourceHelper.cs" />
+    <Compile Include="MS\Internal\Documents\signaturestatus.cs" />
+    <Compile Include="MS\Internal\Documents\SignatureSummaryDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\SignatureSummaryDialog.Designer.cs" />
+    <Compile Include="MS\Internal\Documents\SigningDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\SigningDialog.Designer.cs " />
+    <Compile Include="MS\Internal\Documents\SigningProgress.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\SigningProgress.Designer.cs" />
+    <Compile Include="MS\Internal\Documents\RightsManagementLicense.cs" />
+    <Compile Include="MS\Internal\Documents\RightsManagementManager.cs" />
+    <Compile Include="MS\Internal\Documents\RightsManagementPermissions.cs" />
+    <Compile Include="MS\Internal\Documents\RightsManagementPolicy.cs" />
+    <Compile Include="MS\Internal\Documents\RightsManagementProvider.cs" />
+    <Compile Include="MS\Internal\Documents\IRightsManagementProvider.cs" />
+    <Compile Include="MS\Internal\Documents\RightsManagementResourceHelper.cs" />
+    <Compile Include="MS\Internal\Documents\RightsManagementStatus.cs" />
+    <Compile Include="MS\Internal\Documents\RightsManagementUser.cs" />
+    <Compile Include="MS\Internal\Documents\DocumentApplicationDocumentViewer.cs" />
+    <Compile Include="MS\Internal\Documents\Application\AddressUtility.cs" />
+    <Compile Include="MS\Internal\Documents\Application\CommandEnforcer.cs" />
+    <Compile Include="MS\Internal\Documents\Application\DocumentApplicationState.cs" />
+    <Compile Include="MS\Internal\Documents\Application\DocumentApplicationJournalEntryEventArgs.cs" />
+    <Compile Include="MS\Internal\Documents\Application\DocumentProperties.cs" />
+    <Compile Include="MS\Internal\Documents\Application\DocumentPropertiesDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MS\Internal\Documents\Application\DocumentPropertiesDialog.Designer.cs" />
+    <Compile Include="MS\Internal\Documents\Application\NativeDirectoryServicesQueryAPIs.cs" />
+    <Compile Include="MS\Internal\Documents\Application\NavigationHelper.cs" />
+    <Compile Include="MS\Internal\Documents\Application\PageTextBox.cs" />
+    <Compile Include="MS\Internal\Documents\Application\RightsManagementErrorHandler.cs" />
+    <Compile Include="MS\Internal\Documents\Application\StatusInfoItem.cs" />
+    <Compile Include="MS\Internal\Documents\Application\XpsViewerException.cs" />
+    <Compile Include="MS\Internal\Documents\Application\ZoomComboBox.cs" />
+    <Compile Include="MS\Internal\Documents\Application\ChainOfDependencies.cs" />
+    <Compile Include="MS\Internal\Documents\Application\ChainOfResponsibility.cs" />
+    <Compile Include="MS\Internal\Documents\Application\CriticalFileToken.cs" />
+    <Compile Include="MS\Internal\Documents\Application\Document.cs" />
+    <Compile Include="MS\Internal\Documents\Application\DocumentManager.cs" />
+    <Compile Include="MS\Internal\Documents\Application\DocumentStream.cs" />
+    <Compile Include="MS\Internal\Documents\Application\FileController.cs" />
+    <Compile Include="MS\Internal\Documents\Application\FileDocument.cs" />
+    <Compile Include="MS\Internal\Documents\Application\FilePresentation.cs" />
+    <Compile Include="MS\Internal\Documents\Application\HostedController.cs" />
+    <Compile Include="MS\Internal\Documents\Application\IChainOfDependenciesNode.cs" />
+    <Compile Include="MS\Internal\Documents\Application\IChainOfResponsibiltyNode.cs" />
+    <Compile Include="MS\Internal\Documents\Application\IDocumentController.cs" />
+    <Compile Include="MS\Internal\Documents\Application\PackageController.cs" />
+    <Compile Include="MS\Internal\Documents\Application\PackageDocument.cs" />
+    <Compile Include="MS\Internal\Documents\Application\RestrictedTransactionalPackage.cs" />
+    <Compile Include="MS\Internal\Documents\Application\RightsController.cs" />
+    <Compile Include="MS\Internal\Documents\Application\RightsDocument.cs" />
+    <Compile Include="MS\Internal\Documents\Application\RightsManagementSuppressedStream.cs" />
+    <Compile Include="MS\Internal\Documents\Application\SuppressedPackageProperties.cs" />
+    <Compile Include="MS\Internal\Documents\Application\StreamDocument.cs" />
+    <Compile Include="MS\Internal\Documents\Application\StreamHelper.cs" />
+    <Compile Include="MS\Internal\Documents\Application\StreamProxy.cs" />
+    <Compile Include="MS\Internal\Documents\Application\Trace.cs" />
+    <Compile Include="MS\Internal\Documents\Application\TransactionalPackage.cs" />
+    <Compile Include="MS\Internal\Documents\Application\WriteableOnDemandPackagePart.cs" />
+    <Compile Include="MS\Internal\Documents\Application\WriteableOnDemandStream.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Printing\System.Printing.vcxproj">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)ReachFramework\ReachFramework.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\UIAutomationTypes.csproj" />
+
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+
+    <ProjectReference Include="$(WpfSourceDir)PresentationUI\ref\PresentationUI-ref.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Private.Winforms" Version="$(MicrosoftPrivateWinformsVersion)" />
+    <PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
+    <PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />
+    <PackageReference Include="$(SystemDirectoryServicesPackage)" Version="$(SystemDirectoryServicesVersion)" />
+    <PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
+  </ItemGroup>
+
+  <!-- 
+    Minimal set of references needed to build PresentationUI
+  -->
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+  </ItemGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+  
+  <Target Name="AfterBuild" Inputs="@(Page)" Outputs="$(OutputPath)sdk\PUI.%(Page.Filename)%(Page.Extension)">
+    <Exec Command="$(PerlCommand) ThemeGenerator.pl %(Page.Identity) @(Page -> '$(IntermediateOutputPath)PUI.%(Filename)%(Extension)')" Condition="'%(Page.GenerateTheme)' == 'true'" StandardOutputImportance="normal" />
+    <ItemGroup>
+      <DataFile Condition="'%(Page.GenerateTheme)' == 'true' and Exists('$(IntermediateOutputPath)PUI.%(Page.Filename)%(Page.Extension)')" Include="$(IntermediateOutputPath)PUI.%(Page.Filename)%(Page.Extension)">
+        <SubFolder>sdk</SubFolder>
+      </DataFile>
+    </ItemGroup>
+  </Target>
+  
+  <PropertyGroup>
+    <!-- We don't use the designer for creating the strongly-typed resource class so we must ensure that ResGen runs before MarkupCompile -->
+    <PrepareResourcesDependsOn>
+      PrepareResourceNames;
+      ResGen;
+      $(PrepareResourcesDependsOn);
+    </PrepareResourcesDependsOn>
+  </PropertyGroup>
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ILLinkTrim.xml b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ILLinkTrim.xml
deleted file mode 100644
index b5957362218..00000000000
--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ILLinkTrim.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<linker>
-  <!-- Include dependencies of System.Printing, which is not
-       analyzed by the linker. -->
-  <assembly fullname="System.Diagnostics.Debug" />
-  <assembly fullname="mscorlib" />
-  <assembly fullname="netstandard" />
-</linker>
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj
index c2301de6145..b63980ebc7d 100644
--- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/ReachFramework.csproj
@@ -21,29 +21,6 @@
       <LogicalName>System.Printing.resources</LogicalName>
       <ManifestResourceName>System.Printing.resources</ManifestResourceName>
     </EmbeddedResource>
-    
-    <!-- 
-        Workaround for https://github.com/dotnet/wpf/issues/1385
-        ReadyToRun images of WPF applications crash 
-        
-        When producing ReadyToRun images, the ILLinker is configured to skip 
-        C++/CLI images. See https://github.com/mono/linker/issues/651 and 
-        https://github.com/mono/linker/pull/658. 
-        
-        In turn, this results in the failure of the dependencies of such assemblies from being
-        identified and included in the ReadyToRun images. 
-        
-        This linker hint exists to ensure that such dependencies are included. We need
-        to place these hints in an assembly that has a reference to the corresponding
-        C++/CLI assembly. 
-        
-             PresentationCore -> DirectWriteFowarder
-             ReachFramework -> System.Printing
-    -->    
-    <EmbeddedResource Condition="Exists('ILLinkTrim.xml')" Include="ILLinkTrim.xml">
-      <XlfInput>false</XlfInput>
-      <LogicalName>$(AssemblyName).xml</LogicalName>
-    </EmbeddedResource>
   </ItemGroup>
   
   <ItemGroup>
@@ -369,8 +346,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)DirectWriteForwarder\DirectWriteForwarder.vcxproj">
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
       <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
     </ProjectReference>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/RefAssemblyAttrs.cs b/src/Microsoft.DotNet.Wpf/src/Shared/RefAssemblyAttrs.cs
index f1f9c937c03..20d37fcd8a3 100644
--- a/src/Microsoft.DotNet.Wpf/src/Shared/RefAssemblyAttrs.cs
+++ b/src/Microsoft.DotNet.Wpf/src/Shared/RefAssemblyAttrs.cs
@@ -5,6 +5,7 @@
 // The C++ version of these definitions is in inc\BuildInfo.hxx.
 
 using System;
+using System.Runtime.CompilerServices;
 using System.Text;
 
 #if WINDOWS_BASE
@@ -17,8 +18,6 @@ namespace MS.Internal.PresentationFramework
 namespace MS.Internal.ReachFramework
 #elif UIAUTOMATIONTYPES
 namespace MS.Internal.UIAutomationTypes
-#elif DIRECTWRITE_FORWARDER
-namespace MS.Internal.DirectWriteForwarder
 #else
 namespace Microsoft.Internal
 #endif
@@ -40,7 +39,6 @@ internal static class BuildInfo
         internal const string DEVDIV_PUBLIC_KEY_TOKEN = "b77a5c561934e089";
 
         // Constants to prevent hardcoding in InternalsVisibleTo attribute
-        internal const string DirectWriteForwarder = "DirectWriteForwarder, PublicKey=" + WCP_PUBLIC_KEY_STRING;
         internal const string PresentationCore = "PresentationCore, PublicKey=" + WCP_PUBLIC_KEY_STRING;
         internal const string PresentationCFFRasterizer = "PresentationCFFRasterizer, PublicKey=" + WCP_PUBLIC_KEY_STRING;
         internal const string PresentationFramework = "PresentationFramework, PublicKey=" + WCP_PUBLIC_KEY_STRING;
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
index 0522136eae9..a9cb4e3310f 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
@@ -1,243 +1,243 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-
-  <PropertyGroup>
-    <CLRSupport>pure</CLRSupport>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- Target .Net Core 3.0 -->
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-  </PropertyGroup>
-  
-  <Import Project="$(WpfCppProps)" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{765E6BBC-772B-4808-BB72-E85615E8F237}</ProjectGuid>
-    <UseClrCrt>true</UseClrCrt>
-    <OutputName>System.Printing</OutputName>
-    <TargetType>DYNLINK</TargetType>
-    <LinkSubSystem>CONSOLE</LinkSubSystem>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(WpfSharedDir)\inc;.\CPP;.\CPP\inc;.\CPP\inc\GDIExporter</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(CDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <CompileAsManaged>pure</CompileAsManaged>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>Win32Inc.hpp</PrecompiledHeaderFile>
-      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>%(AdditionalOptions) /CLRUNMANAGEDCODECHECK:NO /ignore:4042</AdditionalOptions>
-      <LinkTimeCodeGeneration Condition="'$(ConfigurationGroup)'!='Debug'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  
-  <ItemGroup>
-    <Link Include="Shlwapi.lib" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\System.Printing.resx">
-      <ManifestResourceName>System.Printing</ManifestResourceName>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <CLCompile Include="CPP\Win32Inc.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </CLCompile>
-    <CLCompile Include="CPP\src\PrintQueue.cpp" />
-    <CLCompile Include="CPP\src\PrintSystemAttributeValueFactory.cpp" />
-    <CLCompile Include="CPP\src\PrintSystemNotifications.cpp" />
-    <CLCompile Include="CPP\src\PrintSystemAttributeValue.cpp" />
-    <CLCompile Include="CPP\src\PrintSystemUtil.cpp" />
-    <CLCompile Include="CPP\src\PrintSystemObject.cpp" />
-    <CLCompile Include="CPP\src\PrintSystemObjectFactory.cpp" />
-    <CLCompile Include="CPP\src\Driver.cpp" />
-    <CLCompile Include="CPP\src\Filter.cpp" />
-    <CLCompile Include="CPP\src\PrintProcessor.cpp" />
-    <CLCompile Include="CPP\src\Port.cpp" />
-    <CLCompile Include="CPP\src\ObjectsAttributesValuesFactory.cpp" />
-    <CLCompile Include="CPP\src\PrintServer.cpp" />
-    <CLCompile Include="CPP\src\InteropPrinterDefaults.cpp" />
-    <CLCompile Include="CPP\src\InteropDocInfo.cpp" />
-    <CLCompile Include="CPP\src\InteropDevMode.cpp" />
-    <CLCompile Include="CPP\src\InteropPrinterInfo.cpp" />
-    <CLCompile Include="CPP\src\InteropInfoLevelProfile.cpp" />
-    <CLCompile Include="CPP\src\InteropJobInfo.cpp" />
-    <CLCompile Include="CPP\src\GenericTypeMappings.cpp" />
-    <CLCompile Include="CPP\src\GenericPrinterThunkFilter.cpp" />
-    <CLCompile Include="CPP\src\GenericPrinterLevelThunk.cpp" />
-    <CLCompile Include="CPP\src\GenericDriverThunkFilter.cpp" />
-    <CLCompile Include="CPP\src\GenericDriverLevelThunk.cpp" />
-    <CLCompile Include="CPP\src\GenericJobLevelThunk.cpp" />
-    <CLCompile Include="CPP\src\GenericJobThunkFilter.cpp" />
-    <CLCompile Include="CPP\src\GetDataThunkObject.cpp" />
-    <CLCompile Include="CPP\src\SetDataThunkObject.cpp" />
-    <CLCompile Include="CPP\src\EnumDataThunkObject.cpp" />
-    <CLCompile Include="CPP\src\InteropLevelCoverageList.cpp" />
-    <CLCompile Include="CPP\src\InteropPrinterInfoUnmanagedBuilder.cpp" />
-    <CLCompile Include="CPP\src\InteropPrinterHandler.cpp" />
-    <CLCompile Include="CPP\src\InternalPrintSystemException.cpp" />
-    <CLCompile Include="CPP\src\PrintSystemPathResolver.cpp" />
-    <CLCompile Include="CPP\src\LocalPrintServer.cpp" />
-    <CLCompile Include="CPP\src\PrintSystemAssemblyInfo.cpp" />
-    <CLCompile Include="CPP\src\PrintSystemJobInfo.cpp" />
-    <CLCompile Include="CPP\src\LegacyDevice.cpp" />
-    <CLCompile Include="CPP\src\GDIExporter.cpp" />
-    <CLCompile Include="CPP\src\XpsDeviceSimulatingInteropPrinterHandler.cpp" />
-    <CLCompile Include="CPP\src\XpsCompatiblePrinter.cpp" />
-    <CLCompile Include="CPP\src\XPSDocumentWriter.cpp" />
-    <CLCompile Include="CPP\src\XpsPrintJobStream.cpp" />
-    <CLCompile Include="CPP\src\XpsPrintStream.cpp" />
-    <CLCompile Include="CPP\src\PremiumPrintStream.cpp" />
-    <CLCompile Include="CPP\src\PrintJobSettings.cpp" />
-    <CLCompile Include="CPP\src\PrintDocumentImageableArea.cpp" />
-    <CLCompile Include="CPP\src\InteropAttributeValueDictionary.cpp" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <OutputItemType>_defineReference</OutputItemType>
-      <Define>SYSTEMXAML_DLL</Define>
-    </ProjectReference>
-
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <OutputItemType>_defineReference</OutputItemType>
-      <Define>WINDOWSBASE_DLL</Define>
-    </ProjectReference>
-
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <OutputItemType>_defineReference</OutputItemType>
-      <Define>PRESENTATIONCORE_DLL</Define>
-    </ProjectReference>
-
-    <ProjectReference Include="$(WpfCycleBreakersDir)PresentationFramework\PresentationFramework-System.Printing-impl-cycle.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <OutputItemType>_defineReference</OutputItemType>
-      <Define>PRESENTATIONFRAMEWORK_DLL</Define>
-    </ProjectReference>
-    
-    <ProjectReference Include="$(WpfSourceDir)ReachFramework\ReachFramework.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <OutputItemType>_defineReference</OutputItemType>
-      <Define>REACHFRAMEWORK_DLL</Define>
-    </ProjectReference>
-  </ItemGroup>
-
-  <!-- 
-    PackageReferences to pass to CppCliHelper target  
-  -->
-  <ItemGroup>
-    <AdditionalPackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
-    <AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
-  </ItemGroup>
-
-<Target Name="AddDefineReferences" BeforeTargets="ClCompile" AfterTargets="ResolveReferences" Returns="@(CLCompile)">
-    <PropertyGroup>
-      <_defineReferences>@(_defineReference->'%(Define)=&lt;%(Identity)&gt;')</_defineReferences>
-    </PropertyGroup>
-    
-    <!-- 
-        EnsureWpfProjectReference target would have filled in @(MicrosoftDotNetWpfGitHubReference)
-        Prior to that, CppCliHelper would have filled in @(Reference) with all the contents of Microsoft.DotNet.Wpf.GitHub
-        
-        Use this knowledge to resolve reference paths for projects that do not exist locally. 
-        Then remove them from @(Reference) and @(ReferencePath) since these assemblies will be reference using #using
-        in Win32Inc.hpp
-    -->
-    <ItemGroup>
-      <_projectRefsFromFallBacks Remove="@(_projectRefsFromFallBacks)" />
-      <__projectRefsFromFallBacksDeDuped Remove="@(_projectRefsFromFallBacksDeDuped)" />
-    </ItemGroup>
-    
-    <FilterItem1ByItem2 Item1="@(MicrosoftDotNetWpfGitHubReference)" 
-                        Item2="@(Reference->'%(FileName)')"
-                        Metadata2="Identity"
-                        PreserveItem1Metadata="true"
-                        PreserveItem2Metadata="true">
-        <Output ItemName="_projectRefsFromFallBacks" TaskParameter="Result" />
-    </FilterItem1ByItem2>
-    
-    <RemoveDuplicates Inputs="@(_projectRefsFromFallBacks)">
-      <Output TaskParameter="Filtered" ItemName="_projectRefsFromFallBacksDeDuped" />
-    </RemoveDuplicates>
-
-    <ItemGroup>
-      <_projectFallBackHintPaths Include="@(_projectRefsFromFallBacksDeDuped->'%(HintPath)')" />
-    </ItemGroup>
-    
-    <PropertyGroup>
-      <_defineReferences>$(_defineReferences);@(_projectFallBackHintPaths->'%(Define)=&lt;%(RootDir)%(Directory)..\..\lib\$(TargetFramework)\%(Filename).dll&gt;')</_defineReferences>
-    </PropertyGroup>
-    <ItemGroup>
-      <CLCompile>
-        <PreprocessorDefinitions>%(CLCompile.PreprocessorDefinitions);$(_defineReferences)</PreprocessorDefinitions>
-      </CLCompile>
-    </ItemGroup>
-    
-    <ItemGroup>
-      <Reference Remove="@(_projectRefsFromFallBacksDeDuped->'%(OriginalItemSpec)')" />
-      <ReferencePath Remove="@(_projectRefsFromFallBacksDeDuped->'%(OriginalItemSpec)')" />
-    </ItemGroup>
-  </Target>
-
-  <!-- 
-    Ensure that the Reference assembly produced  by System.Printing-ref.csproj is copied to 
-    the appropriate destination folder before it is needed
-  -->
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)System.Printing\ref\System.Printing-ref.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <OutputItemType>SystemPrintingRefDlls</OutputItemType>
-    </ProjectReference>
-  </ItemGroup>
-  
-  <PropertyGroup>
-    <PreparePackageAssetsDependsOn>
-      $(PreparePackageAssetsDependsOn);
-      CopySystemPrintingReferenceAssemblyToReferenceAssemblyDir
-    </PreparePackageAssetsDependsOn>
-  </PropertyGroup>
-
-  <Target Name="CopySystemPrintingReferenceAssemblyToReferenceAssemblyDir">
-    <PropertyGroup>
-      <SystemPrintingRefDll>@(SystemPrintingRefDlls)</SystemPrintingRefDll>
-    </PropertyGroup>
-    
-    <Copy SourceFiles="$(SystemPrintingRefDll)"
-          DestinationFolder="$(ReferenceAssemblyDir)"
-          Condition="!Exists('$(ReferenceAssemblyDir)$(SystemPrintingRefDll)')" />
-  </Target>
-
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup>
+    <CLRSupport>pure</CLRSupport>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Target .Net Core 3.0 -->
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
+  </PropertyGroup>
+  
+  <Import Project="$(WpfCppProps)" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{765E6BBC-772B-4808-BB72-E85615E8F237}</ProjectGuid>
+    <UseClrCrt>true</UseClrCrt>
+    <OutputName>System.Printing</OutputName>
+    <TargetType>DYNLINK</TargetType>
+    <LinkSubSystem>CONSOLE</LinkSubSystem>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(WpfSharedDir)\inc;.\CPP;.\CPP\inc;.\CPP\inc\GDIExporter</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(CDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAsManaged>pure</CompileAsManaged>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>Win32Inc.hpp</PrecompiledHeaderFile>
+      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
+    </ClCompile>
+    <Link>
+      <AdditionalOptions>%(AdditionalOptions) /CLRUNMANAGEDCODECHECK:NO /ignore:4042</AdditionalOptions>
+      <LinkTimeCodeGeneration Condition="'$(ConfigurationGroup)'!='Debug'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </Link>
+  </ItemDefinitionGroup>
+  
+  <ItemGroup>
+    <Link Include="Shlwapi.lib" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\System.Printing.resx">
+      <ManifestResourceName>System.Printing</ManifestResourceName>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <CLCompile Include="CPP\Win32Inc.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </CLCompile>
+    <CLCompile Include="CPP\src\PrintQueue.cpp" />
+    <CLCompile Include="CPP\src\PrintSystemAttributeValueFactory.cpp" />
+    <CLCompile Include="CPP\src\PrintSystemNotifications.cpp" />
+    <CLCompile Include="CPP\src\PrintSystemAttributeValue.cpp" />
+    <CLCompile Include="CPP\src\PrintSystemUtil.cpp" />
+    <CLCompile Include="CPP\src\PrintSystemObject.cpp" />
+    <CLCompile Include="CPP\src\PrintSystemObjectFactory.cpp" />
+    <CLCompile Include="CPP\src\Driver.cpp" />
+    <CLCompile Include="CPP\src\Filter.cpp" />
+    <CLCompile Include="CPP\src\PrintProcessor.cpp" />
+    <CLCompile Include="CPP\src\Port.cpp" />
+    <CLCompile Include="CPP\src\ObjectsAttributesValuesFactory.cpp" />
+    <CLCompile Include="CPP\src\PrintServer.cpp" />
+    <CLCompile Include="CPP\src\InteropPrinterDefaults.cpp" />
+    <CLCompile Include="CPP\src\InteropDocInfo.cpp" />
+    <CLCompile Include="CPP\src\InteropDevMode.cpp" />
+    <CLCompile Include="CPP\src\InteropPrinterInfo.cpp" />
+    <CLCompile Include="CPP\src\InteropInfoLevelProfile.cpp" />
+    <CLCompile Include="CPP\src\InteropJobInfo.cpp" />
+    <CLCompile Include="CPP\src\GenericTypeMappings.cpp" />
+    <CLCompile Include="CPP\src\GenericPrinterThunkFilter.cpp" />
+    <CLCompile Include="CPP\src\GenericPrinterLevelThunk.cpp" />
+    <CLCompile Include="CPP\src\GenericDriverThunkFilter.cpp" />
+    <CLCompile Include="CPP\src\GenericDriverLevelThunk.cpp" />
+    <CLCompile Include="CPP\src\GenericJobLevelThunk.cpp" />
+    <CLCompile Include="CPP\src\GenericJobThunkFilter.cpp" />
+    <CLCompile Include="CPP\src\GetDataThunkObject.cpp" />
+    <CLCompile Include="CPP\src\SetDataThunkObject.cpp" />
+    <CLCompile Include="CPP\src\EnumDataThunkObject.cpp" />
+    <CLCompile Include="CPP\src\InteropLevelCoverageList.cpp" />
+    <CLCompile Include="CPP\src\InteropPrinterInfoUnmanagedBuilder.cpp" />
+    <CLCompile Include="CPP\src\InteropPrinterHandler.cpp" />
+    <CLCompile Include="CPP\src\InternalPrintSystemException.cpp" />
+    <CLCompile Include="CPP\src\PrintSystemPathResolver.cpp" />
+    <CLCompile Include="CPP\src\LocalPrintServer.cpp" />
+    <CLCompile Include="CPP\src\PrintSystemAssemblyInfo.cpp" />
+    <CLCompile Include="CPP\src\PrintSystemJobInfo.cpp" />
+    <CLCompile Include="CPP\src\LegacyDevice.cpp" />
+    <CLCompile Include="CPP\src\GDIExporter.cpp" />
+    <CLCompile Include="CPP\src\XpsDeviceSimulatingInteropPrinterHandler.cpp" />
+    <CLCompile Include="CPP\src\XpsCompatiblePrinter.cpp" />
+    <CLCompile Include="CPP\src\XPSDocumentWriter.cpp" />
+    <CLCompile Include="CPP\src\XpsPrintJobStream.cpp" />
+    <CLCompile Include="CPP\src\XpsPrintStream.cpp" />
+    <CLCompile Include="CPP\src\PremiumPrintStream.cpp" />
+    <CLCompile Include="CPP\src\PrintJobSettings.cpp" />
+    <CLCompile Include="CPP\src\PrintDocumentImageableArea.cpp" />
+    <CLCompile Include="CPP\src\InteropAttributeValueDictionary.cpp" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>_defineReference</OutputItemType>
+      <Define>SYSTEMXAML_DLL</Define>
+    </ProjectReference>
+
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>_defineReference</OutputItemType>
+      <Define>WINDOWSBASE_DLL</Define>
+    </ProjectReference>
+
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>_defineReference</OutputItemType>
+      <Define>PRESENTATIONCORE_DLL</Define>
+    </ProjectReference>
+
+    <ProjectReference Include="$(WpfCycleBreakersDir)PresentationFramework\PresentationFramework-System.Printing-impl-cycle.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>_defineReference</OutputItemType>
+      <Define>PRESENTATIONFRAMEWORK_DLL</Define>
+    </ProjectReference>
+    
+    <ProjectReference Include="$(WpfSourceDir)ReachFramework\ReachFramework.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>_defineReference</OutputItemType>
+      <Define>REACHFRAMEWORK_DLL</Define>
+    </ProjectReference>
+  </ItemGroup>
+
+  <!-- 
+    PackageReferences to pass to CppCliHelper target  
+  -->
+  <ItemGroup>
+    <AdditionalPackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
+    <AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
+  </ItemGroup>
+
+<Target Name="AddDefineReferences" BeforeTargets="ClCompile" AfterTargets="ResolveReferences" Returns="@(CLCompile)">
+    <PropertyGroup>
+      <_defineReferences>@(_defineReference->'%(Define)=&lt;%(Identity)&gt;')</_defineReferences>
+    </PropertyGroup>
+    
+    <!-- 
+        EnsureWpfProjectReference target would have filled in @(MicrosoftDotNetWpfGitHubReference)
+        Prior to that, CppCliHelper would have filled in @(Reference) with all the contents of Microsoft.DotNet.Wpf.GitHub
+        
+        Use this knowledge to resolve reference paths for projects that do not exist locally. 
+        Then remove them from @(Reference) and @(ReferencePath) since these assemblies will be reference using #using
+        in Win32Inc.hpp
+    -->
+    <ItemGroup>
+      <_projectRefsFromFallBacks Remove="@(_projectRefsFromFallBacks)" />
+      <__projectRefsFromFallBacksDeDuped Remove="@(_projectRefsFromFallBacksDeDuped)" />
+    </ItemGroup>
+    
+    <FilterItem1ByItem2 Item1="@(MicrosoftDotNetWpfGitHubReference)" 
+                        Item2="@(Reference->'%(FileName)')"
+                        Metadata2="Identity"
+                        PreserveItem1Metadata="true"
+                        PreserveItem2Metadata="true">
+        <Output ItemName="_projectRefsFromFallBacks" TaskParameter="Result" />
+    </FilterItem1ByItem2>
+    
+    <RemoveDuplicates Inputs="@(_projectRefsFromFallBacks)">
+      <Output TaskParameter="Filtered" ItemName="_projectRefsFromFallBacksDeDuped" />
+    </RemoveDuplicates>
+
+    <ItemGroup>
+      <_projectFallBackHintPaths Include="@(_projectRefsFromFallBacksDeDuped->'%(HintPath)')" />
+    </ItemGroup>
+    
+    <PropertyGroup>
+      <_defineReferences>$(_defineReferences);@(_projectFallBackHintPaths->'%(Define)=&lt;%(RootDir)%(Directory)..\..\lib\$(TargetFramework)\%(Filename).dll&gt;')</_defineReferences>
+    </PropertyGroup>
+    <ItemGroup>
+      <CLCompile>
+        <PreprocessorDefinitions>%(CLCompile.PreprocessorDefinitions);$(_defineReferences)</PreprocessorDefinitions>
+      </CLCompile>
+    </ItemGroup>
+    
+    <ItemGroup>
+      <Reference Remove="@(_projectRefsFromFallBacksDeDuped->'%(OriginalItemSpec)')" />
+      <ReferencePath Remove="@(_projectRefsFromFallBacksDeDuped->'%(OriginalItemSpec)')" />
+    </ItemGroup>
+  </Target>
+
+  <!-- 
+    Ensure that the Reference assembly produced  by System.Printing-ref.csproj is copied to 
+    the appropriate destination folder before it is needed
+  -->
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)System.Printing\ref\System.Printing-ref.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>SystemPrintingRefDlls</OutputItemType>
+    </ProjectReference>
+  </ItemGroup>
+  
+  <PropertyGroup>
+    <PreparePackageAssetsDependsOn>
+      $(PreparePackageAssetsDependsOn);
+      CopySystemPrintingReferenceAssemblyToReferenceAssemblyDir
+    </PreparePackageAssetsDependsOn>
+  </PropertyGroup>
+
+  <Target Name="CopySystemPrintingReferenceAssemblyToReferenceAssemblyDir">
+    <PropertyGroup>
+      <SystemPrintingRefDll>@(SystemPrintingRefDlls)</SystemPrintingRefDll>
+    </PropertyGroup>
+    
+    <Copy SourceFiles="$(SystemPrintingRefDll)"
+          DestinationFolder="$(ReferenceAssemblyDir)"
+          Condition="!Exists('$(ReferenceAssemblyDir)$(SystemPrintingRefDll)')" />
+  </Target>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/ref/System.Printing-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Printing/ref/System.Printing-ref.csproj
index a0d92a2a7e1..90537b4240b 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Printing/ref/System.Printing-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/ref/System.Printing-ref.csproj
@@ -43,7 +43,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
     <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
     <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/System.Windows.Controls.Ribbon.csproj b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/System.Windows.Controls.Ribbon.csproj
index 63112772439..31049448b22 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/System.Windows.Controls.Ribbon.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/System.Windows.Controls.Ribbon.csproj
@@ -1,228 +1,230 @@
-<Project Sdk="Microsoft.Net.Sdk">
-
-  <PropertyGroup>
-
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <Platforms>AnyCPU;x64</Platforms>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <DefineConstants>$(DefineConstants);RIBBON_IN_FRAMEWORK</DefineConstants>
-    <NoWarn>$(NoWarn);0618</NoWarn>
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-
-    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
-    <InternalMarkupCompilation>true</InternalMarkupCompilation>
-    <NoInternalTypeHelper>true</NoInternalTypeHelper>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-  </PropertyGroup>
-
-  <ItemGroup>
-
-    <Compile Include="AssemblyAttrs.cs" />
-
-    <Compile Include="Resources\SR.cs" />
-    <Compile Include="$(WpfCommonDir)src\System\SR.cs">
-        <Link>Common\System\SR.cs</Link>
-    </Compile>
-
-    <EmbeddedResource Include="Resources\Strings.resx" />
-
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonApplicationMenuAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonButtonAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonCheckBoxAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonControlAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonControlDataAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonControlGroupAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonRadioButtonAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTextBoxAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonToggleButtonAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonToolTipAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonComboBoxAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonContextMenuAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonContextualTabGroupAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonContextualTabGroupDataAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonContextualTabGroupItemsControlAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGalleryAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGalleryCategoryAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGalleryCategoryDataAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGalleryItemAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGalleryItemDataAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGroupAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGroupDataAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGroupHeaderAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonMenuButtonAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonMenuItemDataAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonMenuItemAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonQuickAccessToolBarAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonSeparatorAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonSplitButtonAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTabAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTabDataAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTabHeaderAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTabHeaderDataAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTabHeaderItemsControlAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTitleAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTwoLineTextAutomationPeer.cs" />
-    <Compile Include="Microsoft\Windows\Controls\ActivatingKeyTipEventArgs.cs" />
-    <Compile Include="Microsoft\Windows\Controls\GenericValueConverters.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Generated\PropertyHelper.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Generated\TreeHelper.cs" />
-    <Compile Include="Microsoft\Windows\Controls\KeyTipAccessedEventArgs.cs" />
-    <Compile Include="Microsoft\Windows\Controls\KeyTipAdorner.cs" />
-    <Compile Include="Microsoft\Windows\Controls\KeyTipControl.cs" />
-    <Compile Include="Microsoft\Windows\Controls\KeyTipHorizontalPlacement.cs" />
-    <Compile Include="Microsoft\Windows\Controls\KeyTipService.cs" />
-    <Compile Include="Microsoft\Windows\Controls\KeyTipVerticalPlacement.cs" />
-    <Compile Include="Microsoft\Windows\Controls\TextSearchInternal.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\NativeMethods.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\IContainsStarLayoutManager.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\IProvideStarLayoutInfo.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\IProvideStarLayoutInfoBase.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\ISupportStarLayout.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonContextualTabGroupsPanel.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonGalleryCategoriesPanel.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonGalleryItemsPanel.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonGroupItemsPanel.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonGroupsPanel.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonMenuItemsPanel.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonQuickAccessToolBarOverflowPanel.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonQuickAccessToolBarPanel.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonScrollButtonVisibilityConverter.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonTabHeadersPanel.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonTabsPanel.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonTitlePanel.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonWindowSmallIconConverter.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\StarLayoutInfo.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\Ribbon.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonApplicationMenu.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonApplicationMenuItem.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonApplicationMenuItemLevel.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonApplicationSplitMenuItem.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonButton.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonCheckBox.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonComboBox.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonCommands.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonContextMenu.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonContextualTabGroup.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonContextualTabGroupItemsControl.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControl.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonContentPresenter.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlGroup.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlLength.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlLengthConverter.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlLengthUnitType.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlService.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlSizeDefinition.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlSizeDefinitionCollection.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonDismissPopupEventArgs.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonDismissPopupEventHandler.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonDismissPopupMode.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonDropDownHelper.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonFilterMenuButton.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGallery.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGalleryCategory.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGalleryItem.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGroup.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGroupSizeDefinition.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGroupSizeDefinitionBase.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGroupSizeDefinitionBaseCollection.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGroupTemplateSizeDefinition.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonHelper.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonImageSize.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonKeyTipAndContentSyncHelper.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonMenuButton.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonMenuItem.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonQuickAccessToolBar.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonQuickAccessToolBarCloneEventArgs.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonQuickAccessToolBarCloneEventHandler.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonRadioButton.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonSeparator.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonSplitButton.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonSplitButtonLabelPosition.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonSplitMenuItem.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonTab.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonTabHeader.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonTabHeaderItemsControl.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonTextBox.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonToggleButton.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonToolTip.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonToolTipService.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonTwoLineText.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonWindow.cs" />
-    <Compile Include="Microsoft\Windows\Controls\Ribbon\StringCollectionConverter.cs" />
-    <Compile Include="Microsoft\Windows\Input\CommandHelpers.cs" />
-    <Compile Include="Microsoft\Windows\Input\IPreviewCommand.cs" />
-    <Compile Include="Microsoft\Windows\Input\IPreviewCommandSource.cs" />
-    <Compile Include="MS\Internal\Generated\DoubleUtil.cs" />
-
-  </ItemGroup>
-
-  <!-- Theme files -->
-  <ItemGroup>
-    <Page Include="Themes\Aero.NormalColor.xaml" />
-    <Page Include="Themes\AeroLite.NormalColor.xaml" />
-    <Page Include="Themes\Aero2.NormalColor.xaml" />
-    <Page Include="Themes\Generic.xaml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Resource Include="Images\DefaultSystemIcon.png" />
-    <Resource Include="Images\GlassyDefaultSystemIcon.png" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\UIAutomationTypes.csproj" />
-
-    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Classic\PresentationFramework.Classic.csproj" />
-
-    <ProjectReference Include="$(WpfSourceDir)System.Windows.Controls.Ribbon\ref\System.Windows.Controls.Ribbon-ref.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-
-  </ItemGroup>
-
-  <!-- 
-    Minimal set of references needed to build System.Windows.Controls.Ribbon 
-  -->
-  <ItemGroup>
-
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-    <NetCoreReference Include="System.Collections.Specialized" />
-    <NetCoreReference Include="System.Xml.ReaderWriter" />
-    <NetCoreReference Include="Microsoft.Win32.Primitives" />
-
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.Net.Sdk">
+
+  <PropertyGroup>
+
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <Platforms>AnyCPU;x64</Platforms>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <DefineConstants>$(DefineConstants);RIBBON_IN_FRAMEWORK</DefineConstants>
+    <NoWarn>$(NoWarn);0618</NoWarn>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+
+    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
+    <InternalMarkupCompilation>true</InternalMarkupCompilation>
+    <NoInternalTypeHelper>true</NoInternalTypeHelper>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+  </PropertyGroup>
+
+  <ItemGroup>
+
+    <Compile Include="AssemblyAttrs.cs" />
+
+    <Compile Include="Resources\SR.cs" />
+    <Compile Include="$(WpfCommonDir)src\System\SR.cs">
+        <Link>Common\System\SR.cs</Link>
+    </Compile>
+
+    <EmbeddedResource Include="Resources\Strings.resx" />
+
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonApplicationMenuAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonButtonAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonCheckBoxAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonControlAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonControlDataAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonControlGroupAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonRadioButtonAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTextBoxAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonToggleButtonAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonToolTipAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonComboBoxAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonContextMenuAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonContextualTabGroupAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonContextualTabGroupDataAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonContextualTabGroupItemsControlAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGalleryAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGalleryCategoryAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGalleryCategoryDataAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGalleryItemAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGalleryItemDataAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGroupAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGroupDataAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonGroupHeaderAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonMenuButtonAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonMenuItemDataAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonMenuItemAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonQuickAccessToolBarAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonSeparatorAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonSplitButtonAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTabAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTabDataAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTabHeaderAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTabHeaderDataAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTabHeaderItemsControlAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTitleAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Automation\Peers\RibbonTwoLineTextAutomationPeer.cs" />
+    <Compile Include="Microsoft\Windows\Controls\ActivatingKeyTipEventArgs.cs" />
+    <Compile Include="Microsoft\Windows\Controls\GenericValueConverters.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Generated\PropertyHelper.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Generated\TreeHelper.cs" />
+    <Compile Include="Microsoft\Windows\Controls\KeyTipAccessedEventArgs.cs" />
+    <Compile Include="Microsoft\Windows\Controls\KeyTipAdorner.cs" />
+    <Compile Include="Microsoft\Windows\Controls\KeyTipControl.cs" />
+    <Compile Include="Microsoft\Windows\Controls\KeyTipHorizontalPlacement.cs" />
+    <Compile Include="Microsoft\Windows\Controls\KeyTipService.cs" />
+    <Compile Include="Microsoft\Windows\Controls\KeyTipVerticalPlacement.cs" />
+    <Compile Include="Microsoft\Windows\Controls\TextSearchInternal.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\NativeMethods.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\IContainsStarLayoutManager.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\IProvideStarLayoutInfo.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\IProvideStarLayoutInfoBase.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\ISupportStarLayout.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonContextualTabGroupsPanel.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonGalleryCategoriesPanel.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonGalleryItemsPanel.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonGroupItemsPanel.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonGroupsPanel.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonMenuItemsPanel.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonQuickAccessToolBarOverflowPanel.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonQuickAccessToolBarPanel.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonScrollButtonVisibilityConverter.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonTabHeadersPanel.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonTabsPanel.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonTitlePanel.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\RibbonWindowSmallIconConverter.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Primitives\StarLayoutInfo.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\Ribbon.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonApplicationMenu.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonApplicationMenuItem.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonApplicationMenuItemLevel.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonApplicationSplitMenuItem.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonButton.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonCheckBox.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonComboBox.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonCommands.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonContextMenu.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonContextualTabGroup.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonContextualTabGroupItemsControl.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControl.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonContentPresenter.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlGroup.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlLength.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlLengthConverter.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlLengthUnitType.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlService.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlSizeDefinition.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonControlSizeDefinitionCollection.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonDismissPopupEventArgs.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonDismissPopupEventHandler.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonDismissPopupMode.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonDropDownHelper.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonFilterMenuButton.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGallery.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGalleryCategory.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGalleryItem.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGroup.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGroupSizeDefinition.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGroupSizeDefinitionBase.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGroupSizeDefinitionBaseCollection.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonGroupTemplateSizeDefinition.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonHelper.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonImageSize.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonKeyTipAndContentSyncHelper.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonMenuButton.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonMenuItem.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonQuickAccessToolBar.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonQuickAccessToolBarCloneEventArgs.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonQuickAccessToolBarCloneEventHandler.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonRadioButton.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonSeparator.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonSplitButton.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonSplitButtonLabelPosition.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonSplitMenuItem.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonTab.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonTabHeader.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonTabHeaderItemsControl.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonTextBox.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonToggleButton.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonToolTip.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonToolTipService.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonTwoLineText.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\RibbonWindow.cs" />
+    <Compile Include="Microsoft\Windows\Controls\Ribbon\StringCollectionConverter.cs" />
+    <Compile Include="Microsoft\Windows\Input\CommandHelpers.cs" />
+    <Compile Include="Microsoft\Windows\Input\IPreviewCommand.cs" />
+    <Compile Include="Microsoft\Windows\Input\IPreviewCommandSource.cs" />
+    <Compile Include="MS\Internal\Generated\DoubleUtil.cs" />
+
+  </ItemGroup>
+
+  <!-- Theme files -->
+  <ItemGroup>
+    <Page Include="Themes\Aero.NormalColor.xaml" />
+    <Page Include="Themes\AeroLite.NormalColor.xaml" />
+    <Page Include="Themes\Aero2.NormalColor.xaml" />
+    <Page Include="Themes\Generic.xaml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Resource Include="Images\DefaultSystemIcon.png" />
+    <Resource Include="Images\GlassyDefaultSystemIcon.png" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\UIAutomationTypes.csproj" />
+
+    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Classic\PresentationFramework.Classic.csproj" />
+
+    <ProjectReference Include="$(WpfSourceDir)System.Windows.Controls.Ribbon\ref\System.Windows.Controls.Ribbon-ref.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+
+  </ItemGroup>
+
+  <!-- 
+    Minimal set of references needed to build System.Windows.Controls.Ribbon 
+  -->
+  <ItemGroup>
+
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+    <NetCoreReference Include="System.Collections.Specialized" />
+    <NetCoreReference Include="System.Xml.ReaderWriter" />
+    <NetCoreReference Include="Microsoft.Win32.Primitives" />
+
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/ref/System.Windows.Controls.Ribbon-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/ref/System.Windows.Controls.Ribbon-ref.csproj
index 91a7a7afeeb..a7a2419a280 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/ref/System.Windows.Controls.Ribbon-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/ref/System.Windows.Controls.Ribbon-ref.csproj
@@ -1,75 +1,77 @@
-<Project Sdk="Microsoft.Net.Sdk">
-
-  <PropertyGroup>
-    <AssemblyName>System.Windows.Controls.Ribbon</AssemblyName>
-    <PackageId>System.Windows.Controls.Ribbon-ref</PackageId>
-    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <Platforms>AnyCPU;x64</Platforms>
-    <DefineConstants>$(DefineConstants);RIBBON_IN_FRAMEWORK</DefineConstants>
-    <NoWarn>$(NoWarn);0618</NoWarn>
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-
-    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
-    <NoInternalTypeHelper>true</NoInternalTypeHelper>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
-    <Compile Include="$(WpfSourceDir)System.Windows.Controls.Ribbon\AssemblyAttrs.cs" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\UIAutomationTypes.csproj" />
-    
-    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Classic\ref\PresentationFramework.Classic-ref.csproj" />
-  </ItemGroup>
-
-  <!-- 
-    Minimal set of references needed to build System.Windows.Controls.Ribbon 
-  -->
-  <ItemGroup>
-
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-    <NetCoreReference Include="System.Collections.Specialized" />
-    <NetCoreReference Include="System.Xml.ReaderWriter" />
-    <NetCoreReference Include="Microsoft.Win32.Primitives" />
-
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.Net.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>System.Windows.Controls.Ribbon</AssemblyName>
+    <PackageId>System.Windows.Controls.Ribbon-ref</PackageId>
+    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <Platforms>AnyCPU;x64</Platforms>
+    <DefineConstants>$(DefineConstants);RIBBON_IN_FRAMEWORK</DefineConstants>
+    <NoWarn>$(NoWarn);0618</NoWarn>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+
+    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
+    <NoInternalTypeHelper>true</NoInternalTypeHelper>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
+    <Compile Include="$(WpfSourceDir)System.Windows.Controls.Ribbon\AssemblyAttrs.cs" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationTypes\UIAutomationTypes.csproj" />
+    
+    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Classic\ref\PresentationFramework.Classic-ref.csproj" />
+  </ItemGroup>
+
+  <!-- 
+    Minimal set of references needed to build System.Windows.Controls.Ribbon 
+  -->
+  <ItemGroup>
+
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+    <NetCoreReference Include="System.Collections.Specialized" />
+    <NetCoreReference Include="System.Xml.ReaderWriter" />
+    <NetCoreReference Include="Microsoft.Win32.Primitives" />
+
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/PresentationFramework.Aero.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/PresentationFramework.Aero.csproj
index 0649c381b6c..e7b9df005f4 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/PresentationFramework.Aero.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/PresentationFramework.Aero.csproj
@@ -1,87 +1,89 @@
-<!-- PresentationFramework.Aero -->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-
-    <TargetFramework>netcoreapp3.0</TargetFramework>  
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Platforms>AnyCPU;x64</Platforms>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <!-- THEME_AERO #DEFINE is used in KnownTypeHelper.cs -->
-    <DefineConstants>$(DefineConstants);THEME_AERO</DefineConstants>
-
-    <!-- Explicitly include source files to compile -->
-    <EnableDefaultItems>false</EnableDefaultItems>
-
-    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
-    <InternalMarkupCompilation>true</InternalMarkupCompilation>
-    <NoInternalTypeHelper>true</NoInternalTypeHelper>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-  </PropertyGroup>
-
-  <!-- Compile Targets -->
-  <ItemGroup>
-    <Page Include="Themes\Aero.NormalColor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\PlatformCulture.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\SystemDropShadowChrome.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\KnownTypeHelper.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ScrollChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ScrollGlyph.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ButtonChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ListBoxChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\BulletChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ProgressBarHighlightConverter.cs" />
-    <Compile Include="Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
-  </ItemGroup>
-
-  <!-- Project References -->
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-
-    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Aero\ref\PresentationFramework.Aero-ref.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-
-  <!-- Minimal set of .NET core references -->
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <!-- Additional references beyond the minimal set for PresentationFramework.Aero -->
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-  </ItemGroup>
-
-</Project>
+<!-- PresentationFramework.Aero -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+
+    <TargetFramework>netcoreapp3.0</TargetFramework>  
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <Platforms>AnyCPU;x64</Platforms>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- THEME_AERO #DEFINE is used in KnownTypeHelper.cs -->
+    <DefineConstants>$(DefineConstants);THEME_AERO</DefineConstants>
+
+    <!-- Explicitly include source files to compile -->
+    <EnableDefaultItems>false</EnableDefaultItems>
+
+    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
+    <InternalMarkupCompilation>true</InternalMarkupCompilation>
+    <NoInternalTypeHelper>true</NoInternalTypeHelper>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+
+  <!-- Compile Targets -->
+  <ItemGroup>
+    <Page Include="Themes\Aero.NormalColor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\PlatformCulture.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\SystemDropShadowChrome.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\KnownTypeHelper.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ScrollChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ScrollGlyph.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ButtonChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ListBoxChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\BulletChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ProgressBarHighlightConverter.cs" />
+    <Compile Include="Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
+  </ItemGroup>
+
+  <!-- Project References -->
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+
+    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Aero\ref\PresentationFramework.Aero-ref.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+
+  <!-- Minimal set of .NET core references -->
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <!-- Additional references beyond the minimal set for PresentationFramework.Aero -->
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/ref/PresentationFramework.Aero-ref.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/ref/PresentationFramework.Aero-ref.csproj
index d10a09dbfa1..65b7736c7a8 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/ref/PresentationFramework.Aero-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/ref/PresentationFramework.Aero-ref.csproj
@@ -1,65 +1,67 @@
-<!-- PresentationFramework.Aero -->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <AssemblyName>PresentationFramework.Aero</AssemblyName>
-    <PackageId>PresentationFramework.Aero-ref</PackageId>
-    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>netcoreapp3.0</TargetFramework>  
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Platforms>AnyCPU;x64</Platforms>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <!-- THEME_AERO #DEFINE is used in KnownTypeHelper.cs -->
-    <DefineConstants>$(DefineConstants);THEME_AERO</DefineConstants>
-
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
-  </ItemGroup>
-
-  <!-- Project References -->
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-  </ItemGroup>
-
-  <!-- Minimal set of .NET core references -->
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <!-- Additional references beyond the minimal set for PresentationFramework.Aero -->
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-  </ItemGroup>
-
-</Project>
+<!-- PresentationFramework.Aero -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>PresentationFramework.Aero</AssemblyName>
+    <PackageId>PresentationFramework.Aero-ref</PackageId>
+    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
+    <TargetFramework>netcoreapp3.0</TargetFramework>  
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <Platforms>AnyCPU;x64</Platforms>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- THEME_AERO #DEFINE is used in KnownTypeHelper.cs -->
+    <DefineConstants>$(DefineConstants);THEME_AERO</DefineConstants>
+
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
+  </ItemGroup>
+
+  <!-- Project References -->
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+  </ItemGroup>
+
+  <!-- Minimal set of .NET core references -->
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <!-- Additional references beyond the minimal set for PresentationFramework.Aero -->
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/PresentationFramework.Aero2.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/PresentationFramework.Aero2.csproj
index f4dd676b2a4..42576534ce0 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/PresentationFramework.Aero2.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/PresentationFramework.Aero2.csproj
@@ -1,88 +1,89 @@
-<!-- PresentationFramework.Aero2 -->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-
-    <TargetFramework>netcoreapp3.0</TargetFramework>  
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Platforms>AnyCPU;x64</Platforms>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <!-- THEME_AERO2 #DEFINE is used in KnownTypeHelper.cs -->
-    <DefineConstants>$(DefineConstants);THEME_AERO2</DefineConstants>
-
-    <!-- Explicitly include source files to compile -->
-    <EnableDefaultItems>false</EnableDefaultItems>
-
-    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
-    <InternalMarkupCompilation>true</InternalMarkupCompilation>
-    <NoInternalTypeHelper>true</NoInternalTypeHelper>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-  </PropertyGroup>
-
-  <!-- Compile Targets -->
-  <ItemGroup>
-    <Page Include="Themes\Aero2.NormalColor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\PlatformCulture.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\SystemDropShadowChrome.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\KnownTypeHelper.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ScrollChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ScrollGlyph.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ButtonChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ListBoxChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\BulletChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ProgressBarHighlightConverter.cs" />
-    <Compile Include="Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
-  </ItemGroup>
-
-  <!-- Project References -->
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-
-    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Aero2\ref\PresentationFramework.Aero2-ref.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-
-  <!-- Minimal set of .NET core references -->
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <!-- Additional references beyond the minimal set for PresentationFramework.Aero2 -->
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-  </ItemGroup>
-
-</Project>
-
+<!-- PresentationFramework.Aero2 -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+
+    <TargetFramework>netcoreapp3.0</TargetFramework>  
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <Platforms>AnyCPU;x64</Platforms>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- THEME_AERO2 #DEFINE is used in KnownTypeHelper.cs -->
+    <DefineConstants>$(DefineConstants);THEME_AERO2</DefineConstants>
+
+    <!-- Explicitly include source files to compile -->
+    <EnableDefaultItems>false</EnableDefaultItems>
+
+    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
+    <InternalMarkupCompilation>true</InternalMarkupCompilation>
+    <NoInternalTypeHelper>true</NoInternalTypeHelper>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+
+  <!-- Compile Targets -->
+  <ItemGroup>
+    <Page Include="Themes\Aero2.NormalColor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\PlatformCulture.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\SystemDropShadowChrome.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\KnownTypeHelper.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ScrollChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ScrollGlyph.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ButtonChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ListBoxChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\BulletChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ProgressBarHighlightConverter.cs" />
+    <Compile Include="Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
+  </ItemGroup>
+
+  <!-- Project References -->
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+
+    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Aero2\ref\PresentationFramework.Aero2-ref.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+
+  <!-- Minimal set of .NET core references -->
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <!-- Additional references beyond the minimal set for PresentationFramework.Aero2 -->
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/ref/PresentationFramework.Aero2-ref.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/ref/PresentationFramework.Aero2-ref.csproj
index c9e737ff831..9d8780db9a0 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/ref/PresentationFramework.Aero2-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/ref/PresentationFramework.Aero2-ref.csproj
@@ -1,66 +1,67 @@
-<!-- PresentationFramework.Aero2 -->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <AssemblyName>PresentationFramework.Aero2</AssemblyName>
-    <PackageId>PresentationFramework.Aero2-ref</PackageId>
-    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>netcoreapp3.0</TargetFramework>  
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Platforms>AnyCPU;x64</Platforms>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <!-- THEME_AERO2 #DEFINE is used in KnownTypeHelper.cs -->
-    <DefineConstants>$(DefineConstants);THEME_AERO2</DefineConstants>
-
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
-  </ItemGroup>
-
-  <!-- Project References -->
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-  </ItemGroup>
-
-  <!-- Minimal set of .NET core references -->
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <!-- Additional references beyond the minimal set for PresentationFramework.Aero2 -->
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-  </ItemGroup>
-
-</Project>
-
+<!-- PresentationFramework.Aero2 -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>PresentationFramework.Aero2</AssemblyName>
+    <PackageId>PresentationFramework.Aero2-ref</PackageId>
+    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
+    <TargetFramework>netcoreapp3.0</TargetFramework>  
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <Platforms>AnyCPU;x64</Platforms>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- THEME_AERO2 #DEFINE is used in KnownTypeHelper.cs -->
+    <DefineConstants>$(DefineConstants);THEME_AERO2</DefineConstants>
+
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
+  </ItemGroup>
+
+  <!-- Project References -->
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+  </ItemGroup>
+
+  <!-- Minimal set of .NET core references -->
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <!-- Additional references beyond the minimal set for PresentationFramework.Aero2 -->
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/PresentationFramework.AeroLite.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/PresentationFramework.AeroLite.csproj
index 6ca129e39d3..9959914d76f 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/PresentationFramework.AeroLite.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/PresentationFramework.AeroLite.csproj
@@ -1,86 +1,86 @@
-<!-- PresentationFramework.AeroLite -->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-
-    <TargetFramework>netcoreapp3.0</TargetFramework>  
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Platforms>AnyCPU;x64</Platforms>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <!-- THEME_AEROLITE #DEFINE is used in KnownTypeHelper.cs -->
-    <DefineConstants>$(DefineConstants);THEME_AEROLITE</DefineConstants>
-
-    <!-- Explicitly include source files to compile -->
-    <EnableDefaultItems>false</EnableDefaultItems>
-
-    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
-    <InternalMarkupCompilation>true</InternalMarkupCompilation>
-    <NoInternalTypeHelper>true</NoInternalTypeHelper>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-  </PropertyGroup>
-
-  <!-- Compile Targets -->
-  <ItemGroup>
-    <Page Include="Themes\AeroLite.NormalColor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\PlatformCulture.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\SystemDropShadowChrome.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\KnownTypeHelper.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\ProgressBarBrushConverter.cs" />
-    <Compile Include="Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ScrollChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ScrollGlyph.cs" />
-  </ItemGroup>
-
-  <!-- Project References -->
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-
-    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.AeroLite\ref\PresentationFramework.AeroLite-ref.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-
-  <!-- Minimal set of .NET core references -->
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <!-- Additional references beyond the minimal set for PresentationFramework.AeroLite -->
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-  </ItemGroup>
-
-</Project>
-
-
+<!-- PresentationFramework.AeroLite -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+
+    <TargetFramework>netcoreapp3.0</TargetFramework>  
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <Platforms>AnyCPU;x64</Platforms>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- THEME_AEROLITE #DEFINE is used in KnownTypeHelper.cs -->
+    <DefineConstants>$(DefineConstants);THEME_AEROLITE</DefineConstants>
+
+    <!-- Explicitly include source files to compile -->
+    <EnableDefaultItems>false</EnableDefaultItems>
+
+    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
+    <InternalMarkupCompilation>true</InternalMarkupCompilation>
+    <NoInternalTypeHelper>true</NoInternalTypeHelper>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+
+  <!-- Compile Targets -->
+  <ItemGroup>
+    <Page Include="Themes\AeroLite.NormalColor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\PlatformCulture.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\SystemDropShadowChrome.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\KnownTypeHelper.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\ProgressBarBrushConverter.cs" />
+    <Compile Include="Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ScrollChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ScrollGlyph.cs" />
+  </ItemGroup>
+
+  <!-- Project References -->
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+
+    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.AeroLite\ref\PresentationFramework.AeroLite-ref.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+
+  <!-- Minimal set of .NET core references -->
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <!-- Additional references beyond the minimal set for PresentationFramework.AeroLite -->
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/ref/PresentationFramework.AeroLite-ref.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/ref/PresentationFramework.AeroLite-ref.csproj
index 04b2056feab..f19fecfa4b6 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/ref/PresentationFramework.AeroLite-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/ref/PresentationFramework.AeroLite-ref.csproj
@@ -1,66 +1,66 @@
-<!-- PresentationFramework.AeroLite -->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <AssemblyName>PresentationFramework.AeroLite</AssemblyName>
-    <PackageId>PresentationFramework.AeroLite-ref</PackageId>
-    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>netcoreapp3.0</TargetFramework>  
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Platforms>AnyCPU;x64</Platforms>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <!-- THEME_AEROLITE #DEFINE is used in KnownTypeHelper.cs -->
-    <DefineConstants>$(DefineConstants);THEME_AEROLITE</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
-  </ItemGroup>
-
-  <!-- Project References -->
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-  </ItemGroup>
-
-  <!-- Minimal set of .NET core references -->
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <!-- Additional references beyond the minimal set for PresentationFramework.AeroLite -->
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-  </ItemGroup>
-
-</Project>
-
-
+<!-- PresentationFramework.AeroLite -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>PresentationFramework.AeroLite</AssemblyName>
+    <PackageId>PresentationFramework.AeroLite-ref</PackageId>
+    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
+    <TargetFramework>netcoreapp3.0</TargetFramework>  
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <Platforms>AnyCPU;x64</Platforms>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- THEME_AEROLITE #DEFINE is used in KnownTypeHelper.cs -->
+    <DefineConstants>$(DefineConstants);THEME_AEROLITE</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
+  </ItemGroup>
+
+  <!-- Project References -->
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+  </ItemGroup>
+
+  <!-- Minimal set of .NET core references -->
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <!-- Additional references beyond the minimal set for PresentationFramework.AeroLite -->
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/PresentationFramework.Classic.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/PresentationFramework.Classic.csproj
index 17bee77fe98..9a0b7918d12 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/PresentationFramework.Classic.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/PresentationFramework.Classic.csproj
@@ -1,87 +1,86 @@
-<!-- PresentationFramework.Classic -->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-
-    <TargetFramework>netcoreapp3.0</TargetFramework>  
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Platforms>AnyCPU;x64</Platforms>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <!-- THEME_CLASSIC #DEFINE is used in KnownTypeHelper.cs -->
-    <DefineConstants>$(DefineConstants);THEME_CLASSIC</DefineConstants>
-
-    <!-- Explicitly include source files to compile -->
-    <EnableDefaultItems>false</EnableDefaultItems>
-
-    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
-    <InternalMarkupCompilation>true</InternalMarkupCompilation>
-    <NoInternalTypeHelper>true</NoInternalTypeHelper>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-  </PropertyGroup>
-
-  <!-- Compile Targets -->
-  <ItemGroup>
-    <Page Include="Themes\Classic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\KnownTypeHelper.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\PlatformCulture.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\SystemDropShadowChrome.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\ProgressBarBrushConverter.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ClassicBorderDecorator.cs" />
-    <Compile Include="Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
-  </ItemGroup>
-
-  <!-- Project References -->
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-
-    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Classic\ref\PresentationFramework.Classic-ref.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-
-  <!-- Minimal set of .NET core references -->
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <!-- Additional references beyond the minimal set for PresentationFramework.Classic -->
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-  </ItemGroup>
-
-</Project>
-
-
-
+<!-- PresentationFramework.Classic -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+
+    <TargetFramework>netcoreapp3.0</TargetFramework>  
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <Platforms>AnyCPU;x64</Platforms>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- THEME_CLASSIC #DEFINE is used in KnownTypeHelper.cs -->
+    <DefineConstants>$(DefineConstants);THEME_CLASSIC</DefineConstants>
+
+    <!-- Explicitly include source files to compile -->
+    <EnableDefaultItems>false</EnableDefaultItems>
+
+    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
+    <InternalMarkupCompilation>true</InternalMarkupCompilation>
+    <NoInternalTypeHelper>true</NoInternalTypeHelper>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+  </PropertyGroup>
+
+  <!-- Compile Targets -->
+  <ItemGroup>
+    <Page Include="Themes\Classic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\KnownTypeHelper.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\PlatformCulture.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\SystemDropShadowChrome.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\ProgressBarBrushConverter.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ClassicBorderDecorator.cs" />
+    <Compile Include="Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
+  </ItemGroup>
+
+  <!-- Project References -->
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+
+    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Classic\ref\PresentationFramework.Classic-ref.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+
+  <!-- Minimal set of .NET core references -->
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <!-- Additional references beyond the minimal set for PresentationFramework.Classic -->
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/ref/PresentationFramework.Classic-ref.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/ref/PresentationFramework.Classic-ref.csproj
index a7089b72649..1897a41b24e 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/ref/PresentationFramework.Classic-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/ref/PresentationFramework.Classic-ref.csproj
@@ -1,67 +1,66 @@
-<!-- PresentationFramework.Classic -->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <AssemblyName>PresentationFramework.Classic</AssemblyName>
-    <PackageId>PresentationFramework.Classic-ref</PackageId>
-    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>netcoreapp3.0</TargetFramework>  
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Platforms>AnyCPU;x64</Platforms>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <!-- THEME_CLASSIC #DEFINE is used in KnownTypeHelper.cs -->
-    <DefineConstants>$(DefineConstants);THEME_CLASSIC</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
-  </ItemGroup>
-
-  <!-- Project References -->
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-  </ItemGroup>
-
-  <!-- Minimal set of .NET core references -->
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <!-- Additional references beyond the minimal set for PresentationFramework.Classic -->
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-  </ItemGroup>
-
-</Project>
-
-
-
+<!-- PresentationFramework.Classic -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>PresentationFramework.Classic</AssemblyName>
+    <PackageId>PresentationFramework.Classic-ref</PackageId>
+    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
+    <TargetFramework>netcoreapp3.0</TargetFramework>  
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <Platforms>AnyCPU;x64</Platforms>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- THEME_CLASSIC #DEFINE is used in KnownTypeHelper.cs -->
+    <DefineConstants>$(DefineConstants);THEME_CLASSIC</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
+  </ItemGroup>
+
+  <!-- Project References -->
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+  </ItemGroup>
+
+  <!-- Minimal set of .NET core references -->
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <!-- Additional references beyond the minimal set for PresentationFramework.Classic -->
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/PresentationFramework.Luna.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/PresentationFramework.Luna.csproj
index 6a0e5663775..128de1310fc 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/PresentationFramework.Luna.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/PresentationFramework.Luna.csproj
@@ -1,96 +1,94 @@
-<!-- PresentationFramework.Luna -->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-
-    <TargetFramework>netcoreapp3.0</TargetFramework>  
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Platforms>AnyCPU;x64</Platforms>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <!-- THEME_LUNA #DEFINE is used in KnownTypeHelper.cs -->
-    <DefineConstants>$(DefineConstants);THEME_LUNA</DefineConstants>
-
-    <!-- Explicitly include source files to compile -->
-    <EnableDefaultItems>false</EnableDefaultItems>
-
-    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
-    <InternalMarkupCompilation>true</InternalMarkupCompilation>
-    <NoInternalTypeHelper>true</NoInternalTypeHelper>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-  </PropertyGroup>
-
-  <!-- Compile Targets -->
-  <ItemGroup>
-    <Page Include="Themes\Luna.NormalColor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Luna.Homestead.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Luna.Metallic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\KnownTypeHelper.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\PlatformCulture.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\SystemDropShadowChrome.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\ProgressBarBrushConverter.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\BulletChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ScrollChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ScrollGlyph.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ButtonChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
-  </ItemGroup>
-
-  <!-- Project References -->
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-
-    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Luna\ref\PresentationFramework.Luna-ref.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-
-  <!-- Minimal set of .NET core references -->
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <!-- Additional references beyond the minimal set for PresentationFramework.Luna -->
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-  </ItemGroup>
-
-</Project>
-
-
-
-
+<!-- PresentationFramework.Luna -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+
+    <TargetFramework>netcoreapp3.0</TargetFramework>  
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <Platforms>AnyCPU;x64</Platforms>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- THEME_LUNA #DEFINE is used in KnownTypeHelper.cs -->
+    <DefineConstants>$(DefineConstants);THEME_LUNA</DefineConstants>
+
+    <!-- Explicitly include source files to compile -->
+    <EnableDefaultItems>false</EnableDefaultItems>
+
+    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
+    <InternalMarkupCompilation>true</InternalMarkupCompilation>
+    <NoInternalTypeHelper>true</NoInternalTypeHelper>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+
+  <!-- Compile Targets -->
+  <ItemGroup>
+    <Page Include="Themes\Luna.NormalColor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Luna.Homestead.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Luna.Metallic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\KnownTypeHelper.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\PlatformCulture.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\SystemDropShadowChrome.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\ProgressBarBrushConverter.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\BulletChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ScrollChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ScrollGlyph.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ButtonChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
+  </ItemGroup>
+
+  <!-- Project References -->
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+
+    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Luna\ref\PresentationFramework.Luna-ref.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+
+  <!-- Minimal set of .NET core references -->
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <!-- Additional references beyond the minimal set for PresentationFramework.Luna -->
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/ref/PresentationFramework.Luna-ref.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/ref/PresentationFramework.Luna-ref.csproj
index c57a57f01a7..01fa18c0047 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/ref/PresentationFramework.Luna-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/ref/PresentationFramework.Luna-ref.csproj
@@ -1,68 +1,66 @@
-<!-- PresentationFramework.Luna -->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <AssemblyName>PresentationFramework.Luna</AssemblyName>
-    <PackageId>PresentationFramework.Luna-ref</PackageId>
-    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>netcoreapp3.0</TargetFramework>  
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Platforms>AnyCPU;x64</Platforms>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <!-- THEME_LUNA #DEFINE is used in KnownTypeHelper.cs -->
-    <DefineConstants>$(DefineConstants);THEME_LUNA</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
-  </ItemGroup>
-
-  <!-- Project References -->
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-  </ItemGroup>
-
-  <!-- Minimal set of .NET core references -->
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <!-- Additional references beyond the minimal set for PresentationFramework.Luna -->
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-  </ItemGroup>
-
-</Project>
-
-
-
-
+<!-- PresentationFramework.Luna -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>PresentationFramework.Luna</AssemblyName>
+    <PackageId>PresentationFramework.Luna-ref</PackageId>
+    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
+    <TargetFramework>netcoreapp3.0</TargetFramework>  
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <Platforms>AnyCPU;x64</Platforms>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- THEME_LUNA #DEFINE is used in KnownTypeHelper.cs -->
+    <DefineConstants>$(DefineConstants);THEME_LUNA</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
+  </ItemGroup>
+
+  <!-- Project References -->
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+  </ItemGroup>
+
+  <!-- Minimal set of .NET core references -->
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <!-- Additional references beyond the minimal set for PresentationFramework.Luna -->
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/PresentationFramework.Royale.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/PresentationFramework.Royale.csproj
index f0e2aaf48cc..806ba05e7cf 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/PresentationFramework.Royale.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/PresentationFramework.Royale.csproj
@@ -1,91 +1,88 @@
-<!-- PresentationFramework.Royale -->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-
-    <TargetFramework>netcoreapp3.0</TargetFramework>  
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Platforms>AnyCPU;x64</Platforms>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <!-- THEME_ROYALE #DEFINE is used in KnownTypeHelper.cs -->
-    <DefineConstants>$(DefineConstants);THEME_ROYALE</DefineConstants>
-
-    <!-- Explicitly include source files to compile -->
-    <EnableDefaultItems>false</EnableDefaultItems>
-
-    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
-    <InternalMarkupCompilation>true</InternalMarkupCompilation>
-    <NoInternalTypeHelper>true</NoInternalTypeHelper>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-  </PropertyGroup>
-
-  <!-- Compile Targets -->
-  <ItemGroup>
-    <Page Include="Themes\Royale.NormalColor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\KnownTypeHelper.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\PlatformCulture.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\SystemDropShadowChrome.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\ProgressBarBrushConverter.cs" />
-    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\BulletChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ScrollChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ScrollGlyph.cs" />
-    <Compile Include="Microsoft\Windows\Themes\ButtonChrome.cs" />
-    <Compile Include="Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
-  </ItemGroup>
-
-  <!-- Project References -->
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-
-    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Royale\ref\PresentationFramework.Royale-ref.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-
-  <!-- Minimal set of .NET core references -->
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <!-- Additional references beyond the minimal set for PresentationFramework.Royale -->
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-  </ItemGroup>
-
-</Project>
-
-
-
-
-
+<!-- PresentationFramework.Royale -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+
+    <TargetFramework>netcoreapp3.0</TargetFramework>  
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <Platforms>AnyCPU;x64</Platforms>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- THEME_ROYALE #DEFINE is used in KnownTypeHelper.cs -->
+    <DefineConstants>$(DefineConstants);THEME_ROYALE</DefineConstants>
+
+    <!-- Explicitly include source files to compile -->
+    <EnableDefaultItems>false</EnableDefaultItems>
+
+    <!-- Enable Markup compilation using our own internally build PresentationBuildTasks.dll --> 
+    <InternalMarkupCompilation>true</InternalMarkupCompilation>
+    <NoInternalTypeHelper>true</NoInternalTypeHelper>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+
+  <!-- Compile Targets -->
+  <ItemGroup>
+    <Page Include="Themes\Royale.NormalColor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\KnownTypeHelper.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\PlatformCulture.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\SystemDropShadowChrome.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\ProgressBarBrushConverter.cs" />
+    <Compile Include="$(WpfSourceDir)\Themes\Shared\Microsoft\Windows\Themes\BulletChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ScrollChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ScrollGlyph.cs" />
+    <Compile Include="Microsoft\Windows\Themes\ButtonChrome.cs" />
+    <Compile Include="Microsoft\Windows\Themes\DataGridHeaderBorder.cs" />
+  </ItemGroup>
+
+  <!-- Project References -->
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+
+    <ProjectReference Include="$(WpfSourceDir)Themes\PresentationFramework.Royale\ref\PresentationFramework.Royale-ref.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+
+  <!-- Minimal set of .NET core references -->
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <!-- Additional references beyond the minimal set for PresentationFramework.Royale -->
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/ref/PresentationFramework.Royale-ref.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/ref/PresentationFramework.Royale-ref.csproj
index 929270b4cd6..f439dc97662 100644
--- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/ref/PresentationFramework.Royale-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/ref/PresentationFramework.Royale-ref.csproj
@@ -1,69 +1,66 @@
-<!-- PresentationFramework.Royale -->
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <AssemblyName>PresentationFramework.Royale</AssemblyName>
-    <PackageId>PresentationFramework.Royale-ref</PackageId>
-    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <TargetFramework>netcoreapp3.0</TargetFramework>  
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Platforms>AnyCPU;x64</Platforms>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <!-- THEME_ROYALE #DEFINE is used in KnownTypeHelper.cs -->
-    <DefineConstants>$(DefineConstants);THEME_ROYALE</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
-  </ItemGroup>
-
-  <!-- Project References -->
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />    
-  </ItemGroup>
-
-  <!-- Minimal set of .NET core references -->
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Process" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing.Common" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.IO" />
-    <NetCoreReference Include="System.IO.FileSystem" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
-    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
-    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.ThreadPool" />
-
-    <!-- Additional references beyond the minimal set for PresentationFramework.Royale -->
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-  </ItemGroup>
-
-</Project>
-
-
-
-
-
+<!-- PresentationFramework.Royale -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>PresentationFramework.Royale</AssemblyName>
+    <PackageId>PresentationFramework.Royale-ref</PackageId>
+    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
+    <TargetFramework>netcoreapp3.0</TargetFramework>  
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <Platforms>AnyCPU;x64</Platforms>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- THEME_ROYALE #DEFINE is used in KnownTypeHelper.cs -->
+    <DefineConstants>$(DefineConstants);THEME_ROYALE</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
+  </ItemGroup>
+
+  <!-- Project References -->
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)PresentationUI\PresentationUI.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />    
+  </ItemGroup>
+
+  <!-- Minimal set of .NET core references -->
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Process" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing.Common" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.IO" />
+    <NetCoreReference Include="System.IO.FileSystem" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Security.Cryptography.Algorithms" />
+    <NetCoreReference Include="System.Security.Cryptography.Primitives" />
+    <NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.ThreadPool" />
+
+    <!-- Additional references beyond the minimal set for PresentationFramework.Royale -->
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/AnalyzeFont.txt b/src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/AnalyzeFont.txt
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/AnalyzeFont.txt
rename to src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/AnalyzeFont.txt
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalMonospace.CompositeFont b/src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/GlobalMonospace.CompositeFont
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalMonospace.CompositeFont
rename to src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/GlobalMonospace.CompositeFont
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalSansSerif.CompositeFont b/src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/GlobalSansSerif.CompositeFont
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalSansSerif.CompositeFont
rename to src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/GlobalSansSerif.CompositeFont
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalSerif.CompositeFont b/src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/GlobalSerif.CompositeFont
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalSerif.CompositeFont
rename to src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/GlobalSerif.CompositeFont
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont b/src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/GlobalUserInterface.CompositeFont
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont
rename to src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/GlobalUserInterface.CompositeFont
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/andlso.ttf b/src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/andlso.ttf
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/andlso.ttf
rename to src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/andlso.ttf
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/simpbdo.ttf b/src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/simpbdo.ttf
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/simpbdo.ttf
rename to src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/simpbdo.ttf
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/simpfxo.ttf b/src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/simpfxo.ttf
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/simpfxo.ttf
rename to src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/simpfxo.ttf
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/simpo.ttf b/src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/simpo.ttf
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/simpo.ttf
rename to src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/simpo.ttf
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/tradbdo.ttf b/src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/tradbdo.ttf
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/tradbdo.ttf
rename to src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/tradbdo.ttf
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/trado.ttf b/src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/trado.ttf
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/trado.ttf
rename to src/Microsoft.DotNet.Wpf/src/WindowsBase/Fonts/trado.ttf
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/OtherAssemblyAttrs.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/OtherAssemblyAttrs.cs
index 08e56a0bb63..a3c8bc2f602 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/OtherAssemblyAttrs.cs
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/OtherAssemblyAttrs.cs
@@ -18,7 +18,6 @@
 [assembly:DependencyAttribute("System,", LoadHint.Always)]
 [assembly:DependencyAttribute("System.Xaml,", LoadHint.Sometimes)]
 
-[assembly:InternalsVisibleTo(BuildInfo.DirectWriteForwarder)]
 [assembly:InternalsVisibleTo(BuildInfo.PresentationCore)]
 [assembly:InternalsVisibleTo(BuildInfo.PresentationFramework)]
 [assembly:InternalsVisibleTo(BuildInfo.PresentationUI)]
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj
index 871caa101d6..8aa4e4eb0f0 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj
@@ -439,7 +439,27 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+
+  <!-- 
+    Need Microsoft.WinFx.targets to embed *.compositefont 
+    files using MainResourcesGeneration target
+  -->
+  <PropertyGroup>
+    <InternalMarkupCompilation>true</InternalMarkupCompilation>
+  </PropertyGroup>
   
+  <ItemGroup>
+    <!-- 
+         Note: These resources are used by PresentationCore for font fallbacks. 
+         They must be included here as we cannot use PBT based resources in the PresentationCore.vcxproj merge project. 
+         Adding them to WindowsBase removes the need for a separate resource assembly to feed PresentationCore. 
+    -->
+    <Resource Include="Fonts\*.CompositeFont">
+      <GenerateSource>false</GenerateSource>
+      <XlfSource>false</XlfSource>
+    </Resource>
+  </ItemGroup>
+
   <!-- Including the Microsoft.TextTemplating.targets requires us to manually import Sdk.Targets because
        it needs to be imported after Sdk.targets. This causes the BuildDependsOn variable,
        which is modified by the T4 targets, to be overwritten, so the TransformAll target 
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj
index 2e6d8365d24..dd9b3241efc 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj
@@ -1,78 +1,80 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Platforms>AnyCPU;x64</Platforms>
-    <DefineConstants>$(DefineConstants);WINDOWSFORMSINTEGRATION</DefineConstants>
-    <NoWarn>$(NoWarn);0618</NoWarn>
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="$(WpfSourceDir)WindowsFormsIntegration\Resources\Strings.resx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSharedDir)MS\Win32\NativeMethodsSetLastError.cs" />
-    <Compile Include="OtherAssemblyAttrs.cs" />
-    <Compile Include="SR.cs" />
-    <Compile Include="$(WpfCommonDir)src\System\SR.cs">
-      <Link>Common\System\SR.cs</Link>
-    </Compile>
-    <Compile Include="MS\Win32\DCSafeHandle.cs" />
-    <Compile Include="MS\Win32\ExternDll.cs" />
-    <Compile Include="MS\Win32\NativeMethods.cs" />
-    <Compile Include="MS\Win32\SafeNativeMethods.cs" />
-    <Compile Include="MS\Win32\UnsafeNativeMethods.cs" />
-    <Compile Include="System\Windows\Automation\Peers\WindowsFormsHostAutomationPeer.cs" />
-    <Compile Include="System\Windows\Integration\ApplicationInterop.cs" />
-    <Compile Include="System\Windows\Integration\ChildChangedEventArgs.cs" />
-    <Compile Include="System\Windows\Integration\Convert.cs" />
-    <Compile Include="System\Windows\Integration\ElementHost.cs" />
-    <Compile Include="System\Windows\Integration\ElementHostAutomationPeer.cs" />
-    <Compile Include="System\Windows\Integration\ElementHostPropertyMap.cs" />
-    <Compile Include="System\Windows\Integration\HostUtils.cs" />
-    <Compile Include="System\Windows\Integration\IntegrationExceptionEventArgs.cs" />
-    <Compile Include="System\Windows\Integration\LayoutExceptionEventArgs.cs" />
-    <Compile Include="System\Windows\Integration\PropertyMap.cs" />
-    <Compile Include="System\Windows\Integration\PropertyMappingExceptionEventArgs.cs" />
-    <Compile Include="System\Windows\Integration\WindowsFormsHost.cs" />
-    <Compile Include="System\Windows\Integration\WindowsFormsHostPropertyMap.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-
-    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
-
-    <ProjectReference Include="$(WpfSourceDir)WindowsFormsIntegration\ref\WindowsFormsIntegration-ref.csproj" >
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System" />
-    <NetCoreReference Include="Microsoft.Win32.Primitives" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Threading" />
-    <MicrosoftPrivateWinFormsReference Include="System.Windows.Forms" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="$(SystemDrawingCommonPackage)" Version="$(SystemDrawingCommonVersion)" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Platforms>AnyCPU;x64</Platforms>
+    <DefineConstants>$(DefineConstants);WINDOWSFORMSINTEGRATION</DefineConstants>
+    <NoWarn>$(NoWarn);0618</NoWarn>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(WpfSourceDir)WindowsFormsIntegration\Resources\Strings.resx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSharedDir)MS\Win32\NativeMethodsSetLastError.cs" />
+    <Compile Include="OtherAssemblyAttrs.cs" />
+    <Compile Include="SR.cs" />
+    <Compile Include="$(WpfCommonDir)src\System\SR.cs">
+      <Link>Common\System\SR.cs</Link>
+    </Compile>
+    <Compile Include="MS\Win32\DCSafeHandle.cs" />
+    <Compile Include="MS\Win32\ExternDll.cs" />
+    <Compile Include="MS\Win32\NativeMethods.cs" />
+    <Compile Include="MS\Win32\SafeNativeMethods.cs" />
+    <Compile Include="MS\Win32\UnsafeNativeMethods.cs" />
+    <Compile Include="System\Windows\Automation\Peers\WindowsFormsHostAutomationPeer.cs" />
+    <Compile Include="System\Windows\Integration\ApplicationInterop.cs" />
+    <Compile Include="System\Windows\Integration\ChildChangedEventArgs.cs" />
+    <Compile Include="System\Windows\Integration\Convert.cs" />
+    <Compile Include="System\Windows\Integration\ElementHost.cs" />
+    <Compile Include="System\Windows\Integration\ElementHostAutomationPeer.cs" />
+    <Compile Include="System\Windows\Integration\ElementHostPropertyMap.cs" />
+    <Compile Include="System\Windows\Integration\HostUtils.cs" />
+    <Compile Include="System\Windows\Integration\IntegrationExceptionEventArgs.cs" />
+    <Compile Include="System\Windows\Integration\LayoutExceptionEventArgs.cs" />
+    <Compile Include="System\Windows\Integration\PropertyMap.cs" />
+    <Compile Include="System\Windows\Integration\PropertyMappingExceptionEventArgs.cs" />
+    <Compile Include="System\Windows\Integration\WindowsFormsHost.cs" />
+    <Compile Include="System\Windows\Integration\WindowsFormsHostPropertyMap.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+
+    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
+
+    <ProjectReference Include="$(WpfSourceDir)WindowsFormsIntegration\ref\WindowsFormsIntegration-ref.csproj" >
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System" />
+    <NetCoreReference Include="Microsoft.Win32.Primitives" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Threading" />
+    <MicrosoftPrivateWinFormsReference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="$(SystemDrawingCommonPackage)" Version="$(SystemDrawingCommonVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/ref/WindowsFormsIntegration-ref.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/ref/WindowsFormsIntegration-ref.csproj
index 59f0e0e4a0e..879a2fbcf16 100644
--- a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/ref/WindowsFormsIntegration-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/ref/WindowsFormsIntegration-ref.csproj
@@ -1,48 +1,50 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>WindowsFormsIntegration</AssemblyName>
-    <PackageId>WindowsFormsIntegration-ref</PackageId>
-    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
-    <Platforms>AnyCPU;x64</Platforms>
-    <DefineConstants>$(DefineConstants);WINDOWSFORMSINTEGRATION</DefineConstants>
-    <NoWarn>$(NoWarn);0618</NoWarn>
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
-    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
-    <Compile Include="$(WpfSourceDir)WindowsFormsIntegration\OtherAssemblyAttrs.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-
-    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System" />
-    <NetCoreReference Include="Microsoft.Win32.Primitives" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Diagnostics.TraceSource" />
-    <NetCoreReference Include="System.Drawing" />
-    <NetCoreReference Include="System.Drawing.Primitives" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Runtime" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Threading" />
-    <MicrosoftPrivateWinFormsReference Include="System.Windows.Forms" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="$(SystemDrawingCommonPackage)" Version="$(SystemDrawingCommonVersion)" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyName>WindowsFormsIntegration</AssemblyName>
+    <PackageId>WindowsFormsIntegration-ref</PackageId>
+    <TargetOutputRelPath>$(TargetGroup)-$(PackageId)/</TargetOutputRelPath>
+    <Platforms>AnyCPU;x64</Platforms>
+    <DefineConstants>$(DefineConstants);WINDOWSFORMSINTEGRATION</DefineConstants>
+    <NoWarn>$(NoWarn);0618</NoWarn>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(WpfSharedDir)RefAssemblyAttrs.cs" />
+    <Compile Include="$(WpfSharedDir)ref\AttributesForReferenceAssemblies.cs" />
+    <Compile Include="$(WpfSourceDir)WindowsFormsIntegration\OtherAssemblyAttrs.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+
+    <ProjectReference Include="$(WpfSourceDir)UIAutomation\UIAutomationProvider\UIAutomationProvider.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System" />
+    <NetCoreReference Include="Microsoft.Win32.Primitives" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.ComponentModel.TypeConverter" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Diagnostics.TraceSource" />
+    <NetCoreReference Include="System.Drawing" />
+    <NetCoreReference Include="System.Drawing.Primitives" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Runtime" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Threading" />
+    <MicrosoftPrivateWinFormsReference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="$(SystemDrawingCommonPackage)" Version="$(SystemDrawingCommonVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj
index 337767a61bb..d7e90643d6c 100644
--- a/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj
@@ -8,6 +8,7 @@
       <Platforms>AnyCPU;x64</Platforms>
       <CLSCompliant>false</CLSCompliant>
       <OutputType>Library</OutputType>
+      <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     </PropertyGroup>
 
   <ItemGroup>
@@ -17,5 +18,8 @@
   <ItemGroup>
     <Reference Include="$(PkgMicrosoft_Private_Winforms)\lib\$(TargetFramework)\Accessibility.dll" />
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
index 8b04041b658..dc0f8705972 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
@@ -3,6 +3,7 @@
     <AssemblyName>BamlTestClasses40</AssemblyName>
     <RootNamespace>BamlTestClasses40</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -69,7 +70,9 @@
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
     <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
     <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
-    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
index 028926828d1..252bc793dea 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
@@ -7,6 +7,7 @@
     <Platforms>AnyCPU;x64</Platforms>
     <StartupObject>DrtXaml.XamlDrt</StartupObject>
     <CreateTestPayload>true</CreateTestPayload>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -25,6 +26,9 @@
 
   <ItemGroup>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
index 72ccaf787f5..a9ab88a8202 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
@@ -3,6 +3,7 @@
     <AssemblyName>XamlTestClasses</AssemblyName>
     <RootNamespace>XamlTestClasses</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>
   
   <PropertyGroup>
@@ -17,5 +18,8 @@
 
   <ItemGroup>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.vcxproj" Condition="'$(DesignTimeBuild)'!='true'">
+      <UndefineProperties>TargetFramework;TargetFrameworks</UndefineProperties>
+    </ProjectReference>
   </ItemGroup>
 </Project>