diff --git a/Silk.NET.sln b/Silk.NET.sln
index d665f76e41..ef0e481797 100644
--- a/Silk.NET.sln
+++ b/Silk.NET.sln
@@ -44,31 +44,49 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A5578D12
 		tests\Directory.Build.targets = tests\Directory.Build.targets
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SilkTouch", "sources\SilkTouch\Silk.NET.SilkTouch.csproj", "{76F747A6-D971-4162-BF35-A226177FCA08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SilkTouch", "sources\SilkTouch\SilkTouch\Silk.NET.SilkTouch.csproj", "{76F747A6-D971-4162-BF35-A226177FCA08}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.SilkTouch.UnitTests", "tests\SilkTouch\Silk.NET.SilkTouch.UnitTests.csproj", "{600D712C-4ABF-44C4-96C3-B1DEE1F38298}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.SilkTouch.UnitTests", "tests\SilkTouch\SilkTouch\Silk.NET.SilkTouch.UnitTests.csproj", "{600D712C-4ABF-44C4-96C3-B1DEE1F38298}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{475AEF7B-0154-4989-AF82-97E3A95A96AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Core", "sources\Core\Silk.NET.Core.csproj", "{131C09C1-BF4D-47C1-AF13-4A7E30866B1E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Core", "sources\Core\Core\Silk.NET.Core.csproj", "{131C09C1-BF4D-47C1-AF13-4A7E30866B1E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground", "sources\Playground\Playground.csproj", "{48F43535-3AFC-45E7-A98D-C2609B3B9757}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Core.UnitTests", "tests\Core\Silk.NET.Core.UnitTests.csproj", "{A87E1861-07E4-4B7A-9173-0853370A7D4E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Core.UnitTests", "tests\Core\Core\Silk.NET.Core.UnitTests.csproj", "{A87E1861-07E4-4B7A-9173-0853370A7D4E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Maths", "sources\Maths\Silk.NET.Maths.csproj", "{1B21D783-71C3-48D3-91F5-0EEA90FB0DB2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Maths", "sources\Maths\Maths\Silk.NET.Maths.csproj", "{1B21D783-71C3-48D3-91F5-0EEA90FB0DB2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Maths.Tests", "tests\Maths\Silk.NET.Maths.Tests.csproj", "{01683C11-4721-43AB-B53C-15EBE935B48F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Maths.Tests", "tests\Maths\Maths\Silk.NET.Maths.Tests.csproj", "{01683C11-4721-43AB-B53C-15EBE935B48F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{B681E21A-47A2-4635-96EE-60D8D63FBEA9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Maths.Benchmarks", "eng\benchmarks\Silk.NET.Maths.Benchmarks\Silk.NET.Maths.Benchmarks.csproj", "{AF6C70ED-D6A8-4C57-8DB3-EAFF94396049}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenGL", "sources\OpenGL\Silk.NET.OpenGL.csproj", "{9625C977-25BE-48F3-9B6F-BC94B8B799A6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenGL", "sources\OpenGL\OpenGL\Silk.NET.OpenGL.csproj", "{9625C977-25BE-48F3-9B6F-BC94B8B799A6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SDL", "sources\SDL\Silk.NET.SDL.csproj", "{19B05730-F97E-43D4-B922-DF4697E5CE5F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SDL", "sources\SDL\SDL\Silk.NET.SDL.csproj", "{19B05730-F97E-43D4-B922-DF4697E5CE5F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SDL.UnitTests", "tests\SDL\Silk.NET.SDL.UnitTests.csproj", "{D2B9C43F-A80D-4C9A-9643-BC1AC1B4E807}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SDL.UnitTests", "tests\SDL\SDL\Silk.NET.SDL.UnitTests.csproj", "{D2B9C43F-A80D-4C9A-9643-BC1AC1B4E807}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{5CD096DB-6C44-48F1-9093-AD4C84B6B7EC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Maths", "Maths", "{2452CED9-5211-4A19-BA44-230EC28F409E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenGL", "OpenGL", "{FA31E483-AD35-4E44-B10A-B33C4539DBCB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SilkTouch", "SilkTouch", "{24BD769C-7379-400C-A67F-00C34756DA32}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDL", "SDL", "{EC4D7B06-D277-4411-BD7B-71A6D37683F0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{D9ACA4E5-712F-4F15-B8B8-50C85D23D1D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Maths", "Maths", "{FCD75AA5-1536-433E-BA9B-3D698C2255EB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDL", "SDL", "{49D426BF-A009-43D5-A9E2-EFAAAA7196FC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SilkTouch", "SilkTouch", "{AB25C482-DA9D-4335-8E26-2F29C3700152}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -125,18 +143,27 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{76F747A6-D971-4162-BF35-A226177FCA08} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
-		{600D712C-4ABF-44C4-96C3-B1DEE1F38298} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
-		{131C09C1-BF4D-47C1-AF13-4A7E30866B1E} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
 		{48F43535-3AFC-45E7-A98D-C2609B3B9757} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
-		{A87E1861-07E4-4B7A-9173-0853370A7D4E} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
-		{1B21D783-71C3-48D3-91F5-0EEA90FB0DB2} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
-		{01683C11-4721-43AB-B53C-15EBE935B48F} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
 		{B681E21A-47A2-4635-96EE-60D8D63FBEA9} = {475AEF7B-0154-4989-AF82-97E3A95A96AF}
 		{AF6C70ED-D6A8-4C57-8DB3-EAFF94396049} = {B681E21A-47A2-4635-96EE-60D8D63FBEA9}
-		{9625C977-25BE-48F3-9B6F-BC94B8B799A6} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
-		{19B05730-F97E-43D4-B922-DF4697E5CE5F} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
-		{D2B9C43F-A80D-4C9A-9643-BC1AC1B4E807} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
+		{5CD096DB-6C44-48F1-9093-AD4C84B6B7EC} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
+		{131C09C1-BF4D-47C1-AF13-4A7E30866B1E} = {5CD096DB-6C44-48F1-9093-AD4C84B6B7EC}
+		{2452CED9-5211-4A19-BA44-230EC28F409E} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
+		{FA31E483-AD35-4E44-B10A-B33C4539DBCB} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
+		{24BD769C-7379-400C-A67F-00C34756DA32} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
+		{EC4D7B06-D277-4411-BD7B-71A6D37683F0} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
+		{19B05730-F97E-43D4-B922-DF4697E5CE5F} = {EC4D7B06-D277-4411-BD7B-71A6D37683F0}
+		{76F747A6-D971-4162-BF35-A226177FCA08} = {24BD769C-7379-400C-A67F-00C34756DA32}
+		{1B21D783-71C3-48D3-91F5-0EEA90FB0DB2} = {2452CED9-5211-4A19-BA44-230EC28F409E}
+		{9625C977-25BE-48F3-9B6F-BC94B8B799A6} = {FA31E483-AD35-4E44-B10A-B33C4539DBCB}
+		{D9ACA4E5-712F-4F15-B8B8-50C85D23D1D5} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
+		{FCD75AA5-1536-433E-BA9B-3D698C2255EB} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
+		{49D426BF-A009-43D5-A9E2-EFAAAA7196FC} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
+		{AB25C482-DA9D-4335-8E26-2F29C3700152} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
+		{A87E1861-07E4-4B7A-9173-0853370A7D4E} = {D9ACA4E5-712F-4F15-B8B8-50C85D23D1D5}
+		{01683C11-4721-43AB-B53C-15EBE935B48F} = {FCD75AA5-1536-433E-BA9B-3D698C2255EB}
+		{D2B9C43F-A80D-4C9A-9643-BC1AC1B4E807} = {49D426BF-A009-43D5-A9E2-EFAAAA7196FC}
+		{600D712C-4ABF-44C4-96C3-B1DEE1F38298} = {AB25C482-DA9D-4335-8E26-2F29C3700152}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {78D2CF6A-60A1-43E3-837B-00B73C9DA384}
diff --git a/sources/Core/Abstractions/IBoolScheme.cs b/sources/Core/Core/Abstractions/IBoolScheme.cs
similarity index 100%
rename from sources/Core/Abstractions/IBoolScheme.cs
rename to sources/Core/Core/Abstractions/IBoolScheme.cs
diff --git a/sources/Core/Abstractions/IGLContext.cs b/sources/Core/Core/Abstractions/IGLContext.cs
similarity index 100%
rename from sources/Core/Abstractions/IGLContext.cs
rename to sources/Core/Core/Abstractions/IGLContext.cs
diff --git a/sources/Core/Annotations/CppAttributeListAttribute.cs b/sources/Core/Core/Annotations/CppAttributeListAttribute.cs
similarity index 100%
rename from sources/Core/Annotations/CppAttributeListAttribute.cs
rename to sources/Core/Core/Annotations/CppAttributeListAttribute.cs
diff --git a/sources/Core/Annotations/NativeFunctionAttribute.cs b/sources/Core/Core/Annotations/NativeFunctionAttribute.cs
similarity index 100%
rename from sources/Core/Annotations/NativeFunctionAttribute.cs
rename to sources/Core/Core/Annotations/NativeFunctionAttribute.cs
diff --git a/sources/Core/Annotations/NativeInheritanceAttribute.cs b/sources/Core/Core/Annotations/NativeInheritanceAttribute.cs
similarity index 100%
rename from sources/Core/Annotations/NativeInheritanceAttribute.cs
rename to sources/Core/Core/Annotations/NativeInheritanceAttribute.cs
diff --git a/sources/Core/Annotations/NativeTypeNameAttribute.cs b/sources/Core/Core/Annotations/NativeTypeNameAttribute.cs
similarity index 100%
rename from sources/Core/Annotations/NativeTypeNameAttribute.cs
rename to sources/Core/Core/Annotations/NativeTypeNameAttribute.cs
diff --git a/sources/Core/Annotations/Requires64BitAttribute.cs b/sources/Core/Core/Annotations/Requires64BitAttribute.cs
similarity index 100%
rename from sources/Core/Annotations/Requires64BitAttribute.cs
rename to sources/Core/Core/Annotations/Requires64BitAttribute.cs
diff --git a/sources/Core/Annotations/SetsLastSystemErrorAttribute.cs b/sources/Core/Core/Annotations/SetsLastSystemErrorAttribute.cs
similarity index 100%
rename from sources/Core/Annotations/SetsLastSystemErrorAttribute.cs
rename to sources/Core/Core/Annotations/SetsLastSystemErrorAttribute.cs
diff --git a/sources/Core/Annotations/SupportedApiProfileAttribute.cs b/sources/Core/Core/Annotations/SupportedApiProfileAttribute.cs
similarity index 100%
rename from sources/Core/Annotations/SupportedApiProfileAttribute.cs
rename to sources/Core/Core/Annotations/SupportedApiProfileAttribute.cs
diff --git a/sources/Core/Annotations/TransformedAttribute.cs b/sources/Core/Core/Annotations/TransformedAttribute.cs
similarity index 100%
rename from sources/Core/Annotations/TransformedAttribute.cs
rename to sources/Core/Core/Annotations/TransformedAttribute.cs
diff --git a/sources/Core/Annotations/VtblIndexAttribute.cs b/sources/Core/Core/Annotations/VtblIndexAttribute.cs
similarity index 100%
rename from sources/Core/Annotations/VtblIndexAttribute.cs
rename to sources/Core/Core/Annotations/VtblIndexAttribute.cs
diff --git a/sources/Core/DSL/Constant`2.cs b/sources/Core/Core/DSL/Constant`2.cs
similarity index 100%
rename from sources/Core/DSL/Constant`2.cs
rename to sources/Core/Core/DSL/Constant`2.cs
diff --git a/sources/Core/DSL/Constant`3.cs b/sources/Core/Core/DSL/Constant`3.cs
similarity index 100%
rename from sources/Core/DSL/Constant`3.cs
rename to sources/Core/Core/DSL/Constant`3.cs
diff --git a/sources/Core/DSL/DSL.cs b/sources/Core/Core/DSL/DSL.cs
similarity index 100%
rename from sources/Core/DSL/DSL.cs
rename to sources/Core/Core/DSL/DSL.cs
diff --git a/sources/Core/DSL/Default.cs b/sources/Core/Core/DSL/Default.cs
similarity index 100%
rename from sources/Core/DSL/Default.cs
rename to sources/Core/Core/DSL/Default.cs
diff --git a/sources/Core/DSL/MaybeBool`1.cs b/sources/Core/Core/DSL/MaybeBool`1.cs
similarity index 100%
rename from sources/Core/DSL/MaybeBool`1.cs
rename to sources/Core/Core/DSL/MaybeBool`1.cs
diff --git a/sources/Core/DSL/MaybeBool`2.cs b/sources/Core/Core/DSL/MaybeBool`2.cs
similarity index 100%
rename from sources/Core/DSL/MaybeBool`2.cs
rename to sources/Core/Core/DSL/MaybeBool`2.cs
diff --git a/sources/Core/DSL/VariantBool.cs b/sources/Core/Core/DSL/VariantBool.cs
similarity index 100%
rename from sources/Core/DSL/VariantBool.cs
rename to sources/Core/Core/DSL/VariantBool.cs
diff --git a/sources/Core/FodyWeavers.xml b/sources/Core/Core/FodyWeavers.xml
similarity index 100%
rename from sources/Core/FodyWeavers.xml
rename to sources/Core/Core/FodyWeavers.xml
diff --git a/sources/Core/FodyWeavers.xsd b/sources/Core/Core/FodyWeavers.xsd
similarity index 100%
rename from sources/Core/FodyWeavers.xsd
rename to sources/Core/Core/FodyWeavers.xsd
diff --git a/sources/Core/Loader/DefaultNativeContext.cs b/sources/Core/Core/Loader/DefaultNativeContext.cs
similarity index 100%
rename from sources/Core/Loader/DefaultNativeContext.cs
rename to sources/Core/Core/Loader/DefaultNativeContext.cs
diff --git a/sources/Core/Loader/INativeContext.cs b/sources/Core/Core/Loader/INativeContext.cs
similarity index 100%
rename from sources/Core/Loader/INativeContext.cs
rename to sources/Core/Core/Loader/INativeContext.cs
diff --git a/sources/Core/Loader/LambdaNativeContext.cs b/sources/Core/Core/Loader/LambdaNativeContext.cs
similarity index 100%
rename from sources/Core/Loader/LambdaNativeContext.cs
rename to sources/Core/Core/Loader/LambdaNativeContext.cs
diff --git a/sources/Core/Loader/LoaderInterface.cs b/sources/Core/Core/Loader/LoaderInterface.cs
similarity index 100%
rename from sources/Core/Loader/LoaderInterface.cs
rename to sources/Core/Core/Loader/LoaderInterface.cs
diff --git a/sources/Core/Pointers/NullPtr.cs b/sources/Core/Core/Pointers/NullPtr.cs
similarity index 100%
rename from sources/Core/Pointers/NullPtr.cs
rename to sources/Core/Core/Pointers/NullPtr.cs
diff --git a/sources/Core/Pointers/PointerExtensions.cs b/sources/Core/Core/Pointers/PointerExtensions.cs
similarity index 100%
rename from sources/Core/Pointers/PointerExtensions.cs
rename to sources/Core/Core/Pointers/PointerExtensions.cs
diff --git a/sources/Core/Pointers/Ptr.cs b/sources/Core/Core/Pointers/Ptr.cs
similarity index 100%
rename from sources/Core/Pointers/Ptr.cs
rename to sources/Core/Core/Pointers/Ptr.cs
diff --git a/sources/Core/Pointers/Ptr.generic.cs b/sources/Core/Core/Pointers/Ptr.generic.cs
similarity index 100%
rename from sources/Core/Pointers/Ptr.generic.cs
rename to sources/Core/Core/Pointers/Ptr.generic.cs
diff --git a/sources/Core/Pointers/Ptr2D.cs b/sources/Core/Core/Pointers/Ptr2D.cs
similarity index 100%
rename from sources/Core/Pointers/Ptr2D.cs
rename to sources/Core/Core/Pointers/Ptr2D.cs
diff --git a/sources/Core/Pointers/Ptr2D.generic.cs b/sources/Core/Core/Pointers/Ptr2D.generic.cs
similarity index 100%
rename from sources/Core/Pointers/Ptr2D.generic.cs
rename to sources/Core/Core/Pointers/Ptr2D.generic.cs
diff --git a/sources/Core/Pointers/Ptr3D.cs b/sources/Core/Core/Pointers/Ptr3D.cs
similarity index 100%
rename from sources/Core/Pointers/Ptr3D.cs
rename to sources/Core/Core/Pointers/Ptr3D.cs
diff --git a/sources/Core/Pointers/Ptr3D.generic.cs b/sources/Core/Core/Pointers/Ptr3D.generic.cs
similarity index 100%
rename from sources/Core/Pointers/Ptr3D.generic.cs
rename to sources/Core/Core/Pointers/Ptr3D.generic.cs
diff --git a/sources/Core/Pointers/Ref.cs b/sources/Core/Core/Pointers/Ref.cs
similarity index 100%
rename from sources/Core/Pointers/Ref.cs
rename to sources/Core/Core/Pointers/Ref.cs
diff --git a/sources/Core/Pointers/Ref.generic.cs b/sources/Core/Core/Pointers/Ref.generic.cs
similarity index 100%
rename from sources/Core/Pointers/Ref.generic.cs
rename to sources/Core/Core/Pointers/Ref.generic.cs
diff --git a/sources/Core/Pointers/Ref2D.cs b/sources/Core/Core/Pointers/Ref2D.cs
similarity index 100%
rename from sources/Core/Pointers/Ref2D.cs
rename to sources/Core/Core/Pointers/Ref2D.cs
diff --git a/sources/Core/Pointers/Ref2D.generic.cs b/sources/Core/Core/Pointers/Ref2D.generic.cs
similarity index 100%
rename from sources/Core/Pointers/Ref2D.generic.cs
rename to sources/Core/Core/Pointers/Ref2D.generic.cs
diff --git a/sources/Core/Pointers/Ref3D.cs b/sources/Core/Core/Pointers/Ref3D.cs
similarity index 100%
rename from sources/Core/Pointers/Ref3D.cs
rename to sources/Core/Core/Pointers/Ref3D.cs
diff --git a/sources/Core/Pointers/Ref3D.generic.cs b/sources/Core/Core/Pointers/Ref3D.generic.cs
similarity index 100%
rename from sources/Core/Pointers/Ref3D.generic.cs
rename to sources/Core/Core/Pointers/Ref3D.generic.cs
diff --git a/sources/Core/Silk.NET.Core.cs b/sources/Core/Core/Silk.NET.Core.cs
similarity index 100%
rename from sources/Core/Silk.NET.Core.cs
rename to sources/Core/Core/Silk.NET.Core.cs
diff --git a/sources/Core/Silk.NET.Core.csproj b/sources/Core/Core/Silk.NET.Core.csproj
similarity index 92%
rename from sources/Core/Silk.NET.Core.csproj
rename to sources/Core/Core/Silk.NET.Core.csproj
index b04db0ed69..0d52e372f7 100644
--- a/sources/Core/Silk.NET.Core.csproj
+++ b/sources/Core/Core/Silk.NET.Core.csproj
@@ -17,6 +17,10 @@
     <PackageReference Include="Fody" Version="6.8.1" PrivateAssets="all" />
     <PackageReference Include="InlineIL.Fody" Version="1.8.0" PrivateAssets="all" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Core\" />
+  </ItemGroup>
   
   <!-- Dogfooding -->
   <Import Project="Silk.NET.Core.targets" />
diff --git a/sources/Core/Silk.NET.Core.csproj.DotSettings b/sources/Core/Core/Silk.NET.Core.csproj.DotSettings
similarity index 100%
rename from sources/Core/Silk.NET.Core.csproj.DotSettings
rename to sources/Core/Core/Silk.NET.Core.csproj.DotSettings
diff --git a/sources/Core/Silk.NET.Core.targets b/sources/Core/Core/Silk.NET.Core.targets
similarity index 100%
rename from sources/Core/Silk.NET.Core.targets
rename to sources/Core/Core/Silk.NET.Core.targets
diff --git a/sources/Core/SilkMarshal.cs b/sources/Core/Core/SilkMarshal.cs
similarity index 100%
rename from sources/Core/SilkMarshal.cs
rename to sources/Core/Core/SilkMarshal.cs
diff --git a/sources/Maths/Box2D.cs b/sources/Maths/Maths/Box2D.cs
similarity index 100%
rename from sources/Maths/Box2D.cs
rename to sources/Maths/Maths/Box2D.cs
diff --git a/sources/Maths/Box3D.cs b/sources/Maths/Maths/Box3D.cs
similarity index 100%
rename from sources/Maths/Box3D.cs
rename to sources/Maths/Maths/Box3D.cs
diff --git a/sources/Maths/Circle.cs b/sources/Maths/Maths/Circle.cs
similarity index 100%
rename from sources/Maths/Circle.cs
rename to sources/Maths/Maths/Circle.cs
diff --git a/sources/Maths/Cube.cs b/sources/Maths/Maths/Cube.cs
similarity index 100%
rename from sources/Maths/Cube.cs
rename to sources/Maths/Maths/Cube.cs
diff --git a/sources/Maths/Matrix2X2.Ops.cs b/sources/Maths/Maths/Matrix2X2.Ops.cs
similarity index 100%
rename from sources/Maths/Matrix2X2.Ops.cs
rename to sources/Maths/Maths/Matrix2X2.Ops.cs
diff --git a/sources/Maths/Matrix2X2.cs b/sources/Maths/Maths/Matrix2X2.cs
similarity index 100%
rename from sources/Maths/Matrix2X2.cs
rename to sources/Maths/Maths/Matrix2X2.cs
diff --git a/sources/Maths/Matrix2X3.Ops.cs b/sources/Maths/Maths/Matrix2X3.Ops.cs
similarity index 100%
rename from sources/Maths/Matrix2X3.Ops.cs
rename to sources/Maths/Maths/Matrix2X3.Ops.cs
diff --git a/sources/Maths/Matrix2X3.cs b/sources/Maths/Maths/Matrix2X3.cs
similarity index 100%
rename from sources/Maths/Matrix2X3.cs
rename to sources/Maths/Maths/Matrix2X3.cs
diff --git a/sources/Maths/Matrix2X4.Ops.cs b/sources/Maths/Maths/Matrix2X4.Ops.cs
similarity index 100%
rename from sources/Maths/Matrix2X4.Ops.cs
rename to sources/Maths/Maths/Matrix2X4.Ops.cs
diff --git a/sources/Maths/Matrix2X4.cs b/sources/Maths/Maths/Matrix2X4.cs
similarity index 100%
rename from sources/Maths/Matrix2X4.cs
rename to sources/Maths/Maths/Matrix2X4.cs
diff --git a/sources/Maths/Matrix3X2.Ops.cs b/sources/Maths/Maths/Matrix3X2.Ops.cs
similarity index 100%
rename from sources/Maths/Matrix3X2.Ops.cs
rename to sources/Maths/Maths/Matrix3X2.Ops.cs
diff --git a/sources/Maths/Matrix3X2.cs b/sources/Maths/Maths/Matrix3X2.cs
similarity index 100%
rename from sources/Maths/Matrix3X2.cs
rename to sources/Maths/Maths/Matrix3X2.cs
diff --git a/sources/Maths/Matrix3X3.Ops.cs b/sources/Maths/Maths/Matrix3X3.Ops.cs
similarity index 100%
rename from sources/Maths/Matrix3X3.Ops.cs
rename to sources/Maths/Maths/Matrix3X3.Ops.cs
diff --git a/sources/Maths/Matrix3X3.cs b/sources/Maths/Maths/Matrix3X3.cs
similarity index 100%
rename from sources/Maths/Matrix3X3.cs
rename to sources/Maths/Maths/Matrix3X3.cs
diff --git a/sources/Maths/Matrix3X4.Ops.cs b/sources/Maths/Maths/Matrix3X4.Ops.cs
similarity index 100%
rename from sources/Maths/Matrix3X4.Ops.cs
rename to sources/Maths/Maths/Matrix3X4.Ops.cs
diff --git a/sources/Maths/Matrix3X4.cs b/sources/Maths/Maths/Matrix3X4.cs
similarity index 100%
rename from sources/Maths/Matrix3X4.cs
rename to sources/Maths/Maths/Matrix3X4.cs
diff --git a/sources/Maths/Matrix4X2.Ops.cs b/sources/Maths/Maths/Matrix4X2.Ops.cs
similarity index 100%
rename from sources/Maths/Matrix4X2.Ops.cs
rename to sources/Maths/Maths/Matrix4X2.Ops.cs
diff --git a/sources/Maths/Matrix4X2.cs b/sources/Maths/Maths/Matrix4X2.cs
similarity index 100%
rename from sources/Maths/Matrix4X2.cs
rename to sources/Maths/Maths/Matrix4X2.cs
diff --git a/sources/Maths/Matrix4X3.Ops.cs b/sources/Maths/Maths/Matrix4X3.Ops.cs
similarity index 100%
rename from sources/Maths/Matrix4X3.Ops.cs
rename to sources/Maths/Maths/Matrix4X3.Ops.cs
diff --git a/sources/Maths/Matrix4X3.cs b/sources/Maths/Maths/Matrix4X3.cs
similarity index 100%
rename from sources/Maths/Matrix4X3.cs
rename to sources/Maths/Maths/Matrix4X3.cs
diff --git a/sources/Maths/Matrix4X4.Ops.cs b/sources/Maths/Maths/Matrix4X4.Ops.cs
similarity index 100%
rename from sources/Maths/Matrix4X4.Ops.cs
rename to sources/Maths/Maths/Matrix4X4.Ops.cs
diff --git a/sources/Maths/Matrix4X4.cs b/sources/Maths/Maths/Matrix4X4.cs
similarity index 100%
rename from sources/Maths/Matrix4X4.cs
rename to sources/Maths/Maths/Matrix4X4.cs
diff --git a/sources/Maths/Matrix5X4.Ops.cs b/sources/Maths/Maths/Matrix5X4.Ops.cs
similarity index 100%
rename from sources/Maths/Matrix5X4.Ops.cs
rename to sources/Maths/Maths/Matrix5X4.Ops.cs
diff --git a/sources/Maths/Matrix5X4.cs b/sources/Maths/Maths/Matrix5X4.cs
similarity index 100%
rename from sources/Maths/Matrix5X4.cs
rename to sources/Maths/Maths/Matrix5X4.cs
diff --git a/sources/Maths/Plane.Ops.cs b/sources/Maths/Maths/Plane.Ops.cs
similarity index 100%
rename from sources/Maths/Plane.Ops.cs
rename to sources/Maths/Maths/Plane.Ops.cs
diff --git a/sources/Maths/Plane.cs b/sources/Maths/Maths/Plane.cs
similarity index 100%
rename from sources/Maths/Plane.cs
rename to sources/Maths/Maths/Plane.cs
diff --git a/sources/Maths/PotentionalAdditions.md b/sources/Maths/Maths/PotentionalAdditions.md
similarity index 100%
rename from sources/Maths/PotentionalAdditions.md
rename to sources/Maths/Maths/PotentionalAdditions.md
diff --git a/sources/Maths/PublicAPI/net5.0/PublicAPI.Shipped.txt b/sources/Maths/Maths/PublicAPI/net5.0/PublicAPI.Shipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/net5.0/PublicAPI.Shipped.txt
rename to sources/Maths/Maths/PublicAPI/net5.0/PublicAPI.Shipped.txt
diff --git a/sources/Maths/PublicAPI/net5.0/PublicAPI.Unshipped.txt b/sources/Maths/Maths/PublicAPI/net5.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/net5.0/PublicAPI.Unshipped.txt
rename to sources/Maths/Maths/PublicAPI/net5.0/PublicAPI.Unshipped.txt
diff --git a/sources/Maths/PublicAPI/net6.0-android/PublicAPI.Shipped.txt b/sources/Maths/Maths/PublicAPI/net6.0-android/PublicAPI.Shipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/net6.0-android/PublicAPI.Shipped.txt
rename to sources/Maths/Maths/PublicAPI/net6.0-android/PublicAPI.Shipped.txt
diff --git a/sources/Maths/PublicAPI/net6.0-android/PublicAPI.Unshipped.txt b/sources/Maths/Maths/PublicAPI/net6.0-android/PublicAPI.Unshipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/net6.0-android/PublicAPI.Unshipped.txt
rename to sources/Maths/Maths/PublicAPI/net6.0-android/PublicAPI.Unshipped.txt
diff --git a/sources/Maths/PublicAPI/net6.0-ios/PublicAPI.Shipped.txt b/sources/Maths/Maths/PublicAPI/net6.0-ios/PublicAPI.Shipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/net6.0-ios/PublicAPI.Shipped.txt
rename to sources/Maths/Maths/PublicAPI/net6.0-ios/PublicAPI.Shipped.txt
diff --git a/sources/Maths/PublicAPI/net6.0-ios/PublicAPI.Unshipped.txt b/sources/Maths/Maths/PublicAPI/net6.0-ios/PublicAPI.Unshipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/net6.0-ios/PublicAPI.Unshipped.txt
rename to sources/Maths/Maths/PublicAPI/net6.0-ios/PublicAPI.Unshipped.txt
diff --git a/sources/Maths/PublicAPI/net8.0/PublicAPI.Shipped.txt b/sources/Maths/Maths/PublicAPI/net8.0/PublicAPI.Shipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/net8.0/PublicAPI.Shipped.txt
rename to sources/Maths/Maths/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/sources/Maths/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/sources/Maths/Maths/PublicAPI/net8.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/net8.0/PublicAPI.Unshipped.txt
rename to sources/Maths/Maths/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/sources/Maths/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt b/sources/Maths/Maths/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
rename to sources/Maths/Maths/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
diff --git a/sources/Maths/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt b/sources/Maths/Maths/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
rename to sources/Maths/Maths/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
diff --git a/sources/Maths/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/sources/Maths/Maths/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
rename to sources/Maths/Maths/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
diff --git a/sources/Maths/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/sources/Maths/Maths/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
rename to sources/Maths/Maths/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
diff --git a/sources/Maths/PublicAPI/netstandard2.1/PublicAPI.Shipped.txt b/sources/Maths/Maths/PublicAPI/netstandard2.1/PublicAPI.Shipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/netstandard2.1/PublicAPI.Shipped.txt
rename to sources/Maths/Maths/PublicAPI/netstandard2.1/PublicAPI.Shipped.txt
diff --git a/sources/Maths/PublicAPI/netstandard2.1/PublicAPI.Unshipped.txt b/sources/Maths/Maths/PublicAPI/netstandard2.1/PublicAPI.Unshipped.txt
similarity index 100%
rename from sources/Maths/PublicAPI/netstandard2.1/PublicAPI.Unshipped.txt
rename to sources/Maths/Maths/PublicAPI/netstandard2.1/PublicAPI.Unshipped.txt
diff --git a/sources/Maths/Quaternion.cs b/sources/Maths/Maths/Quaternion.cs
similarity index 100%
rename from sources/Maths/Quaternion.cs
rename to sources/Maths/Maths/Quaternion.cs
diff --git a/sources/Maths/Ray2D.cs b/sources/Maths/Maths/Ray2D.cs
similarity index 100%
rename from sources/Maths/Ray2D.cs
rename to sources/Maths/Maths/Ray2D.cs
diff --git a/sources/Maths/Ray3D.cs b/sources/Maths/Maths/Ray3D.cs
similarity index 100%
rename from sources/Maths/Ray3D.cs
rename to sources/Maths/Maths/Ray3D.cs
diff --git a/sources/Maths/Rectangle.Ops.cs b/sources/Maths/Maths/Rectangle.Ops.cs
similarity index 100%
rename from sources/Maths/Rectangle.Ops.cs
rename to sources/Maths/Maths/Rectangle.Ops.cs
diff --git a/sources/Maths/Rectangle.cs b/sources/Maths/Maths/Rectangle.cs
similarity index 100%
rename from sources/Maths/Rectangle.cs
rename to sources/Maths/Maths/Rectangle.cs
diff --git a/sources/Maths/Scalar.As.cs b/sources/Maths/Maths/Scalar.As.cs
similarity index 100%
rename from sources/Maths/Scalar.As.cs
rename to sources/Maths/Maths/Scalar.As.cs
diff --git a/sources/Maths/Scalar.As.tt b/sources/Maths/Maths/Scalar.As.tt
similarity index 100%
rename from sources/Maths/Scalar.As.tt
rename to sources/Maths/Maths/Scalar.As.tt
diff --git a/sources/Maths/Scalar.BaseOps.cs b/sources/Maths/Maths/Scalar.BaseOps.cs
similarity index 100%
rename from sources/Maths/Scalar.BaseOps.cs
rename to sources/Maths/Maths/Scalar.BaseOps.cs
diff --git a/sources/Maths/Scalar.Bitwise/Scalar.And.cs b/sources/Maths/Maths/Scalar.Bitwise/Scalar.And.cs
similarity index 100%
rename from sources/Maths/Scalar.Bitwise/Scalar.And.cs
rename to sources/Maths/Maths/Scalar.Bitwise/Scalar.And.cs
diff --git a/sources/Maths/Scalar.Bitwise/Scalar.Not.cs b/sources/Maths/Maths/Scalar.Bitwise/Scalar.Not.cs
similarity index 100%
rename from sources/Maths/Scalar.Bitwise/Scalar.Not.cs
rename to sources/Maths/Maths/Scalar.Bitwise/Scalar.Not.cs
diff --git a/sources/Maths/Scalar.Bitwise/Scalar.Or.cs b/sources/Maths/Maths/Scalar.Bitwise/Scalar.Or.cs
similarity index 100%
rename from sources/Maths/Scalar.Bitwise/Scalar.Or.cs
rename to sources/Maths/Maths/Scalar.Bitwise/Scalar.Or.cs
diff --git a/sources/Maths/Scalar.Bitwise/Scalar.RotateLeft.cs b/sources/Maths/Maths/Scalar.Bitwise/Scalar.RotateLeft.cs
similarity index 100%
rename from sources/Maths/Scalar.Bitwise/Scalar.RotateLeft.cs
rename to sources/Maths/Maths/Scalar.Bitwise/Scalar.RotateLeft.cs
diff --git a/sources/Maths/Scalar.Bitwise/Scalar.RotateRight.cs b/sources/Maths/Maths/Scalar.Bitwise/Scalar.RotateRight.cs
similarity index 100%
rename from sources/Maths/Scalar.Bitwise/Scalar.RotateRight.cs
rename to sources/Maths/Maths/Scalar.Bitwise/Scalar.RotateRight.cs
diff --git a/sources/Maths/Scalar.Bitwise/Scalar.ShiftLeft.cs b/sources/Maths/Maths/Scalar.Bitwise/Scalar.ShiftLeft.cs
similarity index 100%
rename from sources/Maths/Scalar.Bitwise/Scalar.ShiftLeft.cs
rename to sources/Maths/Maths/Scalar.Bitwise/Scalar.ShiftLeft.cs
diff --git a/sources/Maths/Scalar.Bitwise/Scalar.ShiftRight.cs b/sources/Maths/Maths/Scalar.Bitwise/Scalar.ShiftRight.cs
similarity index 100%
rename from sources/Maths/Scalar.Bitwise/Scalar.ShiftRight.cs
rename to sources/Maths/Maths/Scalar.Bitwise/Scalar.ShiftRight.cs
diff --git a/sources/Maths/Scalar.Bitwise/Scalar.Xor.cs b/sources/Maths/Maths/Scalar.Bitwise/Scalar.Xor.cs
similarity index 100%
rename from sources/Maths/Scalar.Bitwise/Scalar.Xor.cs
rename to sources/Maths/Maths/Scalar.Bitwise/Scalar.Xor.cs
diff --git a/sources/Maths/Scalar.Constants.cs b/sources/Maths/Maths/Scalar.Constants.cs
similarity index 100%
rename from sources/Maths/Scalar.Constants.cs
rename to sources/Maths/Maths/Scalar.Constants.cs
diff --git a/sources/Maths/Scalar.Conversions.cs b/sources/Maths/Maths/Scalar.Conversions.cs
similarity index 100%
rename from sources/Maths/Scalar.Conversions.cs
rename to sources/Maths/Maths/Scalar.Conversions.cs
diff --git a/sources/Maths/Scalar.Exp.cs b/sources/Maths/Maths/Scalar.Exp.cs
similarity index 100%
rename from sources/Maths/Scalar.Exp.cs
rename to sources/Maths/Maths/Scalar.Exp.cs
diff --git a/sources/Maths/Scalar.Inverse.cs b/sources/Maths/Maths/Scalar.Inverse.cs
similarity index 100%
rename from sources/Maths/Scalar.Inverse.cs
rename to sources/Maths/Maths/Scalar.Inverse.cs
diff --git a/sources/Maths/Scalar.Log.cs b/sources/Maths/Maths/Scalar.Log.cs
similarity index 100%
rename from sources/Maths/Scalar.Log.cs
rename to sources/Maths/Maths/Scalar.Log.cs
diff --git a/sources/Maths/Scalar.MathFPort.MissingMethods.cs b/sources/Maths/Maths/Scalar.MathFPort.MissingMethods.cs
similarity index 100%
rename from sources/Maths/Scalar.MathFPort.MissingMethods.cs
rename to sources/Maths/Maths/Scalar.MathFPort.MissingMethods.cs
diff --git a/sources/Maths/Scalar.MathFPort.cs b/sources/Maths/Maths/Scalar.MathFPort.cs
similarity index 100%
rename from sources/Maths/Scalar.MathFPort.cs
rename to sources/Maths/Maths/Scalar.MathFPort.cs
diff --git a/sources/Maths/Scalar.Pow.cs b/sources/Maths/Maths/Scalar.Pow.cs
similarity index 100%
rename from sources/Maths/Scalar.Pow.cs
rename to sources/Maths/Maths/Scalar.Pow.cs
diff --git a/sources/Maths/Scalar.Sin.cs b/sources/Maths/Maths/Scalar.Sin.cs
similarity index 100%
rename from sources/Maths/Scalar.Sin.cs
rename to sources/Maths/Maths/Scalar.Sin.cs
diff --git a/sources/Maths/Silk.NET.Maths.csproj b/sources/Maths/Maths/Silk.NET.Maths.csproj
similarity index 100%
rename from sources/Maths/Silk.NET.Maths.csproj
rename to sources/Maths/Maths/Silk.NET.Maths.csproj
diff --git a/sources/Maths/Sphere.cs b/sources/Maths/Maths/Sphere.cs
similarity index 100%
rename from sources/Maths/Sphere.cs
rename to sources/Maths/Maths/Sphere.cs
diff --git a/sources/Maths/SystemNumericsExtensions.cs b/sources/Maths/Maths/SystemNumericsExtensions.cs
similarity index 100%
rename from sources/Maths/SystemNumericsExtensions.cs
rename to sources/Maths/Maths/SystemNumericsExtensions.cs
diff --git a/sources/Maths/Vector2D.Ops.cs b/sources/Maths/Maths/Vector2D.Ops.cs
similarity index 100%
rename from sources/Maths/Vector2D.Ops.cs
rename to sources/Maths/Maths/Vector2D.Ops.cs
diff --git a/sources/Maths/Vector2D.cs b/sources/Maths/Maths/Vector2D.cs
similarity index 100%
rename from sources/Maths/Vector2D.cs
rename to sources/Maths/Maths/Vector2D.cs
diff --git a/sources/Maths/Vector3D.Ops.cs b/sources/Maths/Maths/Vector3D.Ops.cs
similarity index 100%
rename from sources/Maths/Vector3D.Ops.cs
rename to sources/Maths/Maths/Vector3D.Ops.cs
diff --git a/sources/Maths/Vector3D.cs b/sources/Maths/Maths/Vector3D.cs
similarity index 100%
rename from sources/Maths/Vector3D.cs
rename to sources/Maths/Maths/Vector3D.cs
diff --git a/sources/Maths/Vector4D.Ops.cs b/sources/Maths/Maths/Vector4D.Ops.cs
similarity index 100%
rename from sources/Maths/Vector4D.Ops.cs
rename to sources/Maths/Maths/Vector4D.Ops.cs
diff --git a/sources/Maths/Vector4D.cs b/sources/Maths/Maths/Vector4D.cs
similarity index 100%
rename from sources/Maths/Vector4D.cs
rename to sources/Maths/Maths/Vector4D.cs
diff --git a/sources/OpenGL/Enums/AccumOp.gen.cs b/sources/OpenGL/OpenGL/Enums/AccumOp.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/AccumOp.gen.cs
rename to sources/OpenGL/OpenGL/Enums/AccumOp.gen.cs
diff --git a/sources/OpenGL/Enums/AlphaFunction.gen.cs b/sources/OpenGL/OpenGL/Enums/AlphaFunction.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/AlphaFunction.gen.cs
rename to sources/OpenGL/OpenGL/Enums/AlphaFunction.gen.cs
diff --git a/sources/OpenGL/Enums/ArrayObjectPNameATI.gen.cs b/sources/OpenGL/OpenGL/Enums/ArrayObjectPNameATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ArrayObjectPNameATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ArrayObjectPNameATI.gen.cs
diff --git a/sources/OpenGL/Enums/ArrayObjectUsageATI.gen.cs b/sources/OpenGL/OpenGL/Enums/ArrayObjectUsageATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ArrayObjectUsageATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ArrayObjectUsageATI.gen.cs
diff --git a/sources/OpenGL/Enums/AtomicCounterBufferPName.gen.cs b/sources/OpenGL/OpenGL/Enums/AtomicCounterBufferPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/AtomicCounterBufferPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/AtomicCounterBufferPName.gen.cs
diff --git a/sources/OpenGL/Enums/AttribMask.gen.cs b/sources/OpenGL/OpenGL/Enums/AttribMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/AttribMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/AttribMask.gen.cs
diff --git a/sources/OpenGL/Enums/AttributeType.gen.cs b/sources/OpenGL/OpenGL/Enums/AttributeType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/AttributeType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/AttributeType.gen.cs
diff --git a/sources/OpenGL/Enums/BindTransformFeedbackTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/BindTransformFeedbackTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/BindTransformFeedbackTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/BindTransformFeedbackTarget.gen.cs
diff --git a/sources/OpenGL/Enums/BinormalPointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/BinormalPointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/BinormalPointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/BinormalPointerType.gen.cs
diff --git a/sources/OpenGL/Enums/BlendEquationMode.gen.cs b/sources/OpenGL/OpenGL/Enums/BlendEquationMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/BlendEquationMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/BlendEquationMode.gen.cs
diff --git a/sources/OpenGL/Enums/BlendingFactor.gen.cs b/sources/OpenGL/OpenGL/Enums/BlendingFactor.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/BlendingFactor.gen.cs
rename to sources/OpenGL/OpenGL/Enums/BlendingFactor.gen.cs
diff --git a/sources/OpenGL/Enums/BlitFramebufferFilter.gen.cs b/sources/OpenGL/OpenGL/Enums/BlitFramebufferFilter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/BlitFramebufferFilter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/BlitFramebufferFilter.gen.cs
diff --git a/sources/OpenGL/Enums/Boolean.gen.cs b/sources/OpenGL/OpenGL/Enums/Boolean.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/Boolean.gen.cs
rename to sources/OpenGL/OpenGL/Enums/Boolean.gen.cs
diff --git a/sources/OpenGL/Enums/Buffer.gen.cs b/sources/OpenGL/OpenGL/Enums/Buffer.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/Buffer.gen.cs
rename to sources/OpenGL/OpenGL/Enums/Buffer.gen.cs
diff --git a/sources/OpenGL/Enums/BufferAccess.gen.cs b/sources/OpenGL/OpenGL/Enums/BufferAccess.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/BufferAccess.gen.cs
rename to sources/OpenGL/OpenGL/Enums/BufferAccess.gen.cs
diff --git a/sources/OpenGL/Enums/BufferBitQCOM.gen.cs b/sources/OpenGL/OpenGL/Enums/BufferBitQCOM.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/BufferBitQCOM.gen.cs
rename to sources/OpenGL/OpenGL/Enums/BufferBitQCOM.gen.cs
diff --git a/sources/OpenGL/Enums/BufferPName.gen.cs b/sources/OpenGL/OpenGL/Enums/BufferPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/BufferPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/BufferPName.gen.cs
diff --git a/sources/OpenGL/Enums/BufferPointerName.gen.cs b/sources/OpenGL/OpenGL/Enums/BufferPointerName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/BufferPointerName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/BufferPointerName.gen.cs
diff --git a/sources/OpenGL/Enums/BufferStorageMask.gen.cs b/sources/OpenGL/OpenGL/Enums/BufferStorageMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/BufferStorageMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/BufferStorageMask.gen.cs
diff --git a/sources/OpenGL/Enums/BufferStorageTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/BufferStorageTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/BufferStorageTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/BufferStorageTarget.gen.cs
diff --git a/sources/OpenGL/Enums/BufferTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/BufferTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/BufferTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/BufferTarget.gen.cs
diff --git a/sources/OpenGL/Enums/BufferUsage.gen.cs b/sources/OpenGL/OpenGL/Enums/BufferUsage.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/BufferUsage.gen.cs
rename to sources/OpenGL/OpenGL/Enums/BufferUsage.gen.cs
diff --git a/sources/OpenGL/Enums/ClampColorMode.gen.cs b/sources/OpenGL/OpenGL/Enums/ClampColorMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ClampColorMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ClampColorMode.gen.cs
diff --git a/sources/OpenGL/Enums/ClampColorTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/ClampColorTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ClampColorTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ClampColorTarget.gen.cs
diff --git a/sources/OpenGL/Enums/ClearBufferMask.gen.cs b/sources/OpenGL/OpenGL/Enums/ClearBufferMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ClearBufferMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ClearBufferMask.gen.cs
diff --git a/sources/OpenGL/Enums/ClientAttribMask.gen.cs b/sources/OpenGL/OpenGL/Enums/ClientAttribMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ClientAttribMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ClientAttribMask.gen.cs
diff --git a/sources/OpenGL/Enums/ClipControlDepth.gen.cs b/sources/OpenGL/OpenGL/Enums/ClipControlDepth.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ClipControlDepth.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ClipControlDepth.gen.cs
diff --git a/sources/OpenGL/Enums/ClipControlOrigin.gen.cs b/sources/OpenGL/OpenGL/Enums/ClipControlOrigin.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ClipControlOrigin.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ClipControlOrigin.gen.cs
diff --git a/sources/OpenGL/Enums/ClipPlaneName.gen.cs b/sources/OpenGL/OpenGL/Enums/ClipPlaneName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ClipPlaneName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ClipPlaneName.gen.cs
diff --git a/sources/OpenGL/Enums/ColorBuffer.gen.cs b/sources/OpenGL/OpenGL/Enums/ColorBuffer.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ColorBuffer.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ColorBuffer.gen.cs
diff --git a/sources/OpenGL/Enums/ColorMaterialParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/ColorMaterialParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ColorMaterialParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ColorMaterialParameter.gen.cs
diff --git a/sources/OpenGL/Enums/ColorPointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/ColorPointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ColorPointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ColorPointerType.gen.cs
diff --git a/sources/OpenGL/Enums/ColorTableParameterPName.gen.cs b/sources/OpenGL/OpenGL/Enums/ColorTableParameterPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ColorTableParameterPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ColorTableParameterPName.gen.cs
diff --git a/sources/OpenGL/Enums/ColorTableTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/ColorTableTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ColorTableTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ColorTableTarget.gen.cs
diff --git a/sources/OpenGL/Enums/ColorTableTargetSGI.gen.cs b/sources/OpenGL/OpenGL/Enums/ColorTableTargetSGI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ColorTableTargetSGI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ColorTableTargetSGI.gen.cs
diff --git a/sources/OpenGL/Enums/CombinerBias.gen.cs b/sources/OpenGL/OpenGL/Enums/CombinerBias.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/CombinerBias.gen.cs
rename to sources/OpenGL/OpenGL/Enums/CombinerBias.gen.cs
diff --git a/sources/OpenGL/Enums/CombinerComponentUsage.gen.cs b/sources/OpenGL/OpenGL/Enums/CombinerComponentUsage.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/CombinerComponentUsage.gen.cs
rename to sources/OpenGL/OpenGL/Enums/CombinerComponentUsage.gen.cs
diff --git a/sources/OpenGL/Enums/CombinerMappingNV.gen.cs b/sources/OpenGL/OpenGL/Enums/CombinerMappingNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/CombinerMappingNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/CombinerMappingNV.gen.cs
diff --git a/sources/OpenGL/Enums/CombinerParameterNV.gen.cs b/sources/OpenGL/OpenGL/Enums/CombinerParameterNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/CombinerParameterNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/CombinerParameterNV.gen.cs
diff --git a/sources/OpenGL/Enums/CombinerPortion.gen.cs b/sources/OpenGL/OpenGL/Enums/CombinerPortion.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/CombinerPortion.gen.cs
rename to sources/OpenGL/OpenGL/Enums/CombinerPortion.gen.cs
diff --git a/sources/OpenGL/Enums/CombinerRegister.gen.cs b/sources/OpenGL/OpenGL/Enums/CombinerRegister.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/CombinerRegister.gen.cs
rename to sources/OpenGL/OpenGL/Enums/CombinerRegister.gen.cs
diff --git a/sources/OpenGL/Enums/CombinerScale.gen.cs b/sources/OpenGL/OpenGL/Enums/CombinerScale.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/CombinerScale.gen.cs
rename to sources/OpenGL/OpenGL/Enums/CombinerScale.gen.cs
diff --git a/sources/OpenGL/Enums/CombinerStageNV.gen.cs b/sources/OpenGL/OpenGL/Enums/CombinerStageNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/CombinerStageNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/CombinerStageNV.gen.cs
diff --git a/sources/OpenGL/Enums/CombinerVariableNV.gen.cs b/sources/OpenGL/OpenGL/Enums/CombinerVariableNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/CombinerVariableNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/CombinerVariableNV.gen.cs
diff --git a/sources/OpenGL/Enums/CommandOpcodesNV.gen.cs b/sources/OpenGL/OpenGL/Enums/CommandOpcodesNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/CommandOpcodesNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/CommandOpcodesNV.gen.cs
diff --git a/sources/OpenGL/Enums/ConditionalRenderMode.gen.cs b/sources/OpenGL/OpenGL/Enums/ConditionalRenderMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ConditionalRenderMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ConditionalRenderMode.gen.cs
diff --git a/sources/OpenGL/Enums/ContainerType.gen.cs b/sources/OpenGL/OpenGL/Enums/ContainerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ContainerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ContainerType.gen.cs
diff --git a/sources/OpenGL/Enums/ContextFlagMask.gen.cs b/sources/OpenGL/OpenGL/Enums/ContextFlagMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ContextFlagMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ContextFlagMask.gen.cs
diff --git a/sources/OpenGL/Enums/ContextProfileMask.gen.cs b/sources/OpenGL/OpenGL/Enums/ContextProfileMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ContextProfileMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ContextProfileMask.gen.cs
diff --git a/sources/OpenGL/Enums/ConvolutionBorderMode.gen.cs b/sources/OpenGL/OpenGL/Enums/ConvolutionBorderMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ConvolutionBorderMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ConvolutionBorderMode.gen.cs
diff --git a/sources/OpenGL/Enums/ConvolutionParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/ConvolutionParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ConvolutionParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ConvolutionParameter.gen.cs
diff --git a/sources/OpenGL/Enums/ConvolutionTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/ConvolutionTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ConvolutionTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ConvolutionTarget.gen.cs
diff --git a/sources/OpenGL/Enums/ConvolutionTargetEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/ConvolutionTargetEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ConvolutionTargetEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ConvolutionTargetEXT.gen.cs
diff --git a/sources/OpenGL/Enums/CopyBufferSubDataTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/CopyBufferSubDataTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/CopyBufferSubDataTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/CopyBufferSubDataTarget.gen.cs
diff --git a/sources/OpenGL/Enums/CopyImageSubDataTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/CopyImageSubDataTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/CopyImageSubDataTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/CopyImageSubDataTarget.gen.cs
diff --git a/sources/OpenGL/Enums/CullParameterEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/CullParameterEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/CullParameterEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/CullParameterEXT.gen.cs
diff --git a/sources/OpenGL/Enums/DataTypeEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/DataTypeEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/DataTypeEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/DataTypeEXT.gen.cs
diff --git a/sources/OpenGL/Enums/DebugSeverity.gen.cs b/sources/OpenGL/OpenGL/Enums/DebugSeverity.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/DebugSeverity.gen.cs
rename to sources/OpenGL/OpenGL/Enums/DebugSeverity.gen.cs
diff --git a/sources/OpenGL/Enums/DebugSource.gen.cs b/sources/OpenGL/OpenGL/Enums/DebugSource.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/DebugSource.gen.cs
rename to sources/OpenGL/OpenGL/Enums/DebugSource.gen.cs
diff --git a/sources/OpenGL/Enums/DebugType.gen.cs b/sources/OpenGL/OpenGL/Enums/DebugType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/DebugType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/DebugType.gen.cs
diff --git a/sources/OpenGL/Enums/DepthFunction.gen.cs b/sources/OpenGL/OpenGL/Enums/DepthFunction.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/DepthFunction.gen.cs
rename to sources/OpenGL/OpenGL/Enums/DepthFunction.gen.cs
diff --git a/sources/OpenGL/Enums/DepthStencilTextureMode.gen.cs b/sources/OpenGL/OpenGL/Enums/DepthStencilTextureMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/DepthStencilTextureMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/DepthStencilTextureMode.gen.cs
diff --git a/sources/OpenGL/Enums/DrawBufferMode.gen.cs b/sources/OpenGL/OpenGL/Enums/DrawBufferMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/DrawBufferMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/DrawBufferMode.gen.cs
diff --git a/sources/OpenGL/Enums/DrawElementsType.gen.cs b/sources/OpenGL/OpenGL/Enums/DrawElementsType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/DrawElementsType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/DrawElementsType.gen.cs
diff --git a/sources/OpenGL/Enums/ElementPointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/ElementPointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ElementPointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ElementPointerType.gen.cs
diff --git a/sources/OpenGL/Enums/EnableCap.gen.cs b/sources/OpenGL/OpenGL/Enums/EnableCap.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/EnableCap.gen.cs
rename to sources/OpenGL/OpenGL/Enums/EnableCap.gen.cs
diff --git a/sources/OpenGL/Enums/ErrorCode.gen.cs b/sources/OpenGL/OpenGL/Enums/ErrorCode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ErrorCode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ErrorCode.gen.cs
diff --git a/sources/OpenGL/Enums/EvalMapsModeNV.gen.cs b/sources/OpenGL/OpenGL/Enums/EvalMapsModeNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/EvalMapsModeNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/EvalMapsModeNV.gen.cs
diff --git a/sources/OpenGL/Enums/EvalTargetNV.gen.cs b/sources/OpenGL/OpenGL/Enums/EvalTargetNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/EvalTargetNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/EvalTargetNV.gen.cs
diff --git a/sources/OpenGL/Enums/ExternalHandleType.gen.cs b/sources/OpenGL/OpenGL/Enums/ExternalHandleType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ExternalHandleType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ExternalHandleType.gen.cs
diff --git a/sources/OpenGL/Enums/FeedBackToken.gen.cs b/sources/OpenGL/OpenGL/Enums/FeedBackToken.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FeedBackToken.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FeedBackToken.gen.cs
diff --git a/sources/OpenGL/Enums/FeedbackType.gen.cs b/sources/OpenGL/OpenGL/Enums/FeedbackType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FeedbackType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FeedbackType.gen.cs
diff --git a/sources/OpenGL/Enums/FenceConditionNV.gen.cs b/sources/OpenGL/OpenGL/Enums/FenceConditionNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FenceConditionNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FenceConditionNV.gen.cs
diff --git a/sources/OpenGL/Enums/FenceParameterNameNV.gen.cs b/sources/OpenGL/OpenGL/Enums/FenceParameterNameNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FenceParameterNameNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FenceParameterNameNV.gen.cs
diff --git a/sources/OpenGL/Enums/FfdMaskSGIX.gen.cs b/sources/OpenGL/OpenGL/Enums/FfdMaskSGIX.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FfdMaskSGIX.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FfdMaskSGIX.gen.cs
diff --git a/sources/OpenGL/Enums/FfdTargetSGIX.gen.cs b/sources/OpenGL/OpenGL/Enums/FfdTargetSGIX.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FfdTargetSGIX.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FfdTargetSGIX.gen.cs
diff --git a/sources/OpenGL/Enums/FogCoordSrc.gen.cs b/sources/OpenGL/OpenGL/Enums/FogCoordSrc.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FogCoordSrc.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FogCoordSrc.gen.cs
diff --git a/sources/OpenGL/Enums/FogCoordinatePointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/FogCoordinatePointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FogCoordinatePointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FogCoordinatePointerType.gen.cs
diff --git a/sources/OpenGL/Enums/FogMode.gen.cs b/sources/OpenGL/OpenGL/Enums/FogMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FogMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FogMode.gen.cs
diff --git a/sources/OpenGL/Enums/FogPName.gen.cs b/sources/OpenGL/OpenGL/Enums/FogPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FogPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FogPName.gen.cs
diff --git a/sources/OpenGL/Enums/FogParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/FogParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FogParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FogParameter.gen.cs
diff --git a/sources/OpenGL/Enums/FogPointerTypeEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/FogPointerTypeEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FogPointerTypeEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FogPointerTypeEXT.gen.cs
diff --git a/sources/OpenGL/Enums/FogPointerTypeIBM.gen.cs b/sources/OpenGL/OpenGL/Enums/FogPointerTypeIBM.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FogPointerTypeIBM.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FogPointerTypeIBM.gen.cs
diff --git a/sources/OpenGL/Enums/FoveationConfigBitQCOM.gen.cs b/sources/OpenGL/OpenGL/Enums/FoveationConfigBitQCOM.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FoveationConfigBitQCOM.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FoveationConfigBitQCOM.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentLightModelParameterSGIX.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentLightModelParameterSGIX.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentLightModelParameterSGIX.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentLightModelParameterSGIX.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentLightNameSGIX.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentLightNameSGIX.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentLightNameSGIX.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentLightNameSGIX.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentLightParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentLightParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentLightParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentLightParameter.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentOp1ATI.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentOp1ATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentOp1ATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentOp1ATI.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentOp2ATI.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentOp2ATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentOp2ATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentOp2ATI.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentOp3ATI.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentOp3ATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentOp3ATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentOp3ATI.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentShaderColorModMaskATI.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentShaderColorModMaskATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentShaderColorModMaskATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentShaderColorModMaskATI.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentShaderConATI.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentShaderConATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentShaderConATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentShaderConATI.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentShaderDestMask.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentShaderDestMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentShaderDestMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentShaderDestMask.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentShaderDestModMask.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentShaderDestModMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentShaderDestModMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentShaderDestModMask.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentShaderGenericSource.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentShaderGenericSource.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentShaderGenericSource.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentShaderGenericSource.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentShaderRegATI.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentShaderRegATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentShaderRegATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentShaderRegATI.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentShaderTextureSource.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentShaderTextureSource.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentShaderTextureSource.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentShaderTextureSource.gen.cs
diff --git a/sources/OpenGL/Enums/FragmentShaderValueRep.gen.cs b/sources/OpenGL/OpenGL/Enums/FragmentShaderValueRep.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FragmentShaderValueRep.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FragmentShaderValueRep.gen.cs
diff --git a/sources/OpenGL/Enums/FramebufferAttachment.gen.cs b/sources/OpenGL/OpenGL/Enums/FramebufferAttachment.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FramebufferAttachment.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FramebufferAttachment.gen.cs
diff --git a/sources/OpenGL/Enums/FramebufferAttachmentParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/FramebufferAttachmentParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FramebufferAttachmentParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FramebufferAttachmentParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/FramebufferParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/FramebufferParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FramebufferParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FramebufferParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/FramebufferStatus.gen.cs b/sources/OpenGL/OpenGL/Enums/FramebufferStatus.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FramebufferStatus.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FramebufferStatus.gen.cs
diff --git a/sources/OpenGL/Enums/FramebufferTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/FramebufferTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FramebufferTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FramebufferTarget.gen.cs
diff --git a/sources/OpenGL/Enums/FrontFaceDirection.gen.cs b/sources/OpenGL/OpenGL/Enums/FrontFaceDirection.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/FrontFaceDirection.gen.cs
rename to sources/OpenGL/OpenGL/Enums/FrontFaceDirection.gen.cs
diff --git a/sources/OpenGL/Enums/GLEnum.gen.cs b/sources/OpenGL/OpenGL/Enums/GLEnum.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/GLEnum.gen.cs
rename to sources/OpenGL/OpenGL/Enums/GLEnum.gen.cs
diff --git a/sources/OpenGL/Enums/GetFramebufferParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/GetFramebufferParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/GetFramebufferParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/GetFramebufferParameter.gen.cs
diff --git a/sources/OpenGL/Enums/GetHistogramParameterPName.gen.cs b/sources/OpenGL/OpenGL/Enums/GetHistogramParameterPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/GetHistogramParameterPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/GetHistogramParameterPName.gen.cs
diff --git a/sources/OpenGL/Enums/GetMapQuery.gen.cs b/sources/OpenGL/OpenGL/Enums/GetMapQuery.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/GetMapQuery.gen.cs
rename to sources/OpenGL/OpenGL/Enums/GetMapQuery.gen.cs
diff --git a/sources/OpenGL/Enums/GetMinmaxParameterPName.gen.cs b/sources/OpenGL/OpenGL/Enums/GetMinmaxParameterPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/GetMinmaxParameterPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/GetMinmaxParameterPName.gen.cs
diff --git a/sources/OpenGL/Enums/GetMultisamplePName.gen.cs b/sources/OpenGL/OpenGL/Enums/GetMultisamplePName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/GetMultisamplePName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/GetMultisamplePName.gen.cs
diff --git a/sources/OpenGL/Enums/GetPName.gen.cs b/sources/OpenGL/OpenGL/Enums/GetPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/GetPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/GetPName.gen.cs
diff --git a/sources/OpenGL/Enums/GetPointervPName.gen.cs b/sources/OpenGL/OpenGL/Enums/GetPointervPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/GetPointervPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/GetPointervPName.gen.cs
diff --git a/sources/OpenGL/Enums/GetTexBumpParameterATI.gen.cs b/sources/OpenGL/OpenGL/Enums/GetTexBumpParameterATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/GetTexBumpParameterATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/GetTexBumpParameterATI.gen.cs
diff --git a/sources/OpenGL/Enums/GetTextureParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/GetTextureParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/GetTextureParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/GetTextureParameter.gen.cs
diff --git a/sources/OpenGL/Enums/GetVariantValueEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/GetVariantValueEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/GetVariantValueEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/GetVariantValueEXT.gen.cs
diff --git a/sources/OpenGL/Enums/GraphicsResetStatus.gen.cs b/sources/OpenGL/OpenGL/Enums/GraphicsResetStatus.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/GraphicsResetStatus.gen.cs
rename to sources/OpenGL/OpenGL/Enums/GraphicsResetStatus.gen.cs
diff --git a/sources/OpenGL/Enums/HintMode.gen.cs b/sources/OpenGL/OpenGL/Enums/HintMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/HintMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/HintMode.gen.cs
diff --git a/sources/OpenGL/Enums/HintTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/HintTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/HintTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/HintTarget.gen.cs
diff --git a/sources/OpenGL/Enums/HintTargetPGI.gen.cs b/sources/OpenGL/OpenGL/Enums/HintTargetPGI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/HintTargetPGI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/HintTargetPGI.gen.cs
diff --git a/sources/OpenGL/Enums/HistogramTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/HistogramTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/HistogramTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/HistogramTarget.gen.cs
diff --git a/sources/OpenGL/Enums/HistogramTargetEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/HistogramTargetEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/HistogramTargetEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/HistogramTargetEXT.gen.cs
diff --git a/sources/OpenGL/Enums/ImageTransformPNameHP.gen.cs b/sources/OpenGL/OpenGL/Enums/ImageTransformPNameHP.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ImageTransformPNameHP.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ImageTransformPNameHP.gen.cs
diff --git a/sources/OpenGL/Enums/ImageTransformTargetHP.gen.cs b/sources/OpenGL/OpenGL/Enums/ImageTransformTargetHP.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ImageTransformTargetHP.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ImageTransformTargetHP.gen.cs
diff --git a/sources/OpenGL/Enums/IndexFunction.gen.cs b/sources/OpenGL/OpenGL/Enums/IndexFunction.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/IndexFunction.gen.cs
rename to sources/OpenGL/OpenGL/Enums/IndexFunction.gen.cs
diff --git a/sources/OpenGL/Enums/IndexMaterialParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/IndexMaterialParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/IndexMaterialParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/IndexMaterialParameter.gen.cs
diff --git a/sources/OpenGL/Enums/IndexPointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/IndexPointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/IndexPointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/IndexPointerType.gen.cs
diff --git a/sources/OpenGL/Enums/InstancedPathCoverMode.gen.cs b/sources/OpenGL/OpenGL/Enums/InstancedPathCoverMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/InstancedPathCoverMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/InstancedPathCoverMode.gen.cs
diff --git a/sources/OpenGL/Enums/InterleavedArrayFormat.gen.cs b/sources/OpenGL/OpenGL/Enums/InterleavedArrayFormat.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/InterleavedArrayFormat.gen.cs
rename to sources/OpenGL/OpenGL/Enums/InterleavedArrayFormat.gen.cs
diff --git a/sources/OpenGL/Enums/InternalFormat.gen.cs b/sources/OpenGL/OpenGL/Enums/InternalFormat.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/InternalFormat.gen.cs
rename to sources/OpenGL/OpenGL/Enums/InternalFormat.gen.cs
diff --git a/sources/OpenGL/Enums/InternalFormatPName.gen.cs b/sources/OpenGL/OpenGL/Enums/InternalFormatPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/InternalFormatPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/InternalFormatPName.gen.cs
diff --git a/sources/OpenGL/Enums/InvalidateFramebufferAttachment.gen.cs b/sources/OpenGL/OpenGL/Enums/InvalidateFramebufferAttachment.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/InvalidateFramebufferAttachment.gen.cs
rename to sources/OpenGL/OpenGL/Enums/InvalidateFramebufferAttachment.gen.cs
diff --git a/sources/OpenGL/Enums/LightEnvMode.gen.cs b/sources/OpenGL/OpenGL/Enums/LightEnvMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/LightEnvMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/LightEnvMode.gen.cs
diff --git a/sources/OpenGL/Enums/LightEnvParameterSGIX.gen.cs b/sources/OpenGL/OpenGL/Enums/LightEnvParameterSGIX.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/LightEnvParameterSGIX.gen.cs
rename to sources/OpenGL/OpenGL/Enums/LightEnvParameterSGIX.gen.cs
diff --git a/sources/OpenGL/Enums/LightModelColorControl.gen.cs b/sources/OpenGL/OpenGL/Enums/LightModelColorControl.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/LightModelColorControl.gen.cs
rename to sources/OpenGL/OpenGL/Enums/LightModelColorControl.gen.cs
diff --git a/sources/OpenGL/Enums/LightModelParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/LightModelParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/LightModelParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/LightModelParameter.gen.cs
diff --git a/sources/OpenGL/Enums/LightName.gen.cs b/sources/OpenGL/OpenGL/Enums/LightName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/LightName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/LightName.gen.cs
diff --git a/sources/OpenGL/Enums/LightParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/LightParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/LightParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/LightParameter.gen.cs
diff --git a/sources/OpenGL/Enums/LightTextureMode.gen.cs b/sources/OpenGL/OpenGL/Enums/LightTextureMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/LightTextureMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/LightTextureMode.gen.cs
diff --git a/sources/OpenGL/Enums/LightTexturePNameEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/LightTexturePNameEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/LightTexturePNameEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/LightTexturePNameEXT.gen.cs
diff --git a/sources/OpenGL/Enums/ListMode.gen.cs b/sources/OpenGL/OpenGL/Enums/ListMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ListMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ListMode.gen.cs
diff --git a/sources/OpenGL/Enums/ListNameType.gen.cs b/sources/OpenGL/OpenGL/Enums/ListNameType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ListNameType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ListNameType.gen.cs
diff --git a/sources/OpenGL/Enums/ListParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/ListParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ListParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ListParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/LogicOp.gen.cs b/sources/OpenGL/OpenGL/Enums/LogicOp.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/LogicOp.gen.cs
rename to sources/OpenGL/OpenGL/Enums/LogicOp.gen.cs
diff --git a/sources/OpenGL/Enums/MapAttribParameterNV.gen.cs b/sources/OpenGL/OpenGL/Enums/MapAttribParameterNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MapAttribParameterNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MapAttribParameterNV.gen.cs
diff --git a/sources/OpenGL/Enums/MapBufferAccessMask.gen.cs b/sources/OpenGL/OpenGL/Enums/MapBufferAccessMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MapBufferAccessMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MapBufferAccessMask.gen.cs
diff --git a/sources/OpenGL/Enums/MapParameterNV.gen.cs b/sources/OpenGL/OpenGL/Enums/MapParameterNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MapParameterNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MapParameterNV.gen.cs
diff --git a/sources/OpenGL/Enums/MapQuery.gen.cs b/sources/OpenGL/OpenGL/Enums/MapQuery.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MapQuery.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MapQuery.gen.cs
diff --git a/sources/OpenGL/Enums/MapTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/MapTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MapTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MapTarget.gen.cs
diff --git a/sources/OpenGL/Enums/MapTextureFormatIntel.gen.cs b/sources/OpenGL/OpenGL/Enums/MapTextureFormatIntel.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MapTextureFormatIntel.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MapTextureFormatIntel.gen.cs
diff --git a/sources/OpenGL/Enums/MapType.gen.cs b/sources/OpenGL/OpenGL/Enums/MapType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MapType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MapType.gen.cs
diff --git a/sources/OpenGL/Enums/MaterialParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/MaterialParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MaterialParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MaterialParameter.gen.cs
diff --git a/sources/OpenGL/Enums/MatrixIndexPointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/MatrixIndexPointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MatrixIndexPointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MatrixIndexPointerType.gen.cs
diff --git a/sources/OpenGL/Enums/MatrixMode.gen.cs b/sources/OpenGL/OpenGL/Enums/MatrixMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MatrixMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MatrixMode.gen.cs
diff --git a/sources/OpenGL/Enums/MemoryBarrierMask.gen.cs b/sources/OpenGL/OpenGL/Enums/MemoryBarrierMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MemoryBarrierMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MemoryBarrierMask.gen.cs
diff --git a/sources/OpenGL/Enums/MemoryObjectParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/MemoryObjectParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MemoryObjectParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MemoryObjectParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/MeshMode1.gen.cs b/sources/OpenGL/OpenGL/Enums/MeshMode1.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MeshMode1.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MeshMode1.gen.cs
diff --git a/sources/OpenGL/Enums/MeshMode2.gen.cs b/sources/OpenGL/OpenGL/Enums/MeshMode2.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MeshMode2.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MeshMode2.gen.cs
diff --git a/sources/OpenGL/Enums/MinmaxTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/MinmaxTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MinmaxTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MinmaxTarget.gen.cs
diff --git a/sources/OpenGL/Enums/MinmaxTargetEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/MinmaxTargetEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/MinmaxTargetEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/MinmaxTargetEXT.gen.cs
diff --git a/sources/OpenGL/Enums/NormalPointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/NormalPointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/NormalPointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/NormalPointerType.gen.cs
diff --git a/sources/OpenGL/Enums/ObjectIdentifier.gen.cs b/sources/OpenGL/OpenGL/Enums/ObjectIdentifier.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ObjectIdentifier.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ObjectIdentifier.gen.cs
diff --git a/sources/OpenGL/Enums/ObjectTypeApple.gen.cs b/sources/OpenGL/OpenGL/Enums/ObjectTypeApple.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ObjectTypeApple.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ObjectTypeApple.gen.cs
diff --git a/sources/OpenGL/Enums/OcclusionQueryEventMaskAMD.gen.cs b/sources/OpenGL/OpenGL/Enums/OcclusionQueryEventMaskAMD.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/OcclusionQueryEventMaskAMD.gen.cs
rename to sources/OpenGL/OpenGL/Enums/OcclusionQueryEventMaskAMD.gen.cs
diff --git a/sources/OpenGL/Enums/OcclusionQueryParameterNameNV.gen.cs b/sources/OpenGL/OpenGL/Enums/OcclusionQueryParameterNameNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/OcclusionQueryParameterNameNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/OcclusionQueryParameterNameNV.gen.cs
diff --git a/sources/OpenGL/Enums/PNTrianglesPNameATI.gen.cs b/sources/OpenGL/OpenGL/Enums/PNTrianglesPNameATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PNTrianglesPNameATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PNTrianglesPNameATI.gen.cs
diff --git a/sources/OpenGL/Enums/ParameterRangeEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/ParameterRangeEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ParameterRangeEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ParameterRangeEXT.gen.cs
diff --git a/sources/OpenGL/Enums/PatchParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/PatchParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PatchParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PatchParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/PathColor.gen.cs b/sources/OpenGL/OpenGL/Enums/PathColor.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathColor.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathColor.gen.cs
diff --git a/sources/OpenGL/Enums/PathColorFormat.gen.cs b/sources/OpenGL/OpenGL/Enums/PathColorFormat.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathColorFormat.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathColorFormat.gen.cs
diff --git a/sources/OpenGL/Enums/PathCoordType.gen.cs b/sources/OpenGL/OpenGL/Enums/PathCoordType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathCoordType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathCoordType.gen.cs
diff --git a/sources/OpenGL/Enums/PathCoverMode.gen.cs b/sources/OpenGL/OpenGL/Enums/PathCoverMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathCoverMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathCoverMode.gen.cs
diff --git a/sources/OpenGL/Enums/PathElementType.gen.cs b/sources/OpenGL/OpenGL/Enums/PathElementType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathElementType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathElementType.gen.cs
diff --git a/sources/OpenGL/Enums/PathFillMode.gen.cs b/sources/OpenGL/OpenGL/Enums/PathFillMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathFillMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathFillMode.gen.cs
diff --git a/sources/OpenGL/Enums/PathFontStyle.gen.cs b/sources/OpenGL/OpenGL/Enums/PathFontStyle.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathFontStyle.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathFontStyle.gen.cs
diff --git a/sources/OpenGL/Enums/PathFontTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/PathFontTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathFontTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathFontTarget.gen.cs
diff --git a/sources/OpenGL/Enums/PathGenMode.gen.cs b/sources/OpenGL/OpenGL/Enums/PathGenMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathGenMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathGenMode.gen.cs
diff --git a/sources/OpenGL/Enums/PathHandleMissingGlyphs.gen.cs b/sources/OpenGL/OpenGL/Enums/PathHandleMissingGlyphs.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathHandleMissingGlyphs.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathHandleMissingGlyphs.gen.cs
diff --git a/sources/OpenGL/Enums/PathListMode.gen.cs b/sources/OpenGL/OpenGL/Enums/PathListMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathListMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathListMode.gen.cs
diff --git a/sources/OpenGL/Enums/PathMetricMask.gen.cs b/sources/OpenGL/OpenGL/Enums/PathMetricMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathMetricMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathMetricMask.gen.cs
diff --git a/sources/OpenGL/Enums/PathParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/PathParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathParameter.gen.cs
diff --git a/sources/OpenGL/Enums/PathRenderingTokenNV.gen.cs b/sources/OpenGL/OpenGL/Enums/PathRenderingTokenNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathRenderingTokenNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathRenderingTokenNV.gen.cs
diff --git a/sources/OpenGL/Enums/PathStringFormat.gen.cs b/sources/OpenGL/OpenGL/Enums/PathStringFormat.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathStringFormat.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathStringFormat.gen.cs
diff --git a/sources/OpenGL/Enums/PathTransformType.gen.cs b/sources/OpenGL/OpenGL/Enums/PathTransformType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PathTransformType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PathTransformType.gen.cs
diff --git a/sources/OpenGL/Enums/PerfQueryDataFlags.gen.cs b/sources/OpenGL/OpenGL/Enums/PerfQueryDataFlags.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PerfQueryDataFlags.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PerfQueryDataFlags.gen.cs
diff --git a/sources/OpenGL/Enums/PerformanceQueryCapsMaskIntel.gen.cs b/sources/OpenGL/OpenGL/Enums/PerformanceQueryCapsMaskIntel.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PerformanceQueryCapsMaskIntel.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PerformanceQueryCapsMaskIntel.gen.cs
diff --git a/sources/OpenGL/Enums/PipelineParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/PipelineParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PipelineParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PipelineParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/PixelCopyType.gen.cs b/sources/OpenGL/OpenGL/Enums/PixelCopyType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PixelCopyType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PixelCopyType.gen.cs
diff --git a/sources/OpenGL/Enums/PixelDataRangeTargetNV.gen.cs b/sources/OpenGL/OpenGL/Enums/PixelDataRangeTargetNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PixelDataRangeTargetNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PixelDataRangeTargetNV.gen.cs
diff --git a/sources/OpenGL/Enums/PixelFormat.gen.cs b/sources/OpenGL/OpenGL/Enums/PixelFormat.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PixelFormat.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PixelFormat.gen.cs
diff --git a/sources/OpenGL/Enums/PixelMap.gen.cs b/sources/OpenGL/OpenGL/Enums/PixelMap.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PixelMap.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PixelMap.gen.cs
diff --git a/sources/OpenGL/Enums/PixelStoreParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/PixelStoreParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PixelStoreParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PixelStoreParameter.gen.cs
diff --git a/sources/OpenGL/Enums/PixelStoreResampleMode.gen.cs b/sources/OpenGL/OpenGL/Enums/PixelStoreResampleMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PixelStoreResampleMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PixelStoreResampleMode.gen.cs
diff --git a/sources/OpenGL/Enums/PixelStoreSubsampleRate.gen.cs b/sources/OpenGL/OpenGL/Enums/PixelStoreSubsampleRate.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PixelStoreSubsampleRate.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PixelStoreSubsampleRate.gen.cs
diff --git a/sources/OpenGL/Enums/PixelTexGenMode.gen.cs b/sources/OpenGL/OpenGL/Enums/PixelTexGenMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PixelTexGenMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PixelTexGenMode.gen.cs
diff --git a/sources/OpenGL/Enums/PixelTexGenParameterNameSGIS.gen.cs b/sources/OpenGL/OpenGL/Enums/PixelTexGenParameterNameSGIS.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PixelTexGenParameterNameSGIS.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PixelTexGenParameterNameSGIS.gen.cs
diff --git a/sources/OpenGL/Enums/PixelTransferParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/PixelTransferParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PixelTransferParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PixelTransferParameter.gen.cs
diff --git a/sources/OpenGL/Enums/PixelTransformPNameEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/PixelTransformPNameEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PixelTransformPNameEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PixelTransformPNameEXT.gen.cs
diff --git a/sources/OpenGL/Enums/PixelTransformTargetEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/PixelTransformTargetEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PixelTransformTargetEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PixelTransformTargetEXT.gen.cs
diff --git a/sources/OpenGL/Enums/PixelType.gen.cs b/sources/OpenGL/OpenGL/Enums/PixelType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PixelType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PixelType.gen.cs
diff --git a/sources/OpenGL/Enums/PointParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/PointParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PointParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PointParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/PolygonMode.gen.cs b/sources/OpenGL/OpenGL/Enums/PolygonMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PolygonMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PolygonMode.gen.cs
diff --git a/sources/OpenGL/Enums/PrecisionType.gen.cs b/sources/OpenGL/OpenGL/Enums/PrecisionType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PrecisionType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PrecisionType.gen.cs
diff --git a/sources/OpenGL/Enums/PreserveModeATI.gen.cs b/sources/OpenGL/OpenGL/Enums/PreserveModeATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PreserveModeATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PreserveModeATI.gen.cs
diff --git a/sources/OpenGL/Enums/PrimitiveType.gen.cs b/sources/OpenGL/OpenGL/Enums/PrimitiveType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/PrimitiveType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/PrimitiveType.gen.cs
diff --git a/sources/OpenGL/Enums/ProgramFormat.gen.cs b/sources/OpenGL/OpenGL/Enums/ProgramFormat.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ProgramFormat.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ProgramFormat.gen.cs
diff --git a/sources/OpenGL/Enums/ProgramInterface.gen.cs b/sources/OpenGL/OpenGL/Enums/ProgramInterface.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ProgramInterface.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ProgramInterface.gen.cs
diff --git a/sources/OpenGL/Enums/ProgramInterfacePName.gen.cs b/sources/OpenGL/OpenGL/Enums/ProgramInterfacePName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ProgramInterfacePName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ProgramInterfacePName.gen.cs
diff --git a/sources/OpenGL/Enums/ProgramParameterPName.gen.cs b/sources/OpenGL/OpenGL/Enums/ProgramParameterPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ProgramParameterPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ProgramParameterPName.gen.cs
diff --git a/sources/OpenGL/Enums/ProgramProperty.gen.cs b/sources/OpenGL/OpenGL/Enums/ProgramProperty.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ProgramProperty.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ProgramProperty.gen.cs
diff --git a/sources/OpenGL/Enums/ProgramResourceProperty.gen.cs b/sources/OpenGL/OpenGL/Enums/ProgramResourceProperty.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ProgramResourceProperty.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ProgramResourceProperty.gen.cs
diff --git a/sources/OpenGL/Enums/ProgramStagePName.gen.cs b/sources/OpenGL/OpenGL/Enums/ProgramStagePName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ProgramStagePName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ProgramStagePName.gen.cs
diff --git a/sources/OpenGL/Enums/ProgramStringProperty.gen.cs b/sources/OpenGL/OpenGL/Enums/ProgramStringProperty.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ProgramStringProperty.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ProgramStringProperty.gen.cs
diff --git a/sources/OpenGL/Enums/ProgramTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/ProgramTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ProgramTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ProgramTarget.gen.cs
diff --git a/sources/OpenGL/Enums/QueryCounterTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/QueryCounterTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/QueryCounterTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/QueryCounterTarget.gen.cs
diff --git a/sources/OpenGL/Enums/QueryObjectParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/QueryObjectParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/QueryObjectParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/QueryObjectParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/QueryParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/QueryParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/QueryParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/QueryParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/QueryTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/QueryTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/QueryTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/QueryTarget.gen.cs
diff --git a/sources/OpenGL/Enums/ReadBufferMode.gen.cs b/sources/OpenGL/OpenGL/Enums/ReadBufferMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ReadBufferMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ReadBufferMode.gen.cs
diff --git a/sources/OpenGL/Enums/RenderbufferParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/RenderbufferParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/RenderbufferParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/RenderbufferParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/RenderbufferTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/RenderbufferTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/RenderbufferTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/RenderbufferTarget.gen.cs
diff --git a/sources/OpenGL/Enums/RenderingMode.gen.cs b/sources/OpenGL/OpenGL/Enums/RenderingMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/RenderingMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/RenderingMode.gen.cs
diff --git a/sources/OpenGL/Enums/ReplacementCodeType.gen.cs b/sources/OpenGL/OpenGL/Enums/ReplacementCodeType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ReplacementCodeType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ReplacementCodeType.gen.cs
diff --git a/sources/OpenGL/Enums/SamplePatternEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/SamplePatternEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SamplePatternEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SamplePatternEXT.gen.cs
diff --git a/sources/OpenGL/Enums/SamplePatternSGIS.gen.cs b/sources/OpenGL/OpenGL/Enums/SamplePatternSGIS.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SamplePatternSGIS.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SamplePatternSGIS.gen.cs
diff --git a/sources/OpenGL/Enums/SamplerParameterF.gen.cs b/sources/OpenGL/OpenGL/Enums/SamplerParameterF.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SamplerParameterF.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SamplerParameterF.gen.cs
diff --git a/sources/OpenGL/Enums/SamplerParameterI.gen.cs b/sources/OpenGL/OpenGL/Enums/SamplerParameterI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SamplerParameterI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SamplerParameterI.gen.cs
diff --git a/sources/OpenGL/Enums/ScalarType.gen.cs b/sources/OpenGL/OpenGL/Enums/ScalarType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ScalarType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ScalarType.gen.cs
diff --git a/sources/OpenGL/Enums/SecondaryColorPointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/SecondaryColorPointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SecondaryColorPointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SecondaryColorPointerType.gen.cs
diff --git a/sources/OpenGL/Enums/SemaphoreParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/SemaphoreParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SemaphoreParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SemaphoreParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/SeparableTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/SeparableTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SeparableTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SeparableTarget.gen.cs
diff --git a/sources/OpenGL/Enums/SeparableTargetEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/SeparableTargetEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SeparableTargetEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SeparableTargetEXT.gen.cs
diff --git a/sources/OpenGL/Enums/ShaderBinaryFormat.gen.cs b/sources/OpenGL/OpenGL/Enums/ShaderBinaryFormat.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ShaderBinaryFormat.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ShaderBinaryFormat.gen.cs
diff --git a/sources/OpenGL/Enums/ShaderParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/ShaderParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ShaderParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ShaderParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/ShaderType.gen.cs b/sources/OpenGL/OpenGL/Enums/ShaderType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ShaderType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ShaderType.gen.cs
diff --git a/sources/OpenGL/Enums/ShadingModel.gen.cs b/sources/OpenGL/OpenGL/Enums/ShadingModel.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ShadingModel.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ShadingModel.gen.cs
diff --git a/sources/OpenGL/Enums/ShadingRate.gen.cs b/sources/OpenGL/OpenGL/Enums/ShadingRate.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ShadingRate.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ShadingRate.gen.cs
diff --git a/sources/OpenGL/Enums/ShadingRateCombinerOp.gen.cs b/sources/OpenGL/OpenGL/Enums/ShadingRateCombinerOp.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ShadingRateCombinerOp.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ShadingRateCombinerOp.gen.cs
diff --git a/sources/OpenGL/Enums/ShadingRateQCOM.gen.cs b/sources/OpenGL/OpenGL/Enums/ShadingRateQCOM.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/ShadingRateQCOM.gen.cs
rename to sources/OpenGL/OpenGL/Enums/ShadingRateQCOM.gen.cs
diff --git a/sources/OpenGL/Enums/SizedInternalFormat.gen.cs b/sources/OpenGL/OpenGL/Enums/SizedInternalFormat.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SizedInternalFormat.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SizedInternalFormat.gen.cs
diff --git a/sources/OpenGL/Enums/SpriteModeSGIX.gen.cs b/sources/OpenGL/OpenGL/Enums/SpriteModeSGIX.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SpriteModeSGIX.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SpriteModeSGIX.gen.cs
diff --git a/sources/OpenGL/Enums/SpriteParameterNameSGIX.gen.cs b/sources/OpenGL/OpenGL/Enums/SpriteParameterNameSGIX.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SpriteParameterNameSGIX.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SpriteParameterNameSGIX.gen.cs
diff --git a/sources/OpenGL/Enums/StencilFunction.gen.cs b/sources/OpenGL/OpenGL/Enums/StencilFunction.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/StencilFunction.gen.cs
rename to sources/OpenGL/OpenGL/Enums/StencilFunction.gen.cs
diff --git a/sources/OpenGL/Enums/StencilOp.gen.cs b/sources/OpenGL/OpenGL/Enums/StencilOp.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/StencilOp.gen.cs
rename to sources/OpenGL/OpenGL/Enums/StencilOp.gen.cs
diff --git a/sources/OpenGL/Enums/StringName.gen.cs b/sources/OpenGL/OpenGL/Enums/StringName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/StringName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/StringName.gen.cs
diff --git a/sources/OpenGL/Enums/SubgroupSupportedFeatures.gen.cs b/sources/OpenGL/OpenGL/Enums/SubgroupSupportedFeatures.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SubgroupSupportedFeatures.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SubgroupSupportedFeatures.gen.cs
diff --git a/sources/OpenGL/Enums/SubroutineParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/SubroutineParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SubroutineParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SubroutineParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/SwizzleOpATI.gen.cs b/sources/OpenGL/OpenGL/Enums/SwizzleOpATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SwizzleOpATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SwizzleOpATI.gen.cs
diff --git a/sources/OpenGL/Enums/SyncBehaviorFlags.gen.cs b/sources/OpenGL/OpenGL/Enums/SyncBehaviorFlags.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SyncBehaviorFlags.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SyncBehaviorFlags.gen.cs
diff --git a/sources/OpenGL/Enums/SyncCondition.gen.cs b/sources/OpenGL/OpenGL/Enums/SyncCondition.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SyncCondition.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SyncCondition.gen.cs
diff --git a/sources/OpenGL/Enums/SyncObjectMask.gen.cs b/sources/OpenGL/OpenGL/Enums/SyncObjectMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SyncObjectMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SyncObjectMask.gen.cs
diff --git a/sources/OpenGL/Enums/SyncParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/SyncParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SyncParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SyncParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/SyncStatus.gen.cs b/sources/OpenGL/OpenGL/Enums/SyncStatus.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/SyncStatus.gen.cs
rename to sources/OpenGL/OpenGL/Enums/SyncStatus.gen.cs
diff --git a/sources/OpenGL/Enums/TangentPointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/TangentPointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TangentPointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TangentPointerType.gen.cs
diff --git a/sources/OpenGL/Enums/TexBumpParameterATI.gen.cs b/sources/OpenGL/OpenGL/Enums/TexBumpParameterATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TexBumpParameterATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TexBumpParameterATI.gen.cs
diff --git a/sources/OpenGL/Enums/TexCoordPointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/TexCoordPointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TexCoordPointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TexCoordPointerType.gen.cs
diff --git a/sources/OpenGL/Enums/TexStorageAttribs.gen.cs b/sources/OpenGL/OpenGL/Enums/TexStorageAttribs.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TexStorageAttribs.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TexStorageAttribs.gen.cs
diff --git a/sources/OpenGL/Enums/TextureCompareMode.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureCompareMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureCompareMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureCompareMode.gen.cs
diff --git a/sources/OpenGL/Enums/TextureCoordName.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureCoordName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureCoordName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureCoordName.gen.cs
diff --git a/sources/OpenGL/Enums/TextureEnvMode.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureEnvMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureEnvMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureEnvMode.gen.cs
diff --git a/sources/OpenGL/Enums/TextureEnvParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureEnvParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureEnvParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureEnvParameter.gen.cs
diff --git a/sources/OpenGL/Enums/TextureEnvTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureEnvTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureEnvTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureEnvTarget.gen.cs
diff --git a/sources/OpenGL/Enums/TextureFilterSGIS.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureFilterSGIS.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureFilterSGIS.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureFilterSGIS.gen.cs
diff --git a/sources/OpenGL/Enums/TextureGenMode.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureGenMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureGenMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureGenMode.gen.cs
diff --git a/sources/OpenGL/Enums/TextureGenParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureGenParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureGenParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureGenParameter.gen.cs
diff --git a/sources/OpenGL/Enums/TextureLayout.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureLayout.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureLayout.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureLayout.gen.cs
diff --git a/sources/OpenGL/Enums/TextureMagFilter.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureMagFilter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureMagFilter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureMagFilter.gen.cs
diff --git a/sources/OpenGL/Enums/TextureMinFilter.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureMinFilter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureMinFilter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureMinFilter.gen.cs
diff --git a/sources/OpenGL/Enums/TextureNormalModeEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureNormalModeEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureNormalModeEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureNormalModeEXT.gen.cs
diff --git a/sources/OpenGL/Enums/TextureParameterName.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureParameterName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureParameterName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureParameterName.gen.cs
diff --git a/sources/OpenGL/Enums/TextureStorageMaskAMD.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureStorageMaskAMD.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureStorageMaskAMD.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureStorageMaskAMD.gen.cs
diff --git a/sources/OpenGL/Enums/TextureSwizzle.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureSwizzle.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureSwizzle.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureSwizzle.gen.cs
diff --git a/sources/OpenGL/Enums/TextureTarget.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureTarget.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureTarget.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureTarget.gen.cs
diff --git a/sources/OpenGL/Enums/TextureUnit.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureUnit.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureUnit.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureUnit.gen.cs
diff --git a/sources/OpenGL/Enums/TextureWrapMode.gen.cs b/sources/OpenGL/OpenGL/Enums/TextureWrapMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TextureWrapMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TextureWrapMode.gen.cs
diff --git a/sources/OpenGL/Enums/TraceMaskMESA.gen.cs b/sources/OpenGL/OpenGL/Enums/TraceMaskMESA.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TraceMaskMESA.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TraceMaskMESA.gen.cs
diff --git a/sources/OpenGL/Enums/TransformFeedbackBufferMode.gen.cs b/sources/OpenGL/OpenGL/Enums/TransformFeedbackBufferMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TransformFeedbackBufferMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TransformFeedbackBufferMode.gen.cs
diff --git a/sources/OpenGL/Enums/TransformFeedbackPName.gen.cs b/sources/OpenGL/OpenGL/Enums/TransformFeedbackPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TransformFeedbackPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TransformFeedbackPName.gen.cs
diff --git a/sources/OpenGL/Enums/TransformFeedbackTokenNV.gen.cs b/sources/OpenGL/OpenGL/Enums/TransformFeedbackTokenNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TransformFeedbackTokenNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TransformFeedbackTokenNV.gen.cs
diff --git a/sources/OpenGL/Enums/TriangleFace.gen.cs b/sources/OpenGL/OpenGL/Enums/TriangleFace.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TriangleFace.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TriangleFace.gen.cs
diff --git a/sources/OpenGL/Enums/TriangleListSUN.gen.cs b/sources/OpenGL/OpenGL/Enums/TriangleListSUN.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/TriangleListSUN.gen.cs
rename to sources/OpenGL/OpenGL/Enums/TriangleListSUN.gen.cs
diff --git a/sources/OpenGL/Enums/UniformBlockPName.gen.cs b/sources/OpenGL/OpenGL/Enums/UniformBlockPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/UniformBlockPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/UniformBlockPName.gen.cs
diff --git a/sources/OpenGL/Enums/UniformPName.gen.cs b/sources/OpenGL/OpenGL/Enums/UniformPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/UniformPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/UniformPName.gen.cs
diff --git a/sources/OpenGL/Enums/UniformType.gen.cs b/sources/OpenGL/OpenGL/Enums/UniformType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/UniformType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/UniformType.gen.cs
diff --git a/sources/OpenGL/Enums/UseProgramStageMask.gen.cs b/sources/OpenGL/OpenGL/Enums/UseProgramStageMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/UseProgramStageMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/UseProgramStageMask.gen.cs
diff --git a/sources/OpenGL/Enums/VariantCapEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/VariantCapEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VariantCapEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VariantCapEXT.gen.cs
diff --git a/sources/OpenGL/Enums/VertexArrayPName.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexArrayPName.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexArrayPName.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexArrayPName.gen.cs
diff --git a/sources/OpenGL/Enums/VertexArrayPNameApple.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexArrayPNameApple.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexArrayPNameApple.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexArrayPNameApple.gen.cs
diff --git a/sources/OpenGL/Enums/VertexAttribEnum.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexAttribEnum.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexAttribEnum.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexAttribEnum.gen.cs
diff --git a/sources/OpenGL/Enums/VertexAttribEnumNV.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexAttribEnumNV.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexAttribEnumNV.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexAttribEnumNV.gen.cs
diff --git a/sources/OpenGL/Enums/VertexAttribIType.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexAttribIType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexAttribIType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexAttribIType.gen.cs
diff --git a/sources/OpenGL/Enums/VertexAttribLType.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexAttribLType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexAttribLType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexAttribLType.gen.cs
diff --git a/sources/OpenGL/Enums/VertexAttribPointerProperty.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexAttribPointerProperty.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexAttribPointerProperty.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexAttribPointerProperty.gen.cs
diff --git a/sources/OpenGL/Enums/VertexAttribPointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexAttribPointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexAttribPointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexAttribPointerType.gen.cs
diff --git a/sources/OpenGL/Enums/VertexAttribProperty.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexAttribProperty.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexAttribProperty.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexAttribProperty.gen.cs
diff --git a/sources/OpenGL/Enums/VertexAttribType.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexAttribType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexAttribType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexAttribType.gen.cs
diff --git a/sources/OpenGL/Enums/VertexBufferObjectUsage.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexBufferObjectUsage.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexBufferObjectUsage.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexBufferObjectUsage.gen.cs
diff --git a/sources/OpenGL/Enums/VertexHintsMaskPGI.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexHintsMaskPGI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexHintsMaskPGI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexHintsMaskPGI.gen.cs
diff --git a/sources/OpenGL/Enums/VertexPointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexPointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexPointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexPointerType.gen.cs
diff --git a/sources/OpenGL/Enums/VertexProvokingMode.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexProvokingMode.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexProvokingMode.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexProvokingMode.gen.cs
diff --git a/sources/OpenGL/Enums/VertexShaderCoordOutEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexShaderCoordOutEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexShaderCoordOutEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexShaderCoordOutEXT.gen.cs
diff --git a/sources/OpenGL/Enums/VertexShaderOpEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexShaderOpEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexShaderOpEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexShaderOpEXT.gen.cs
diff --git a/sources/OpenGL/Enums/VertexShaderParameterEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexShaderParameterEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexShaderParameterEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexShaderParameterEXT.gen.cs
diff --git a/sources/OpenGL/Enums/VertexShaderStorageTypeEXT.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexShaderStorageTypeEXT.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexShaderStorageTypeEXT.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexShaderStorageTypeEXT.gen.cs
diff --git a/sources/OpenGL/Enums/VertexShaderTextureUnitParameter.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexShaderTextureUnitParameter.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexShaderTextureUnitParameter.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexShaderTextureUnitParameter.gen.cs
diff --git a/sources/OpenGL/Enums/VertexShaderWriteMask.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexShaderWriteMask.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexShaderWriteMask.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexShaderWriteMask.gen.cs
diff --git a/sources/OpenGL/Enums/VertexStreamATI.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexStreamATI.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexStreamATI.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexStreamATI.gen.cs
diff --git a/sources/OpenGL/Enums/VertexWeightPointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/VertexWeightPointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/VertexWeightPointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/VertexWeightPointerType.gen.cs
diff --git a/sources/OpenGL/Enums/WeightPointerType.gen.cs b/sources/OpenGL/OpenGL/Enums/WeightPointerType.gen.cs
similarity index 100%
rename from sources/OpenGL/Enums/WeightPointerType.gen.cs
rename to sources/OpenGL/OpenGL/Enums/WeightPointerType.gen.cs
diff --git a/sources/OpenGL/GL.cs b/sources/OpenGL/OpenGL/GL.cs
similarity index 100%
rename from sources/OpenGL/GL.cs
rename to sources/OpenGL/OpenGL/GL.cs
diff --git a/sources/OpenGL/GL.gen.cs b/sources/OpenGL/OpenGL/GL.gen.cs
similarity index 100%
rename from sources/OpenGL/GL.gen.cs
rename to sources/OpenGL/OpenGL/GL.gen.cs
diff --git a/sources/OpenGL/Silk.NET.OpenGL.csproj b/sources/OpenGL/OpenGL/Silk.NET.OpenGL.csproj
similarity index 66%
rename from sources/OpenGL/Silk.NET.OpenGL.csproj
rename to sources/OpenGL/OpenGL/Silk.NET.OpenGL.csproj
index 7bdcff8902..ae96d056eb 100644
--- a/sources/OpenGL/Silk.NET.OpenGL.csproj
+++ b/sources/OpenGL/OpenGL/Silk.NET.OpenGL.csproj
@@ -6,7 +6,7 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Core\Silk.NET.Core.csproj" />
+    <ProjectReference Include="..\..\Core\Core\Silk.NET.Core.csproj" />
   </ItemGroup>
-  <Import Project="..\Core\Silk.NET.Core.targets" />
+  <Import Project="..\..\Core\Core\Silk.NET.Core.targets" />
 </Project>
diff --git a/sources/OpenGL/Sync.gen.cs b/sources/OpenGL/OpenGL/Sync.gen.cs
similarity index 100%
rename from sources/OpenGL/Sync.gen.cs
rename to sources/OpenGL/OpenGL/Sync.gen.cs
diff --git a/sources/OpenGL/gl/GL.gen.cs b/sources/OpenGL/OpenGL/gl/GL.gen.cs
similarity index 100%
rename from sources/OpenGL/gl/GL.gen.cs
rename to sources/OpenGL/OpenGL/gl/GL.gen.cs
diff --git a/sources/OpenGL/gl/IGL.gen.cs b/sources/OpenGL/OpenGL/gl/IGL.gen.cs
similarity index 100%
rename from sources/OpenGL/gl/IGL.gen.cs
rename to sources/OpenGL/OpenGL/gl/IGL.gen.cs
diff --git a/sources/Playground/Playground.csproj b/sources/Playground/Playground.csproj
index 9b35fc87ea..05760ab6bf 100644
--- a/sources/Playground/Playground.csproj
+++ b/sources/Playground/Playground.csproj
@@ -8,10 +8,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\OpenGL\Silk.NET.OpenGL.csproj" />
-      <ProjectReference Include="..\SDL\Silk.NET.SDL.csproj" />
+      <ProjectReference Include="..\OpenGL\OpenGL\Silk.NET.OpenGL.csproj" />
+      <ProjectReference Include="..\SDL\SDL\Silk.NET.SDL.csproj" />
     </ItemGroup>
 
-    <Import Project="../Core/Silk.NET.Core.targets" />
+    <Import Project="../Core/Core/Silk.NET.Core.targets" />
 
 </Project>
diff --git a/sources/SDL/Handles/AudioStreamHandle.gen.cs b/sources/SDL/SDL/Handles/AudioStreamHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/AudioStreamHandle.gen.cs
rename to sources/SDL/SDL/Handles/AudioStreamHandle.gen.cs
diff --git a/sources/SDL/Handles/BlitMapHandle.gen.cs b/sources/SDL/SDL/Handles/BlitMapHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/BlitMapHandle.gen.cs
rename to sources/SDL/SDL/Handles/BlitMapHandle.gen.cs
diff --git a/sources/SDL/Handles/CameraHandle.gen.cs b/sources/SDL/SDL/Handles/CameraHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/CameraHandle.gen.cs
rename to sources/SDL/SDL/Handles/CameraHandle.gen.cs
diff --git a/sources/SDL/Handles/ConditionHandle.gen.cs b/sources/SDL/SDL/Handles/ConditionHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/ConditionHandle.gen.cs
rename to sources/SDL/SDL/Handles/ConditionHandle.gen.cs
diff --git a/sources/SDL/Handles/CursorHandle.gen.cs b/sources/SDL/SDL/Handles/CursorHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/CursorHandle.gen.cs
rename to sources/SDL/SDL/Handles/CursorHandle.gen.cs
diff --git a/sources/SDL/Handles/GamepadHandle.gen.cs b/sources/SDL/SDL/Handles/GamepadHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/GamepadHandle.gen.cs
rename to sources/SDL/SDL/Handles/GamepadHandle.gen.cs
diff --git a/sources/SDL/Handles/HapticHandle.gen.cs b/sources/SDL/SDL/Handles/HapticHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/HapticHandle.gen.cs
rename to sources/SDL/SDL/Handles/HapticHandle.gen.cs
diff --git a/sources/SDL/Handles/HidDeviceHandle.gen.cs b/sources/SDL/SDL/Handles/HidDeviceHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/HidDeviceHandle.gen.cs
rename to sources/SDL/SDL/Handles/HidDeviceHandle.gen.cs
diff --git a/sources/SDL/Handles/IOStreamHandle.gen.cs b/sources/SDL/SDL/Handles/IOStreamHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/IOStreamHandle.gen.cs
rename to sources/SDL/SDL/Handles/IOStreamHandle.gen.cs
diff --git a/sources/SDL/Handles/JoystickHandle.gen.cs b/sources/SDL/SDL/Handles/JoystickHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/JoystickHandle.gen.cs
rename to sources/SDL/SDL/Handles/JoystickHandle.gen.cs
diff --git a/sources/SDL/Handles/MutexHandle.gen.cs b/sources/SDL/SDL/Handles/MutexHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/MutexHandle.gen.cs
rename to sources/SDL/SDL/Handles/MutexHandle.gen.cs
diff --git a/sources/SDL/Handles/RWLockHandle.gen.cs b/sources/SDL/SDL/Handles/RWLockHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/RWLockHandle.gen.cs
rename to sources/SDL/SDL/Handles/RWLockHandle.gen.cs
diff --git a/sources/SDL/Handles/RendererHandle.gen.cs b/sources/SDL/SDL/Handles/RendererHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/RendererHandle.gen.cs
rename to sources/SDL/SDL/Handles/RendererHandle.gen.cs
diff --git a/sources/SDL/Handles/SemaphoreHandle.gen.cs b/sources/SDL/SDL/Handles/SemaphoreHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/SemaphoreHandle.gen.cs
rename to sources/SDL/SDL/Handles/SemaphoreHandle.gen.cs
diff --git a/sources/SDL/Handles/SensorHandle.gen.cs b/sources/SDL/SDL/Handles/SensorHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/SensorHandle.gen.cs
rename to sources/SDL/SDL/Handles/SensorHandle.gen.cs
diff --git a/sources/SDL/Handles/StorageHandle.gen.cs b/sources/SDL/SDL/Handles/StorageHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/StorageHandle.gen.cs
rename to sources/SDL/SDL/Handles/StorageHandle.gen.cs
diff --git a/sources/SDL/Handles/TextureHandle.gen.cs b/sources/SDL/SDL/Handles/TextureHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/TextureHandle.gen.cs
rename to sources/SDL/SDL/Handles/TextureHandle.gen.cs
diff --git a/sources/SDL/Handles/ThreadHandle.gen.cs b/sources/SDL/SDL/Handles/ThreadHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/ThreadHandle.gen.cs
rename to sources/SDL/SDL/Handles/ThreadHandle.gen.cs
diff --git a/sources/SDL/Handles/WindowHandle.gen.cs b/sources/SDL/SDL/Handles/WindowHandle.gen.cs
similarity index 100%
rename from sources/SDL/Handles/WindowHandle.gen.cs
rename to sources/SDL/SDL/Handles/WindowHandle.gen.cs
diff --git a/sources/SDL/SDL3/ArrayOrder.gen.cs b/sources/SDL/SDL/SDL3/ArrayOrder.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ArrayOrder.gen.cs
rename to sources/SDL/SDL/SDL3/ArrayOrder.gen.cs
diff --git a/sources/SDL/SDL3/AssertData.gen.cs b/sources/SDL/SDL/SDL3/AssertData.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/AssertData.gen.cs
rename to sources/SDL/SDL/SDL3/AssertData.gen.cs
diff --git a/sources/SDL/SDL3/AssertState.gen.cs b/sources/SDL/SDL/SDL3/AssertState.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/AssertState.gen.cs
rename to sources/SDL/SDL/SDL3/AssertState.gen.cs
diff --git a/sources/SDL/SDL3/AssertionHandler.gen.cs b/sources/SDL/SDL/SDL3/AssertionHandler.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/AssertionHandler.gen.cs
rename to sources/SDL/SDL/SDL3/AssertionHandler.gen.cs
diff --git a/sources/SDL/SDL3/AssertionHandlerDelegate.gen.cs b/sources/SDL/SDL/SDL3/AssertionHandlerDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/AssertionHandlerDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/AssertionHandlerDelegate.gen.cs
diff --git a/sources/SDL/SDL3/AtomicInt.gen.cs b/sources/SDL/SDL/SDL3/AtomicInt.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/AtomicInt.gen.cs
rename to sources/SDL/SDL/SDL3/AtomicInt.gen.cs
diff --git a/sources/SDL/SDL3/AudioDeviceEvent.gen.cs b/sources/SDL/SDL/SDL3/AudioDeviceEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/AudioDeviceEvent.gen.cs
rename to sources/SDL/SDL/SDL3/AudioDeviceEvent.gen.cs
diff --git a/sources/SDL/SDL3/AudioPostmixCallback.gen.cs b/sources/SDL/SDL/SDL3/AudioPostmixCallback.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/AudioPostmixCallback.gen.cs
rename to sources/SDL/SDL/SDL3/AudioPostmixCallback.gen.cs
diff --git a/sources/SDL/SDL3/AudioPostmixCallbackDelegate.gen.cs b/sources/SDL/SDL/SDL3/AudioPostmixCallbackDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/AudioPostmixCallbackDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/AudioPostmixCallbackDelegate.gen.cs
diff --git a/sources/SDL/SDL3/AudioSpec.gen.cs b/sources/SDL/SDL/SDL3/AudioSpec.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/AudioSpec.gen.cs
rename to sources/SDL/SDL/SDL3/AudioSpec.gen.cs
diff --git a/sources/SDL/SDL3/AudioStreamCallback.gen.cs b/sources/SDL/SDL/SDL3/AudioStreamCallback.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/AudioStreamCallback.gen.cs
rename to sources/SDL/SDL/SDL3/AudioStreamCallback.gen.cs
diff --git a/sources/SDL/SDL3/AudioStreamCallbackDelegate.gen.cs b/sources/SDL/SDL/SDL3/AudioStreamCallbackDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/AudioStreamCallbackDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/AudioStreamCallbackDelegate.gen.cs
diff --git a/sources/SDL/SDL3/BitmapOrder.gen.cs b/sources/SDL/SDL/SDL3/BitmapOrder.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/BitmapOrder.gen.cs
rename to sources/SDL/SDL/SDL3/BitmapOrder.gen.cs
diff --git a/sources/SDL/SDL3/BlendFactor.gen.cs b/sources/SDL/SDL/SDL3/BlendFactor.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/BlendFactor.gen.cs
rename to sources/SDL/SDL/SDL3/BlendFactor.gen.cs
diff --git a/sources/SDL/SDL3/BlendMode.gen.cs b/sources/SDL/SDL/SDL3/BlendMode.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/BlendMode.gen.cs
rename to sources/SDL/SDL/SDL3/BlendMode.gen.cs
diff --git a/sources/SDL/SDL3/BlendOperation.gen.cs b/sources/SDL/SDL/SDL3/BlendOperation.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/BlendOperation.gen.cs
rename to sources/SDL/SDL/SDL3/BlendOperation.gen.cs
diff --git a/sources/SDL/SDL3/CameraDeviceEvent.gen.cs b/sources/SDL/SDL/SDL3/CameraDeviceEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/CameraDeviceEvent.gen.cs
rename to sources/SDL/SDL/SDL3/CameraDeviceEvent.gen.cs
diff --git a/sources/SDL/SDL3/CameraPosition.gen.cs b/sources/SDL/SDL/SDL3/CameraPosition.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/CameraPosition.gen.cs
rename to sources/SDL/SDL/SDL3/CameraPosition.gen.cs
diff --git a/sources/SDL/SDL3/CameraSpec.gen.cs b/sources/SDL/SDL/SDL3/CameraSpec.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/CameraSpec.gen.cs
rename to sources/SDL/SDL/SDL3/CameraSpec.gen.cs
diff --git a/sources/SDL/SDL3/ChromaLocation.gen.cs b/sources/SDL/SDL/SDL3/ChromaLocation.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ChromaLocation.gen.cs
rename to sources/SDL/SDL/SDL3/ChromaLocation.gen.cs
diff --git a/sources/SDL/SDL3/ClipboardCleanupCallback.gen.cs b/sources/SDL/SDL/SDL3/ClipboardCleanupCallback.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ClipboardCleanupCallback.gen.cs
rename to sources/SDL/SDL/SDL3/ClipboardCleanupCallback.gen.cs
diff --git a/sources/SDL/SDL3/ClipboardCleanupCallbackDelegate.gen.cs b/sources/SDL/SDL/SDL3/ClipboardCleanupCallbackDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ClipboardCleanupCallbackDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/ClipboardCleanupCallbackDelegate.gen.cs
diff --git a/sources/SDL/SDL3/ClipboardDataCallback.gen.cs b/sources/SDL/SDL/SDL3/ClipboardDataCallback.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ClipboardDataCallback.gen.cs
rename to sources/SDL/SDL/SDL3/ClipboardDataCallback.gen.cs
diff --git a/sources/SDL/SDL3/ClipboardDataCallbackDelegate.gen.cs b/sources/SDL/SDL/SDL3/ClipboardDataCallbackDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ClipboardDataCallbackDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/ClipboardDataCallbackDelegate.gen.cs
diff --git a/sources/SDL/SDL3/ClipboardEvent.gen.cs b/sources/SDL/SDL/SDL3/ClipboardEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ClipboardEvent.gen.cs
rename to sources/SDL/SDL/SDL3/ClipboardEvent.gen.cs
diff --git a/sources/SDL/SDL3/Color.gen.cs b/sources/SDL/SDL/SDL3/Color.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Color.gen.cs
rename to sources/SDL/SDL/SDL3/Color.gen.cs
diff --git a/sources/SDL/SDL3/ColorPrimaries.gen.cs b/sources/SDL/SDL/SDL3/ColorPrimaries.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ColorPrimaries.gen.cs
rename to sources/SDL/SDL/SDL3/ColorPrimaries.gen.cs
diff --git a/sources/SDL/SDL3/ColorRange.gen.cs b/sources/SDL/SDL/SDL3/ColorRange.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ColorRange.gen.cs
rename to sources/SDL/SDL/SDL3/ColorRange.gen.cs
diff --git a/sources/SDL/SDL3/ColorType.gen.cs b/sources/SDL/SDL/SDL3/ColorType.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ColorType.gen.cs
rename to sources/SDL/SDL/SDL3/ColorType.gen.cs
diff --git a/sources/SDL/SDL3/Colorspace.gen.cs b/sources/SDL/SDL/SDL3/Colorspace.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Colorspace.gen.cs
rename to sources/SDL/SDL/SDL3/Colorspace.gen.cs
diff --git a/sources/SDL/SDL3/CommonEvent.gen.cs b/sources/SDL/SDL/SDL3/CommonEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/CommonEvent.gen.cs
rename to sources/SDL/SDL/SDL3/CommonEvent.gen.cs
diff --git a/sources/SDL/SDL3/DateFormat.gen.cs b/sources/SDL/SDL/SDL3/DateFormat.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/DateFormat.gen.cs
rename to sources/SDL/SDL/SDL3/DateFormat.gen.cs
diff --git a/sources/SDL/SDL3/DateTime.gen.cs b/sources/SDL/SDL/SDL3/DateTime.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/DateTime.gen.cs
rename to sources/SDL/SDL/SDL3/DateTime.gen.cs
diff --git a/sources/SDL/SDL3/DialogFileCallback.gen.cs b/sources/SDL/SDL/SDL3/DialogFileCallback.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/DialogFileCallback.gen.cs
rename to sources/SDL/SDL/SDL3/DialogFileCallback.gen.cs
diff --git a/sources/SDL/SDL3/DialogFileCallbackDelegate.gen.cs b/sources/SDL/SDL/SDL3/DialogFileCallbackDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/DialogFileCallbackDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/DialogFileCallbackDelegate.gen.cs
diff --git a/sources/SDL/SDL3/DialogFileFilter.gen.cs b/sources/SDL/SDL/SDL3/DialogFileFilter.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/DialogFileFilter.gen.cs
rename to sources/SDL/SDL/SDL3/DialogFileFilter.gen.cs
diff --git a/sources/SDL/SDL3/DisplayEvent.gen.cs b/sources/SDL/SDL/SDL3/DisplayEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/DisplayEvent.gen.cs
rename to sources/SDL/SDL/SDL3/DisplayEvent.gen.cs
diff --git a/sources/SDL/SDL3/DisplayMode.gen.cs b/sources/SDL/SDL/SDL3/DisplayMode.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/DisplayMode.gen.cs
rename to sources/SDL/SDL/SDL3/DisplayMode.gen.cs
diff --git a/sources/SDL/SDL3/DisplayOrientation.gen.cs b/sources/SDL/SDL/SDL3/DisplayOrientation.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/DisplayOrientation.gen.cs
rename to sources/SDL/SDL/SDL3/DisplayOrientation.gen.cs
diff --git a/sources/SDL/SDL3/DropEvent.gen.cs b/sources/SDL/SDL/SDL3/DropEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/DropEvent.gen.cs
rename to sources/SDL/SDL/SDL3/DropEvent.gen.cs
diff --git a/sources/SDL/SDL3/EGLAttribArrayCallback.gen.cs b/sources/SDL/SDL/SDL3/EGLAttribArrayCallback.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/EGLAttribArrayCallback.gen.cs
rename to sources/SDL/SDL/SDL3/EGLAttribArrayCallback.gen.cs
diff --git a/sources/SDL/SDL3/EGLAttribArrayCallbackDelegate.gen.cs b/sources/SDL/SDL/SDL3/EGLAttribArrayCallbackDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/EGLAttribArrayCallbackDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/EGLAttribArrayCallbackDelegate.gen.cs
diff --git a/sources/SDL/SDL3/EGLIntArrayCallback.gen.cs b/sources/SDL/SDL/SDL3/EGLIntArrayCallback.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/EGLIntArrayCallback.gen.cs
rename to sources/SDL/SDL/SDL3/EGLIntArrayCallback.gen.cs
diff --git a/sources/SDL/SDL3/EGLIntArrayCallbackDelegate.gen.cs b/sources/SDL/SDL/SDL3/EGLIntArrayCallbackDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/EGLIntArrayCallbackDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/EGLIntArrayCallbackDelegate.gen.cs
diff --git a/sources/SDL/SDL3/EnumerateDirectoryCallback.gen.cs b/sources/SDL/SDL/SDL3/EnumerateDirectoryCallback.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/EnumerateDirectoryCallback.gen.cs
rename to sources/SDL/SDL/SDL3/EnumerateDirectoryCallback.gen.cs
diff --git a/sources/SDL/SDL3/EnumerateDirectoryCallbackDelegate.gen.cs b/sources/SDL/SDL/SDL3/EnumerateDirectoryCallbackDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/EnumerateDirectoryCallbackDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/EnumerateDirectoryCallbackDelegate.gen.cs
diff --git a/sources/SDL/SDL3/EnumeratePropertiesCallback.gen.cs b/sources/SDL/SDL/SDL3/EnumeratePropertiesCallback.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/EnumeratePropertiesCallback.gen.cs
rename to sources/SDL/SDL/SDL3/EnumeratePropertiesCallback.gen.cs
diff --git a/sources/SDL/SDL3/EnumeratePropertiesCallbackDelegate.gen.cs b/sources/SDL/SDL/SDL3/EnumeratePropertiesCallbackDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/EnumeratePropertiesCallbackDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/EnumeratePropertiesCallbackDelegate.gen.cs
diff --git a/sources/SDL/SDL3/Errorcode.gen.cs b/sources/SDL/SDL/SDL3/Errorcode.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Errorcode.gen.cs
rename to sources/SDL/SDL/SDL3/Errorcode.gen.cs
diff --git a/sources/SDL/SDL3/Event.gen.cs b/sources/SDL/SDL/SDL3/Event.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Event.gen.cs
rename to sources/SDL/SDL/SDL3/Event.gen.cs
diff --git a/sources/SDL/SDL3/EventAction.gen.cs b/sources/SDL/SDL/SDL3/EventAction.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/EventAction.gen.cs
rename to sources/SDL/SDL/SDL3/EventAction.gen.cs
diff --git a/sources/SDL/SDL3/EventFilter.gen.cs b/sources/SDL/SDL/SDL3/EventFilter.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/EventFilter.gen.cs
rename to sources/SDL/SDL/SDL3/EventFilter.gen.cs
diff --git a/sources/SDL/SDL3/EventFilterDelegate.gen.cs b/sources/SDL/SDL/SDL3/EventFilterDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/EventFilterDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/EventFilterDelegate.gen.cs
diff --git a/sources/SDL/SDL3/EventPadding.gen.cs b/sources/SDL/SDL/SDL3/EventPadding.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/EventPadding.gen.cs
rename to sources/SDL/SDL/SDL3/EventPadding.gen.cs
diff --git a/sources/SDL/SDL3/EventType.gen.cs b/sources/SDL/SDL/SDL3/EventType.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/EventType.gen.cs
rename to sources/SDL/SDL/SDL3/EventType.gen.cs
diff --git a/sources/SDL/SDL3/FColor.gen.cs b/sources/SDL/SDL/SDL3/FColor.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/FColor.gen.cs
rename to sources/SDL/SDL/SDL3/FColor.gen.cs
diff --git a/sources/SDL/SDL3/FPoint.gen.cs b/sources/SDL/SDL/SDL3/FPoint.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/FPoint.gen.cs
rename to sources/SDL/SDL/SDL3/FPoint.gen.cs
diff --git a/sources/SDL/SDL3/FRect.gen.cs b/sources/SDL/SDL/SDL3/FRect.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/FRect.gen.cs
rename to sources/SDL/SDL/SDL3/FRect.gen.cs
diff --git a/sources/SDL/SDL3/Finger.gen.cs b/sources/SDL/SDL/SDL3/Finger.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Finger.gen.cs
rename to sources/SDL/SDL/SDL3/Finger.gen.cs
diff --git a/sources/SDL/SDL3/FlashOperation.gen.cs b/sources/SDL/SDL/SDL3/FlashOperation.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/FlashOperation.gen.cs
rename to sources/SDL/SDL/SDL3/FlashOperation.gen.cs
diff --git a/sources/SDL/SDL3/FlipMode.gen.cs b/sources/SDL/SDL/SDL3/FlipMode.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/FlipMode.gen.cs
rename to sources/SDL/SDL/SDL3/FlipMode.gen.cs
diff --git a/sources/SDL/SDL3/Folder.gen.cs b/sources/SDL/SDL/SDL3/Folder.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Folder.gen.cs
rename to sources/SDL/SDL/SDL3/Folder.gen.cs
diff --git a/sources/SDL/SDL3/FunctionPointer.gen.cs b/sources/SDL/SDL/SDL3/FunctionPointer.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/FunctionPointer.gen.cs
rename to sources/SDL/SDL/SDL3/FunctionPointer.gen.cs
diff --git a/sources/SDL/SDL3/FunctionPointerDelegate.gen.cs b/sources/SDL/SDL/SDL3/FunctionPointerDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/FunctionPointerDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/FunctionPointerDelegate.gen.cs
diff --git a/sources/SDL/SDL3/GLContextResetNotification.gen.cs b/sources/SDL/SDL/SDL3/GLContextResetNotification.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GLContextResetNotification.gen.cs
rename to sources/SDL/SDL/SDL3/GLContextResetNotification.gen.cs
diff --git a/sources/SDL/SDL3/GLattr.gen.cs b/sources/SDL/SDL/SDL3/GLattr.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GLattr.gen.cs
rename to sources/SDL/SDL/SDL3/GLattr.gen.cs
diff --git a/sources/SDL/SDL3/GLcontextFlag.gen.cs b/sources/SDL/SDL/SDL3/GLcontextFlag.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GLcontextFlag.gen.cs
rename to sources/SDL/SDL/SDL3/GLcontextFlag.gen.cs
diff --git a/sources/SDL/SDL3/GLcontextReleaseFlag.gen.cs b/sources/SDL/SDL/SDL3/GLcontextReleaseFlag.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GLcontextReleaseFlag.gen.cs
rename to sources/SDL/SDL/SDL3/GLcontextReleaseFlag.gen.cs
diff --git a/sources/SDL/SDL3/GLprofile.gen.cs b/sources/SDL/SDL/SDL3/GLprofile.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GLprofile.gen.cs
rename to sources/SDL/SDL/SDL3/GLprofile.gen.cs
diff --git a/sources/SDL/SDL3/GamepadAxis.gen.cs b/sources/SDL/SDL/SDL3/GamepadAxis.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadAxis.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadAxis.gen.cs
diff --git a/sources/SDL/SDL3/GamepadAxisEvent.gen.cs b/sources/SDL/SDL/SDL3/GamepadAxisEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadAxisEvent.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadAxisEvent.gen.cs
diff --git a/sources/SDL/SDL3/GamepadBinding.gen.cs b/sources/SDL/SDL/SDL3/GamepadBinding.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadBinding.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadBinding.gen.cs
diff --git a/sources/SDL/SDL3/GamepadBindingInput.gen.cs b/sources/SDL/SDL/SDL3/GamepadBindingInput.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadBindingInput.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadBindingInput.gen.cs
diff --git a/sources/SDL/SDL3/GamepadBindingInputAxis.gen.cs b/sources/SDL/SDL/SDL3/GamepadBindingInputAxis.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadBindingInputAxis.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadBindingInputAxis.gen.cs
diff --git a/sources/SDL/SDL3/GamepadBindingInputHat.gen.cs b/sources/SDL/SDL/SDL3/GamepadBindingInputHat.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadBindingInputHat.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadBindingInputHat.gen.cs
diff --git a/sources/SDL/SDL3/GamepadBindingOutput.gen.cs b/sources/SDL/SDL/SDL3/GamepadBindingOutput.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadBindingOutput.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadBindingOutput.gen.cs
diff --git a/sources/SDL/SDL3/GamepadBindingOutputAxis.gen.cs b/sources/SDL/SDL/SDL3/GamepadBindingOutputAxis.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadBindingOutputAxis.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadBindingOutputAxis.gen.cs
diff --git a/sources/SDL/SDL3/GamepadBindingType.gen.cs b/sources/SDL/SDL/SDL3/GamepadBindingType.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadBindingType.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadBindingType.gen.cs
diff --git a/sources/SDL/SDL3/GamepadButton.gen.cs b/sources/SDL/SDL/SDL3/GamepadButton.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadButton.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadButton.gen.cs
diff --git a/sources/SDL/SDL3/GamepadButtonEvent.gen.cs b/sources/SDL/SDL/SDL3/GamepadButtonEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadButtonEvent.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadButtonEvent.gen.cs
diff --git a/sources/SDL/SDL3/GamepadButtonLabel.gen.cs b/sources/SDL/SDL/SDL3/GamepadButtonLabel.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadButtonLabel.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadButtonLabel.gen.cs
diff --git a/sources/SDL/SDL3/GamepadDeviceEvent.gen.cs b/sources/SDL/SDL/SDL3/GamepadDeviceEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadDeviceEvent.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadDeviceEvent.gen.cs
diff --git a/sources/SDL/SDL3/GamepadSensorEvent.gen.cs b/sources/SDL/SDL/SDL3/GamepadSensorEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadSensorEvent.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadSensorEvent.gen.cs
diff --git a/sources/SDL/SDL3/GamepadSensorEventData.gen.cs b/sources/SDL/SDL/SDL3/GamepadSensorEventData.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadSensorEventData.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadSensorEventData.gen.cs
diff --git a/sources/SDL/SDL3/GamepadTouchpadEvent.gen.cs b/sources/SDL/SDL/SDL3/GamepadTouchpadEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadTouchpadEvent.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadTouchpadEvent.gen.cs
diff --git a/sources/SDL/SDL3/GamepadType.gen.cs b/sources/SDL/SDL/SDL3/GamepadType.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GamepadType.gen.cs
rename to sources/SDL/SDL/SDL3/GamepadType.gen.cs
diff --git a/sources/SDL/SDL3/Guid.gen.cs b/sources/SDL/SDL/SDL3/Guid.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Guid.gen.cs
rename to sources/SDL/SDL/SDL3/Guid.gen.cs
diff --git a/sources/SDL/SDL3/GuidData.gen.cs b/sources/SDL/SDL/SDL3/GuidData.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/GuidData.gen.cs
rename to sources/SDL/SDL/SDL3/GuidData.gen.cs
diff --git a/sources/SDL/SDL3/HapticCondition.gen.cs b/sources/SDL/SDL/SDL3/HapticCondition.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticCondition.gen.cs
rename to sources/SDL/SDL/SDL3/HapticCondition.gen.cs
diff --git a/sources/SDL/SDL3/HapticConditionCenter.gen.cs b/sources/SDL/SDL/SDL3/HapticConditionCenter.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticConditionCenter.gen.cs
rename to sources/SDL/SDL/SDL3/HapticConditionCenter.gen.cs
diff --git a/sources/SDL/SDL3/HapticConditionDeadband.gen.cs b/sources/SDL/SDL/SDL3/HapticConditionDeadband.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticConditionDeadband.gen.cs
rename to sources/SDL/SDL/SDL3/HapticConditionDeadband.gen.cs
diff --git a/sources/SDL/SDL3/HapticConditionLeftCoeff.gen.cs b/sources/SDL/SDL/SDL3/HapticConditionLeftCoeff.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticConditionLeftCoeff.gen.cs
rename to sources/SDL/SDL/SDL3/HapticConditionLeftCoeff.gen.cs
diff --git a/sources/SDL/SDL3/HapticConditionLeftSat.gen.cs b/sources/SDL/SDL/SDL3/HapticConditionLeftSat.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticConditionLeftSat.gen.cs
rename to sources/SDL/SDL/SDL3/HapticConditionLeftSat.gen.cs
diff --git a/sources/SDL/SDL3/HapticConditionRightCoeff.gen.cs b/sources/SDL/SDL/SDL3/HapticConditionRightCoeff.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticConditionRightCoeff.gen.cs
rename to sources/SDL/SDL/SDL3/HapticConditionRightCoeff.gen.cs
diff --git a/sources/SDL/SDL3/HapticConditionRightSat.gen.cs b/sources/SDL/SDL/SDL3/HapticConditionRightSat.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticConditionRightSat.gen.cs
rename to sources/SDL/SDL/SDL3/HapticConditionRightSat.gen.cs
diff --git a/sources/SDL/SDL3/HapticConstant.gen.cs b/sources/SDL/SDL/SDL3/HapticConstant.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticConstant.gen.cs
rename to sources/SDL/SDL/SDL3/HapticConstant.gen.cs
diff --git a/sources/SDL/SDL3/HapticCustom.gen.cs b/sources/SDL/SDL/SDL3/HapticCustom.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticCustom.gen.cs
rename to sources/SDL/SDL/SDL3/HapticCustom.gen.cs
diff --git a/sources/SDL/SDL3/HapticDirection.gen.cs b/sources/SDL/SDL/SDL3/HapticDirection.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticDirection.gen.cs
rename to sources/SDL/SDL/SDL3/HapticDirection.gen.cs
diff --git a/sources/SDL/SDL3/HapticDirectionDir.gen.cs b/sources/SDL/SDL/SDL3/HapticDirectionDir.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticDirectionDir.gen.cs
rename to sources/SDL/SDL/SDL3/HapticDirectionDir.gen.cs
diff --git a/sources/SDL/SDL3/HapticEffect.gen.cs b/sources/SDL/SDL/SDL3/HapticEffect.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticEffect.gen.cs
rename to sources/SDL/SDL/SDL3/HapticEffect.gen.cs
diff --git a/sources/SDL/SDL3/HapticLeftRight.gen.cs b/sources/SDL/SDL/SDL3/HapticLeftRight.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticLeftRight.gen.cs
rename to sources/SDL/SDL/SDL3/HapticLeftRight.gen.cs
diff --git a/sources/SDL/SDL3/HapticPeriodic.gen.cs b/sources/SDL/SDL/SDL3/HapticPeriodic.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticPeriodic.gen.cs
rename to sources/SDL/SDL/SDL3/HapticPeriodic.gen.cs
diff --git a/sources/SDL/SDL3/HapticRamp.gen.cs b/sources/SDL/SDL/SDL3/HapticRamp.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HapticRamp.gen.cs
rename to sources/SDL/SDL/SDL3/HapticRamp.gen.cs
diff --git a/sources/SDL/SDL3/HidBusType.gen.cs b/sources/SDL/SDL/SDL3/HidBusType.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HidBusType.gen.cs
rename to sources/SDL/SDL/SDL3/HidBusType.gen.cs
diff --git a/sources/SDL/SDL3/HidDeviceInfo.gen.cs b/sources/SDL/SDL/SDL3/HidDeviceInfo.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HidDeviceInfo.gen.cs
rename to sources/SDL/SDL/SDL3/HidDeviceInfo.gen.cs
diff --git a/sources/SDL/SDL3/HintCallback.gen.cs b/sources/SDL/SDL/SDL3/HintCallback.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HintCallback.gen.cs
rename to sources/SDL/SDL/SDL3/HintCallback.gen.cs
diff --git a/sources/SDL/SDL3/HintCallbackDelegate.gen.cs b/sources/SDL/SDL/SDL3/HintCallbackDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HintCallbackDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/HintCallbackDelegate.gen.cs
diff --git a/sources/SDL/SDL3/HintPriority.gen.cs b/sources/SDL/SDL/SDL3/HintPriority.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HintPriority.gen.cs
rename to sources/SDL/SDL/SDL3/HintPriority.gen.cs
diff --git a/sources/SDL/SDL3/HitTest.gen.cs b/sources/SDL/SDL/SDL3/HitTest.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HitTest.gen.cs
rename to sources/SDL/SDL/SDL3/HitTest.gen.cs
diff --git a/sources/SDL/SDL3/HitTestDelegate.gen.cs b/sources/SDL/SDL/SDL3/HitTestDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HitTestDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/HitTestDelegate.gen.cs
diff --git a/sources/SDL/SDL3/HitTestResult.gen.cs b/sources/SDL/SDL/SDL3/HitTestResult.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/HitTestResult.gen.cs
rename to sources/SDL/SDL/SDL3/HitTestResult.gen.cs
diff --git a/sources/SDL/SDL3/IOStatus.gen.cs b/sources/SDL/SDL/SDL3/IOStatus.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/IOStatus.gen.cs
rename to sources/SDL/SDL/SDL3/IOStatus.gen.cs
diff --git a/sources/SDL/SDL3/IOStreamInterface.gen.cs b/sources/SDL/SDL/SDL3/IOStreamInterface.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/IOStreamInterface.gen.cs
rename to sources/SDL/SDL/SDL3/IOStreamInterface.gen.cs
diff --git a/sources/SDL/SDL3/IOStreamInterfaceFunction1.gen.cs b/sources/SDL/SDL/SDL3/IOStreamInterfaceFunction1.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/IOStreamInterfaceFunction1.gen.cs
rename to sources/SDL/SDL/SDL3/IOStreamInterfaceFunction1.gen.cs
diff --git a/sources/SDL/SDL3/IOStreamInterfaceFunction1Delegate.gen.cs b/sources/SDL/SDL/SDL3/IOStreamInterfaceFunction1Delegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/IOStreamInterfaceFunction1Delegate.gen.cs
rename to sources/SDL/SDL/SDL3/IOStreamInterfaceFunction1Delegate.gen.cs
diff --git a/sources/SDL/SDL3/IOStreamInterfaceSeek.gen.cs b/sources/SDL/SDL/SDL3/IOStreamInterfaceSeek.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/IOStreamInterfaceSeek.gen.cs
rename to sources/SDL/SDL/SDL3/IOStreamInterfaceSeek.gen.cs
diff --git a/sources/SDL/SDL3/IOStreamInterfaceSeekDelegate.gen.cs b/sources/SDL/SDL/SDL3/IOStreamInterfaceSeekDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/IOStreamInterfaceSeekDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/IOStreamInterfaceSeekDelegate.gen.cs
diff --git a/sources/SDL/SDL3/IOStreamInterfaceSize.gen.cs b/sources/SDL/SDL/SDL3/IOStreamInterfaceSize.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/IOStreamInterfaceSize.gen.cs
rename to sources/SDL/SDL/SDL3/IOStreamInterfaceSize.gen.cs
diff --git a/sources/SDL/SDL3/IOStreamInterfaceSizeDelegate.gen.cs b/sources/SDL/SDL/SDL3/IOStreamInterfaceSizeDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/IOStreamInterfaceSizeDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/IOStreamInterfaceSizeDelegate.gen.cs
diff --git a/sources/SDL/SDL3/ISdl.gen.cs b/sources/SDL/SDL/SDL3/ISdl.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ISdl.gen.cs
rename to sources/SDL/SDL/SDL3/ISdl.gen.cs
diff --git a/sources/SDL/SDL3/InitFlags.gen.cs b/sources/SDL/SDL/SDL3/InitFlags.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/InitFlags.gen.cs
rename to sources/SDL/SDL/SDL3/InitFlags.gen.cs
diff --git a/sources/SDL/SDL3/JoyAxisEvent.gen.cs b/sources/SDL/SDL/SDL3/JoyAxisEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/JoyAxisEvent.gen.cs
rename to sources/SDL/SDL/SDL3/JoyAxisEvent.gen.cs
diff --git a/sources/SDL/SDL3/JoyBallEvent.gen.cs b/sources/SDL/SDL/SDL3/JoyBallEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/JoyBallEvent.gen.cs
rename to sources/SDL/SDL/SDL3/JoyBallEvent.gen.cs
diff --git a/sources/SDL/SDL3/JoyBatteryEvent.gen.cs b/sources/SDL/SDL/SDL3/JoyBatteryEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/JoyBatteryEvent.gen.cs
rename to sources/SDL/SDL/SDL3/JoyBatteryEvent.gen.cs
diff --git a/sources/SDL/SDL3/JoyButtonEvent.gen.cs b/sources/SDL/SDL/SDL3/JoyButtonEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/JoyButtonEvent.gen.cs
rename to sources/SDL/SDL/SDL3/JoyButtonEvent.gen.cs
diff --git a/sources/SDL/SDL3/JoyDeviceEvent.gen.cs b/sources/SDL/SDL/SDL3/JoyDeviceEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/JoyDeviceEvent.gen.cs
rename to sources/SDL/SDL/SDL3/JoyDeviceEvent.gen.cs
diff --git a/sources/SDL/SDL3/JoyHatEvent.gen.cs b/sources/SDL/SDL/SDL3/JoyHatEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/JoyHatEvent.gen.cs
rename to sources/SDL/SDL/SDL3/JoyHatEvent.gen.cs
diff --git a/sources/SDL/SDL3/JoystickConnectionState.gen.cs b/sources/SDL/SDL/SDL3/JoystickConnectionState.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/JoystickConnectionState.gen.cs
rename to sources/SDL/SDL/SDL3/JoystickConnectionState.gen.cs
diff --git a/sources/SDL/SDL3/JoystickType.gen.cs b/sources/SDL/SDL/SDL3/JoystickType.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/JoystickType.gen.cs
rename to sources/SDL/SDL/SDL3/JoystickType.gen.cs
diff --git a/sources/SDL/SDL3/KeyboardDeviceEvent.gen.cs b/sources/SDL/SDL/SDL3/KeyboardDeviceEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/KeyboardDeviceEvent.gen.cs
rename to sources/SDL/SDL/SDL3/KeyboardDeviceEvent.gen.cs
diff --git a/sources/SDL/SDL3/KeyboardEvent.gen.cs b/sources/SDL/SDL/SDL3/KeyboardEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/KeyboardEvent.gen.cs
rename to sources/SDL/SDL/SDL3/KeyboardEvent.gen.cs
diff --git a/sources/SDL/SDL3/Keymod.gen.cs b/sources/SDL/SDL/SDL3/Keymod.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Keymod.gen.cs
rename to sources/SDL/SDL/SDL3/Keymod.gen.cs
diff --git a/sources/SDL/SDL3/Keysym.gen.cs b/sources/SDL/SDL/SDL3/Keysym.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Keysym.gen.cs
rename to sources/SDL/SDL/SDL3/Keysym.gen.cs
diff --git a/sources/SDL/SDL3/Locale.gen.cs b/sources/SDL/SDL/SDL3/Locale.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Locale.gen.cs
rename to sources/SDL/SDL/SDL3/Locale.gen.cs
diff --git a/sources/SDL/SDL3/LogCategory.gen.cs b/sources/SDL/SDL/SDL3/LogCategory.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/LogCategory.gen.cs
rename to sources/SDL/SDL/SDL3/LogCategory.gen.cs
diff --git a/sources/SDL/SDL3/LogOutputFunction.gen.cs b/sources/SDL/SDL/SDL3/LogOutputFunction.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/LogOutputFunction.gen.cs
rename to sources/SDL/SDL/SDL3/LogOutputFunction.gen.cs
diff --git a/sources/SDL/SDL3/LogOutputFunctionDelegate.gen.cs b/sources/SDL/SDL/SDL3/LogOutputFunctionDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/LogOutputFunctionDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/LogOutputFunctionDelegate.gen.cs
diff --git a/sources/SDL/SDL3/LogPriority.gen.cs b/sources/SDL/SDL/SDL3/LogPriority.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/LogPriority.gen.cs
rename to sources/SDL/SDL/SDL3/LogPriority.gen.cs
diff --git a/sources/SDL/SDL3/MatrixCoefficients.gen.cs b/sources/SDL/SDL/SDL3/MatrixCoefficients.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MatrixCoefficients.gen.cs
rename to sources/SDL/SDL/SDL3/MatrixCoefficients.gen.cs
diff --git a/sources/SDL/SDL3/MessageBoxButtonData.gen.cs b/sources/SDL/SDL/SDL3/MessageBoxButtonData.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MessageBoxButtonData.gen.cs
rename to sources/SDL/SDL/SDL3/MessageBoxButtonData.gen.cs
diff --git a/sources/SDL/SDL3/MessageBoxButtonFlags.gen.cs b/sources/SDL/SDL/SDL3/MessageBoxButtonFlags.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MessageBoxButtonFlags.gen.cs
rename to sources/SDL/SDL/SDL3/MessageBoxButtonFlags.gen.cs
diff --git a/sources/SDL/SDL3/MessageBoxColor.gen.cs b/sources/SDL/SDL/SDL3/MessageBoxColor.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MessageBoxColor.gen.cs
rename to sources/SDL/SDL/SDL3/MessageBoxColor.gen.cs
diff --git a/sources/SDL/SDL3/MessageBoxColorScheme.gen.cs b/sources/SDL/SDL/SDL3/MessageBoxColorScheme.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MessageBoxColorScheme.gen.cs
rename to sources/SDL/SDL/SDL3/MessageBoxColorScheme.gen.cs
diff --git a/sources/SDL/SDL3/MessageBoxColorSchemeColors.gen.cs b/sources/SDL/SDL/SDL3/MessageBoxColorSchemeColors.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MessageBoxColorSchemeColors.gen.cs
rename to sources/SDL/SDL/SDL3/MessageBoxColorSchemeColors.gen.cs
diff --git a/sources/SDL/SDL3/MessageBoxColorType.gen.cs b/sources/SDL/SDL/SDL3/MessageBoxColorType.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MessageBoxColorType.gen.cs
rename to sources/SDL/SDL/SDL3/MessageBoxColorType.gen.cs
diff --git a/sources/SDL/SDL3/MessageBoxData.gen.cs b/sources/SDL/SDL/SDL3/MessageBoxData.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MessageBoxData.gen.cs
rename to sources/SDL/SDL/SDL3/MessageBoxData.gen.cs
diff --git a/sources/SDL/SDL3/MessageBoxFlags.gen.cs b/sources/SDL/SDL/SDL3/MessageBoxFlags.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MessageBoxFlags.gen.cs
rename to sources/SDL/SDL/SDL3/MessageBoxFlags.gen.cs
diff --git a/sources/SDL/SDL3/MouseButtonEvent.gen.cs b/sources/SDL/SDL/SDL3/MouseButtonEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MouseButtonEvent.gen.cs
rename to sources/SDL/SDL/SDL3/MouseButtonEvent.gen.cs
diff --git a/sources/SDL/SDL3/MouseDeviceEvent.gen.cs b/sources/SDL/SDL/SDL3/MouseDeviceEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MouseDeviceEvent.gen.cs
rename to sources/SDL/SDL/SDL3/MouseDeviceEvent.gen.cs
diff --git a/sources/SDL/SDL3/MouseMotionEvent.gen.cs b/sources/SDL/SDL/SDL3/MouseMotionEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MouseMotionEvent.gen.cs
rename to sources/SDL/SDL/SDL3/MouseMotionEvent.gen.cs
diff --git a/sources/SDL/SDL3/MouseWheelDirection.gen.cs b/sources/SDL/SDL/SDL3/MouseWheelDirection.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MouseWheelDirection.gen.cs
rename to sources/SDL/SDL/SDL3/MouseWheelDirection.gen.cs
diff --git a/sources/SDL/SDL3/MouseWheelEvent.gen.cs b/sources/SDL/SDL/SDL3/MouseWheelEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/MouseWheelEvent.gen.cs
rename to sources/SDL/SDL/SDL3/MouseWheelEvent.gen.cs
diff --git a/sources/SDL/SDL3/PackedLayout.gen.cs b/sources/SDL/SDL/SDL3/PackedLayout.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PackedLayout.gen.cs
rename to sources/SDL/SDL/SDL3/PackedLayout.gen.cs
diff --git a/sources/SDL/SDL3/PackedOrder.gen.cs b/sources/SDL/SDL/SDL3/PackedOrder.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PackedOrder.gen.cs
rename to sources/SDL/SDL/SDL3/PackedOrder.gen.cs
diff --git a/sources/SDL/SDL3/Palette.gen.cs b/sources/SDL/SDL/SDL3/Palette.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Palette.gen.cs
rename to sources/SDL/SDL/SDL3/Palette.gen.cs
diff --git a/sources/SDL/SDL3/PathInfo.gen.cs b/sources/SDL/SDL/SDL3/PathInfo.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PathInfo.gen.cs
rename to sources/SDL/SDL/SDL3/PathInfo.gen.cs
diff --git a/sources/SDL/SDL3/PathType.gen.cs b/sources/SDL/SDL/SDL3/PathType.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PathType.gen.cs
rename to sources/SDL/SDL/SDL3/PathType.gen.cs
diff --git a/sources/SDL/SDL3/PenAxis.gen.cs b/sources/SDL/SDL/SDL3/PenAxis.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PenAxis.gen.cs
rename to sources/SDL/SDL/SDL3/PenAxis.gen.cs
diff --git a/sources/SDL/SDL3/PenButtonEvent.gen.cs b/sources/SDL/SDL/SDL3/PenButtonEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PenButtonEvent.gen.cs
rename to sources/SDL/SDL/SDL3/PenButtonEvent.gen.cs
diff --git a/sources/SDL/SDL3/PenButtonEventAxes.gen.cs b/sources/SDL/SDL/SDL3/PenButtonEventAxes.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PenButtonEventAxes.gen.cs
rename to sources/SDL/SDL/SDL3/PenButtonEventAxes.gen.cs
diff --git a/sources/SDL/SDL3/PenCapabilityInfo.gen.cs b/sources/SDL/SDL/SDL3/PenCapabilityInfo.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PenCapabilityInfo.gen.cs
rename to sources/SDL/SDL/SDL3/PenCapabilityInfo.gen.cs
diff --git a/sources/SDL/SDL3/PenMotionEvent.gen.cs b/sources/SDL/SDL/SDL3/PenMotionEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PenMotionEvent.gen.cs
rename to sources/SDL/SDL/SDL3/PenMotionEvent.gen.cs
diff --git a/sources/SDL/SDL3/PenMotionEventAxes.gen.cs b/sources/SDL/SDL/SDL3/PenMotionEventAxes.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PenMotionEventAxes.gen.cs
rename to sources/SDL/SDL/SDL3/PenMotionEventAxes.gen.cs
diff --git a/sources/SDL/SDL3/PenSubtype.gen.cs b/sources/SDL/SDL/SDL3/PenSubtype.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PenSubtype.gen.cs
rename to sources/SDL/SDL/SDL3/PenSubtype.gen.cs
diff --git a/sources/SDL/SDL3/PenTipEvent.gen.cs b/sources/SDL/SDL/SDL3/PenTipEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PenTipEvent.gen.cs
rename to sources/SDL/SDL/SDL3/PenTipEvent.gen.cs
diff --git a/sources/SDL/SDL3/PenTipEventAxes.gen.cs b/sources/SDL/SDL/SDL3/PenTipEventAxes.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PenTipEventAxes.gen.cs
rename to sources/SDL/SDL/SDL3/PenTipEventAxes.gen.cs
diff --git a/sources/SDL/SDL3/PixelFormat.gen.cs b/sources/SDL/SDL/SDL3/PixelFormat.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PixelFormat.gen.cs
rename to sources/SDL/SDL/SDL3/PixelFormat.gen.cs
diff --git a/sources/SDL/SDL3/PixelFormatEnum.gen.cs b/sources/SDL/SDL/SDL3/PixelFormatEnum.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PixelFormatEnum.gen.cs
rename to sources/SDL/SDL/SDL3/PixelFormatEnum.gen.cs
diff --git a/sources/SDL/SDL3/PixelFormatPadding.gen.cs b/sources/SDL/SDL/SDL3/PixelFormatPadding.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PixelFormatPadding.gen.cs
rename to sources/SDL/SDL/SDL3/PixelFormatPadding.gen.cs
diff --git a/sources/SDL/SDL3/PixelType.gen.cs b/sources/SDL/SDL/SDL3/PixelType.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PixelType.gen.cs
rename to sources/SDL/SDL/SDL3/PixelType.gen.cs
diff --git a/sources/SDL/SDL3/Point.gen.cs b/sources/SDL/SDL/SDL3/Point.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Point.gen.cs
rename to sources/SDL/SDL/SDL3/Point.gen.cs
diff --git a/sources/SDL/SDL3/PowerState.gen.cs b/sources/SDL/SDL/SDL3/PowerState.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PowerState.gen.cs
rename to sources/SDL/SDL/SDL3/PowerState.gen.cs
diff --git a/sources/SDL/SDL3/PropertyType.gen.cs b/sources/SDL/SDL/SDL3/PropertyType.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/PropertyType.gen.cs
rename to sources/SDL/SDL/SDL3/PropertyType.gen.cs
diff --git a/sources/SDL/SDL3/QuitEvent.gen.cs b/sources/SDL/SDL/SDL3/QuitEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/QuitEvent.gen.cs
rename to sources/SDL/SDL/SDL3/QuitEvent.gen.cs
diff --git a/sources/SDL/SDL3/Rect.gen.cs b/sources/SDL/SDL/SDL3/Rect.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Rect.gen.cs
rename to sources/SDL/SDL/SDL3/Rect.gen.cs
diff --git a/sources/SDL/SDL3/RendererFlags.gen.cs b/sources/SDL/SDL/SDL3/RendererFlags.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/RendererFlags.gen.cs
rename to sources/SDL/SDL/SDL3/RendererFlags.gen.cs
diff --git a/sources/SDL/SDL3/RendererInfo.gen.cs b/sources/SDL/SDL/SDL3/RendererInfo.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/RendererInfo.gen.cs
rename to sources/SDL/SDL/SDL3/RendererInfo.gen.cs
diff --git a/sources/SDL/SDL3/RendererInfoTextureFormats.gen.cs b/sources/SDL/SDL/SDL3/RendererInfoTextureFormats.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/RendererInfoTextureFormats.gen.cs
rename to sources/SDL/SDL/SDL3/RendererInfoTextureFormats.gen.cs
diff --git a/sources/SDL/SDL3/RendererLogicalPresentation.gen.cs b/sources/SDL/SDL/SDL3/RendererLogicalPresentation.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/RendererLogicalPresentation.gen.cs
rename to sources/SDL/SDL/SDL3/RendererLogicalPresentation.gen.cs
diff --git a/sources/SDL/SDL3/ScaleMode.gen.cs b/sources/SDL/SDL/SDL3/ScaleMode.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ScaleMode.gen.cs
rename to sources/SDL/SDL/SDL3/ScaleMode.gen.cs
diff --git a/sources/SDL/SDL3/Scancode.gen.cs b/sources/SDL/SDL/SDL3/Scancode.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Scancode.gen.cs
rename to sources/SDL/SDL/SDL3/Scancode.gen.cs
diff --git a/sources/SDL/SDL3/Sdl.gen.cs b/sources/SDL/SDL/SDL3/Sdl.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Sdl.gen.cs
rename to sources/SDL/SDL/SDL3/Sdl.gen.cs
diff --git a/sources/SDL/SDL3/SensorEvent.gen.cs b/sources/SDL/SDL/SDL3/SensorEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/SensorEvent.gen.cs
rename to sources/SDL/SDL/SDL3/SensorEvent.gen.cs
diff --git a/sources/SDL/SDL3/SensorEventData.gen.cs b/sources/SDL/SDL/SDL3/SensorEventData.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/SensorEventData.gen.cs
rename to sources/SDL/SDL/SDL3/SensorEventData.gen.cs
diff --git a/sources/SDL/SDL3/SensorType.gen.cs b/sources/SDL/SDL/SDL3/SensorType.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/SensorType.gen.cs
rename to sources/SDL/SDL/SDL3/SensorType.gen.cs
diff --git a/sources/SDL/SDL3/SetPropertyWithCleanupCleanup.gen.cs b/sources/SDL/SDL/SDL3/SetPropertyWithCleanupCleanup.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/SetPropertyWithCleanupCleanup.gen.cs
rename to sources/SDL/SDL/SDL3/SetPropertyWithCleanupCleanup.gen.cs
diff --git a/sources/SDL/SDL3/SetPropertyWithCleanupCleanupDelegate.gen.cs b/sources/SDL/SDL/SDL3/SetPropertyWithCleanupCleanupDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/SetPropertyWithCleanupCleanupDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/SetPropertyWithCleanupCleanupDelegate.gen.cs
diff --git a/sources/SDL/SDL3/StorageInterface.gen.cs b/sources/SDL/SDL/SDL3/StorageInterface.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/StorageInterface.gen.cs
rename to sources/SDL/SDL/SDL3/StorageInterface.gen.cs
diff --git a/sources/SDL/SDL3/StorageInterfaceEnumerate.gen.cs b/sources/SDL/SDL/SDL3/StorageInterfaceEnumerate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/StorageInterfaceEnumerate.gen.cs
rename to sources/SDL/SDL/SDL3/StorageInterfaceEnumerate.gen.cs
diff --git a/sources/SDL/SDL3/StorageInterfaceEnumerateDelegate.gen.cs b/sources/SDL/SDL/SDL3/StorageInterfaceEnumerateDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/StorageInterfaceEnumerateDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/StorageInterfaceEnumerateDelegate.gen.cs
diff --git a/sources/SDL/SDL3/StorageInterfaceFunction1.gen.cs b/sources/SDL/SDL/SDL3/StorageInterfaceFunction1.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/StorageInterfaceFunction1.gen.cs
rename to sources/SDL/SDL/SDL3/StorageInterfaceFunction1.gen.cs
diff --git a/sources/SDL/SDL3/StorageInterfaceFunction1Delegate.gen.cs b/sources/SDL/SDL/SDL3/StorageInterfaceFunction1Delegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/StorageInterfaceFunction1Delegate.gen.cs
rename to sources/SDL/SDL/SDL3/StorageInterfaceFunction1Delegate.gen.cs
diff --git a/sources/SDL/SDL3/StorageInterfaceFunction2.gen.cs b/sources/SDL/SDL/SDL3/StorageInterfaceFunction2.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/StorageInterfaceFunction2.gen.cs
rename to sources/SDL/SDL/SDL3/StorageInterfaceFunction2.gen.cs
diff --git a/sources/SDL/SDL3/StorageInterfaceFunction2Delegate.gen.cs b/sources/SDL/SDL/SDL3/StorageInterfaceFunction2Delegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/StorageInterfaceFunction2Delegate.gen.cs
rename to sources/SDL/SDL/SDL3/StorageInterfaceFunction2Delegate.gen.cs
diff --git a/sources/SDL/SDL3/StorageInterfaceInfo.gen.cs b/sources/SDL/SDL/SDL3/StorageInterfaceInfo.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/StorageInterfaceInfo.gen.cs
rename to sources/SDL/SDL/SDL3/StorageInterfaceInfo.gen.cs
diff --git a/sources/SDL/SDL3/StorageInterfaceInfoDelegate.gen.cs b/sources/SDL/SDL/SDL3/StorageInterfaceInfoDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/StorageInterfaceInfoDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/StorageInterfaceInfoDelegate.gen.cs
diff --git a/sources/SDL/SDL3/StorageInterfaceSpaceRemaining.gen.cs b/sources/SDL/SDL/SDL3/StorageInterfaceSpaceRemaining.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/StorageInterfaceSpaceRemaining.gen.cs
rename to sources/SDL/SDL/SDL3/StorageInterfaceSpaceRemaining.gen.cs
diff --git a/sources/SDL/SDL3/StorageInterfaceSpaceRemainingDelegate.gen.cs b/sources/SDL/SDL/SDL3/StorageInterfaceSpaceRemainingDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/StorageInterfaceSpaceRemainingDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/StorageInterfaceSpaceRemainingDelegate.gen.cs
diff --git a/sources/SDL/SDL3/Surface.gen.cs b/sources/SDL/SDL/SDL3/Surface.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Surface.gen.cs
rename to sources/SDL/SDL/SDL3/Surface.gen.cs
diff --git a/sources/SDL/SDL3/SystemCursor.gen.cs b/sources/SDL/SDL/SDL3/SystemCursor.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/SystemCursor.gen.cs
rename to sources/SDL/SDL/SDL3/SystemCursor.gen.cs
diff --git a/sources/SDL/SDL3/SystemTheme.gen.cs b/sources/SDL/SDL/SDL3/SystemTheme.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/SystemTheme.gen.cs
rename to sources/SDL/SDL/SDL3/SystemTheme.gen.cs
diff --git a/sources/SDL/SDL3/TextEditingEvent.gen.cs b/sources/SDL/SDL/SDL3/TextEditingEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/TextEditingEvent.gen.cs
rename to sources/SDL/SDL/SDL3/TextEditingEvent.gen.cs
diff --git a/sources/SDL/SDL3/TextInputEvent.gen.cs b/sources/SDL/SDL/SDL3/TextInputEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/TextInputEvent.gen.cs
rename to sources/SDL/SDL/SDL3/TextInputEvent.gen.cs
diff --git a/sources/SDL/SDL3/TextureAccess.gen.cs b/sources/SDL/SDL/SDL3/TextureAccess.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/TextureAccess.gen.cs
rename to sources/SDL/SDL/SDL3/TextureAccess.gen.cs
diff --git a/sources/SDL/SDL3/ThreadFunction.gen.cs b/sources/SDL/SDL/SDL3/ThreadFunction.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ThreadFunction.gen.cs
rename to sources/SDL/SDL/SDL3/ThreadFunction.gen.cs
diff --git a/sources/SDL/SDL3/ThreadFunctionDelegate.gen.cs b/sources/SDL/SDL/SDL3/ThreadFunctionDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ThreadFunctionDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/ThreadFunctionDelegate.gen.cs
diff --git a/sources/SDL/SDL3/ThreadPriority.gen.cs b/sources/SDL/SDL/SDL3/ThreadPriority.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/ThreadPriority.gen.cs
rename to sources/SDL/SDL/SDL3/ThreadPriority.gen.cs
diff --git a/sources/SDL/SDL3/TimeFormat.gen.cs b/sources/SDL/SDL/SDL3/TimeFormat.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/TimeFormat.gen.cs
rename to sources/SDL/SDL/SDL3/TimeFormat.gen.cs
diff --git a/sources/SDL/SDL3/TimerCallback.gen.cs b/sources/SDL/SDL/SDL3/TimerCallback.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/TimerCallback.gen.cs
rename to sources/SDL/SDL/SDL3/TimerCallback.gen.cs
diff --git a/sources/SDL/SDL3/TimerCallbackDelegate.gen.cs b/sources/SDL/SDL/SDL3/TimerCallbackDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/TimerCallbackDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/TimerCallbackDelegate.gen.cs
diff --git a/sources/SDL/SDL3/TouchDeviceType.gen.cs b/sources/SDL/SDL/SDL3/TouchDeviceType.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/TouchDeviceType.gen.cs
rename to sources/SDL/SDL/SDL3/TouchDeviceType.gen.cs
diff --git a/sources/SDL/SDL3/TouchFingerEvent.gen.cs b/sources/SDL/SDL/SDL3/TouchFingerEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/TouchFingerEvent.gen.cs
rename to sources/SDL/SDL/SDL3/TouchFingerEvent.gen.cs
diff --git a/sources/SDL/SDL3/TransferCharacteristics.gen.cs b/sources/SDL/SDL/SDL3/TransferCharacteristics.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/TransferCharacteristics.gen.cs
rename to sources/SDL/SDL/SDL3/TransferCharacteristics.gen.cs
diff --git a/sources/SDL/SDL3/UserEvent.gen.cs b/sources/SDL/SDL/SDL3/UserEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/UserEvent.gen.cs
rename to sources/SDL/SDL/SDL3/UserEvent.gen.cs
diff --git a/sources/SDL/SDL3/Version.gen.cs b/sources/SDL/SDL/SDL3/Version.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Version.gen.cs
rename to sources/SDL/SDL/SDL3/Version.gen.cs
diff --git a/sources/SDL/SDL3/Vertex.gen.cs b/sources/SDL/SDL/SDL3/Vertex.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/Vertex.gen.cs
rename to sources/SDL/SDL/SDL3/Vertex.gen.cs
diff --git a/sources/SDL/SDL3/VirtualJoystickDesc.gen.cs b/sources/SDL/SDL/SDL3/VirtualJoystickDesc.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/VirtualJoystickDesc.gen.cs
rename to sources/SDL/SDL/SDL3/VirtualJoystickDesc.gen.cs
diff --git a/sources/SDL/SDL3/VirtualJoystickDescFunction1.gen.cs b/sources/SDL/SDL/SDL3/VirtualJoystickDescFunction1.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/VirtualJoystickDescFunction1.gen.cs
rename to sources/SDL/SDL/SDL3/VirtualJoystickDescFunction1.gen.cs
diff --git a/sources/SDL/SDL3/VirtualJoystickDescFunction1Delegate.gen.cs b/sources/SDL/SDL/SDL3/VirtualJoystickDescFunction1Delegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/VirtualJoystickDescFunction1Delegate.gen.cs
rename to sources/SDL/SDL/SDL3/VirtualJoystickDescFunction1Delegate.gen.cs
diff --git a/sources/SDL/SDL3/VirtualJoystickDescSendEffect.gen.cs b/sources/SDL/SDL/SDL3/VirtualJoystickDescSendEffect.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/VirtualJoystickDescSendEffect.gen.cs
rename to sources/SDL/SDL/SDL3/VirtualJoystickDescSendEffect.gen.cs
diff --git a/sources/SDL/SDL3/VirtualJoystickDescSendEffectDelegate.gen.cs b/sources/SDL/SDL/SDL3/VirtualJoystickDescSendEffectDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/VirtualJoystickDescSendEffectDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/VirtualJoystickDescSendEffectDelegate.gen.cs
diff --git a/sources/SDL/SDL3/VirtualJoystickDescSetLED.gen.cs b/sources/SDL/SDL/SDL3/VirtualJoystickDescSetLED.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/VirtualJoystickDescSetLED.gen.cs
rename to sources/SDL/SDL/SDL3/VirtualJoystickDescSetLED.gen.cs
diff --git a/sources/SDL/SDL3/VirtualJoystickDescSetLEDDelegate.gen.cs b/sources/SDL/SDL/SDL3/VirtualJoystickDescSetLEDDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/VirtualJoystickDescSetLEDDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/VirtualJoystickDescSetLEDDelegate.gen.cs
diff --git a/sources/SDL/SDL3/VirtualJoystickDescSetPlayerIndex.gen.cs b/sources/SDL/SDL/SDL3/VirtualJoystickDescSetPlayerIndex.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/VirtualJoystickDescSetPlayerIndex.gen.cs
rename to sources/SDL/SDL/SDL3/VirtualJoystickDescSetPlayerIndex.gen.cs
diff --git a/sources/SDL/SDL3/VirtualJoystickDescSetPlayerIndexDelegate.gen.cs b/sources/SDL/SDL/SDL3/VirtualJoystickDescSetPlayerIndexDelegate.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/VirtualJoystickDescSetPlayerIndexDelegate.gen.cs
rename to sources/SDL/SDL/SDL3/VirtualJoystickDescSetPlayerIndexDelegate.gen.cs
diff --git a/sources/SDL/SDL3/WindowEvent.gen.cs b/sources/SDL/SDL/SDL3/WindowEvent.gen.cs
similarity index 100%
rename from sources/SDL/SDL3/WindowEvent.gen.cs
rename to sources/SDL/SDL/SDL3/WindowEvent.gen.cs
diff --git a/sources/SDL/Sdl.gen.cs b/sources/SDL/SDL/Sdl.gen.cs
similarity index 100%
rename from sources/SDL/Sdl.gen.cs
rename to sources/SDL/SDL/Sdl.gen.cs
diff --git a/sources/SDL/SdlContext.cs b/sources/SDL/SDL/SdlContext.cs
similarity index 100%
rename from sources/SDL/SdlContext.cs
rename to sources/SDL/SDL/SdlContext.cs
diff --git a/sources/SDL/SdlException.cs b/sources/SDL/SDL/SdlException.cs
similarity index 100%
rename from sources/SDL/SdlException.cs
rename to sources/SDL/SDL/SdlException.cs
diff --git a/sources/SDL/Silk.NET.SDL.csproj b/sources/SDL/SDL/Silk.NET.SDL.csproj
similarity index 66%
rename from sources/SDL/Silk.NET.SDL.csproj
rename to sources/SDL/SDL/Silk.NET.SDL.csproj
index 5ffbfbb62c..39c9fb9abd 100644
--- a/sources/SDL/Silk.NET.SDL.csproj
+++ b/sources/SDL/SDL/Silk.NET.SDL.csproj
@@ -6,7 +6,7 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Core\Silk.NET.Core.csproj" />
+    <ProjectReference Include="..\..\Core\Core\Silk.NET.Core.csproj" />
   </ItemGroup>
-  <Import Project="..\Core\Silk.NET.Core.targets" />
+  <Import Project="..\..\Core\Core\Silk.NET.Core.targets" />
 </Project>
diff --git a/sources/SilkTouch/Caching/CacheFlags.cs b/sources/SilkTouch/SilkTouch/Caching/CacheFlags.cs
similarity index 100%
rename from sources/SilkTouch/Caching/CacheFlags.cs
rename to sources/SilkTouch/SilkTouch/Caching/CacheFlags.cs
diff --git a/sources/SilkTouch/Caching/CacheIntent.cs b/sources/SilkTouch/SilkTouch/Caching/CacheIntent.cs
similarity index 100%
rename from sources/SilkTouch/Caching/CacheIntent.cs
rename to sources/SilkTouch/SilkTouch/Caching/CacheIntent.cs
diff --git a/sources/SilkTouch/Caching/FileSystemCacheProvider.cs b/sources/SilkTouch/SilkTouch/Caching/FileSystemCacheProvider.cs
similarity index 100%
rename from sources/SilkTouch/Caching/FileSystemCacheProvider.cs
rename to sources/SilkTouch/SilkTouch/Caching/FileSystemCacheProvider.cs
diff --git a/sources/SilkTouch/Caching/ICacheProvider.cs b/sources/SilkTouch/SilkTouch/Caching/ICacheProvider.cs
similarity index 100%
rename from sources/SilkTouch/Caching/ICacheProvider.cs
rename to sources/SilkTouch/SilkTouch/Caching/ICacheProvider.cs
diff --git a/sources/SilkTouch/Clang/ClangScraper.cs b/sources/SilkTouch/SilkTouch/Clang/ClangScraper.cs
similarity index 100%
rename from sources/SilkTouch/Clang/ClangScraper.cs
rename to sources/SilkTouch/SilkTouch/Clang/ClangScraper.cs
diff --git a/sources/SilkTouch/Clang/GeneratedBindings.cs b/sources/SilkTouch/SilkTouch/Clang/GeneratedBindings.cs
similarity index 100%
rename from sources/SilkTouch/Clang/GeneratedBindings.cs
rename to sources/SilkTouch/SilkTouch/Clang/GeneratedBindings.cs
diff --git a/sources/SilkTouch/Clang/IStdIncludeResolver.cs b/sources/SilkTouch/SilkTouch/Clang/IStdIncludeResolver.cs
similarity index 100%
rename from sources/SilkTouch/Clang/IStdIncludeResolver.cs
rename to sources/SilkTouch/SilkTouch/Clang/IStdIncludeResolver.cs
diff --git a/sources/SilkTouch/Clang/MacOSStdIncludeResolver.cs b/sources/SilkTouch/SilkTouch/Clang/MacOSStdIncludeResolver.cs
similarity index 100%
rename from sources/SilkTouch/Clang/MacOSStdIncludeResolver.cs
rename to sources/SilkTouch/SilkTouch/Clang/MacOSStdIncludeResolver.cs
diff --git a/sources/SilkTouch/Clang/ResponseFile.cs b/sources/SilkTouch/SilkTouch/Clang/ResponseFile.cs
similarity index 100%
rename from sources/SilkTouch/Clang/ResponseFile.cs
rename to sources/SilkTouch/SilkTouch/Clang/ResponseFile.cs
diff --git a/sources/SilkTouch/Clang/ResponseFileHandler.cs b/sources/SilkTouch/SilkTouch/Clang/ResponseFileHandler.cs
similarity index 100%
rename from sources/SilkTouch/Clang/ResponseFileHandler.cs
rename to sources/SilkTouch/SilkTouch/Clang/ResponseFileHandler.cs
diff --git a/sources/SilkTouch/Clang/UnixStdIncludeResolver.cs b/sources/SilkTouch/SilkTouch/Clang/UnixStdIncludeResolver.cs
similarity index 100%
rename from sources/SilkTouch/Clang/UnixStdIncludeResolver.cs
rename to sources/SilkTouch/SilkTouch/Clang/UnixStdIncludeResolver.cs
diff --git a/sources/SilkTouch/Clang/VSWhere.cs b/sources/SilkTouch/SilkTouch/Clang/VSWhere.cs
similarity index 100%
rename from sources/SilkTouch/Clang/VSWhere.cs
rename to sources/SilkTouch/SilkTouch/Clang/VSWhere.cs
diff --git a/sources/SilkTouch/Clang/VisualStudioResolver.cs b/sources/SilkTouch/SilkTouch/Clang/VisualStudioResolver.cs
similarity index 100%
rename from sources/SilkTouch/Clang/VisualStudioResolver.cs
rename to sources/SilkTouch/SilkTouch/Clang/VisualStudioResolver.cs
diff --git a/sources/SilkTouch/Clang/VisualStudioVarPrint.bat b/sources/SilkTouch/SilkTouch/Clang/VisualStudioVarPrint.bat
similarity index 100%
rename from sources/SilkTouch/Clang/VisualStudioVarPrint.bat
rename to sources/SilkTouch/SilkTouch/Clang/VisualStudioVarPrint.bat
diff --git a/sources/SilkTouch/Clang/VisualStudioVarPrint.cs b/sources/SilkTouch/SilkTouch/Clang/VisualStudioVarPrint.cs
similarity index 100%
rename from sources/SilkTouch/Clang/VisualStudioVarPrint.cs
rename to sources/SilkTouch/SilkTouch/Clang/VisualStudioVarPrint.cs
diff --git a/sources/SilkTouch/Clang/WindowsStdIncludeResolver.cs b/sources/SilkTouch/SilkTouch/Clang/WindowsStdIncludeResolver.cs
similarity index 100%
rename from sources/SilkTouch/Clang/WindowsStdIncludeResolver.cs
rename to sources/SilkTouch/SilkTouch/Clang/WindowsStdIncludeResolver.cs
diff --git a/sources/SilkTouch/GenerateSources.bat b/sources/SilkTouch/SilkTouch/GenerateSources.bat
similarity index 100%
rename from sources/SilkTouch/GenerateSources.bat
rename to sources/SilkTouch/SilkTouch/GenerateSources.bat
diff --git a/sources/SilkTouch/IJobDependency.cs b/sources/SilkTouch/SilkTouch/IJobDependency.cs
similarity index 100%
rename from sources/SilkTouch/IJobDependency.cs
rename to sources/SilkTouch/SilkTouch/IJobDependency.cs
diff --git a/sources/SilkTouch/JobDependencies.cs b/sources/SilkTouch/SilkTouch/JobDependencies.cs
similarity index 100%
rename from sources/SilkTouch/JobDependencies.cs
rename to sources/SilkTouch/SilkTouch/JobDependencies.cs
diff --git a/sources/SilkTouch/Mods/AddApiProfiles.cs b/sources/SilkTouch/SilkTouch/Mods/AddApiProfiles.cs
similarity index 100%
rename from sources/SilkTouch/Mods/AddApiProfiles.cs
rename to sources/SilkTouch/SilkTouch/Mods/AddApiProfiles.cs
diff --git a/sources/SilkTouch/Mods/AddIncludes.cs b/sources/SilkTouch/SilkTouch/Mods/AddIncludes.cs
similarity index 100%
rename from sources/SilkTouch/Mods/AddIncludes.cs
rename to sources/SilkTouch/SilkTouch/Mods/AddIncludes.cs
diff --git a/sources/SilkTouch/Mods/AddOpaqueStructs.cs b/sources/SilkTouch/SilkTouch/Mods/AddOpaqueStructs.cs
similarity index 100%
rename from sources/SilkTouch/Mods/AddOpaqueStructs.cs
rename to sources/SilkTouch/SilkTouch/Mods/AddOpaqueStructs.cs
diff --git a/sources/SilkTouch/Mods/AddVTables.cs b/sources/SilkTouch/SilkTouch/Mods/AddVTables.cs
similarity index 100%
rename from sources/SilkTouch/Mods/AddVTables.cs
rename to sources/SilkTouch/SilkTouch/Mods/AddVTables.cs
diff --git a/sources/SilkTouch/Mods/ChangeNamespace.cs b/sources/SilkTouch/SilkTouch/Mods/ChangeNamespace.cs
similarity index 100%
rename from sources/SilkTouch/Mods/ChangeNamespace.cs
rename to sources/SilkTouch/SilkTouch/Mods/ChangeNamespace.cs
diff --git a/sources/SilkTouch/Mods/Common/EvaluatedConstant.cs b/sources/SilkTouch/SilkTouch/Mods/Common/EvaluatedConstant.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Common/EvaluatedConstant.cs
rename to sources/SilkTouch/SilkTouch/Mods/Common/EvaluatedConstant.cs
diff --git a/sources/SilkTouch/Mods/Common/IMod.cs b/sources/SilkTouch/SilkTouch/Mods/Common/IMod.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Common/IMod.cs
rename to sources/SilkTouch/SilkTouch/Mods/Common/IMod.cs
diff --git a/sources/SilkTouch/Mods/Common/IModConfigBinder.cs b/sources/SilkTouch/SilkTouch/Mods/Common/IModConfigBinder.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Common/IModConfigBinder.cs
rename to sources/SilkTouch/SilkTouch/Mods/Common/IModConfigBinder.cs
diff --git a/sources/SilkTouch/Mods/Common/Mod.cs b/sources/SilkTouch/SilkTouch/Mods/Common/Mod.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Common/Mod.cs
rename to sources/SilkTouch/SilkTouch/Mods/Common/Mod.cs
diff --git a/sources/SilkTouch/Mods/Common/ModCSharpSyntaxRewriter.cs b/sources/SilkTouch/SilkTouch/Mods/Common/ModCSharpSyntaxRewriter.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Common/ModCSharpSyntaxRewriter.cs
rename to sources/SilkTouch/SilkTouch/Mods/Common/ModCSharpSyntaxRewriter.cs
diff --git a/sources/SilkTouch/Mods/Common/ModConfigurationAttribute.cs b/sources/SilkTouch/SilkTouch/Mods/Common/ModConfigurationAttribute.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Common/ModConfigurationAttribute.cs
rename to sources/SilkTouch/SilkTouch/Mods/Common/ModConfigurationAttribute.cs
diff --git a/sources/SilkTouch/Mods/Common/ModLoader.cs b/sources/SilkTouch/SilkTouch/Mods/Common/ModLoader.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Common/ModLoader.cs
rename to sources/SilkTouch/SilkTouch/Mods/Common/ModLoader.cs
diff --git a/sources/SilkTouch/Mods/Common/ModUtils.cs b/sources/SilkTouch/SilkTouch/Mods/Common/ModUtils.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Common/ModUtils.cs
rename to sources/SilkTouch/SilkTouch/Mods/Common/ModUtils.cs
diff --git a/sources/SilkTouch/Mods/ExtractNestedTyping.cs b/sources/SilkTouch/SilkTouch/Mods/ExtractNestedTyping.cs
similarity index 100%
rename from sources/SilkTouch/Mods/ExtractNestedTyping.cs
rename to sources/SilkTouch/SilkTouch/Mods/ExtractNestedTyping.cs
diff --git a/sources/SilkTouch/Mods/Metadata/IApiMetadataProvider.cs b/sources/SilkTouch/SilkTouch/Mods/Metadata/IApiMetadataProvider.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Metadata/IApiMetadataProvider.cs
rename to sources/SilkTouch/SilkTouch/Mods/Metadata/IApiMetadataProvider.cs
diff --git a/sources/SilkTouch/Mods/Metadata/LogicalAnnotation.cs b/sources/SilkTouch/SilkTouch/Mods/Metadata/LogicalAnnotation.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Metadata/LogicalAnnotation.cs
rename to sources/SilkTouch/SilkTouch/Mods/Metadata/LogicalAnnotation.cs
diff --git a/sources/SilkTouch/Mods/Metadata/LogicalRequirement.cs b/sources/SilkTouch/SilkTouch/Mods/Metadata/LogicalRequirement.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Metadata/LogicalRequirement.cs
rename to sources/SilkTouch/SilkTouch/Mods/Metadata/LogicalRequirement.cs
diff --git a/sources/SilkTouch/Mods/Metadata/MetadataUtils.cs b/sources/SilkTouch/SilkTouch/Mods/Metadata/MetadataUtils.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Metadata/MetadataUtils.cs
rename to sources/SilkTouch/SilkTouch/Mods/Metadata/MetadataUtils.cs
diff --git a/sources/SilkTouch/Mods/Metadata/SymbolConstraints.cs b/sources/SilkTouch/SilkTouch/Mods/Metadata/SymbolConstraints.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Metadata/SymbolConstraints.cs
rename to sources/SilkTouch/SilkTouch/Mods/Metadata/SymbolConstraints.cs
diff --git a/sources/SilkTouch/Mods/Metadata/UsageConstraints.cs b/sources/SilkTouch/SilkTouch/Mods/Metadata/UsageConstraints.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Metadata/UsageConstraints.cs
rename to sources/SilkTouch/SilkTouch/Mods/Metadata/UsageConstraints.cs
diff --git a/sources/SilkTouch/Mods/Metadata/VariableConstraint.cs b/sources/SilkTouch/SilkTouch/Mods/Metadata/VariableConstraint.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Metadata/VariableConstraint.cs
rename to sources/SilkTouch/SilkTouch/Mods/Metadata/VariableConstraint.cs
diff --git a/sources/SilkTouch/Mods/MixKhronosData.cs b/sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs
similarity index 100%
rename from sources/SilkTouch/Mods/MixKhronosData.cs
rename to sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs
diff --git a/sources/SilkTouch/Mods/PrettifyNames.cs b/sources/SilkTouch/SilkTouch/Mods/PrettifyNames.cs
similarity index 100%
rename from sources/SilkTouch/Mods/PrettifyNames.cs
rename to sources/SilkTouch/SilkTouch/Mods/PrettifyNames.cs
diff --git a/sources/SilkTouch/Mods/TransformFunctions.cs b/sources/SilkTouch/SilkTouch/Mods/TransformFunctions.cs
similarity index 100%
rename from sources/SilkTouch/Mods/TransformFunctions.cs
rename to sources/SilkTouch/SilkTouch/Mods/TransformFunctions.cs
diff --git a/sources/SilkTouch/Mods/TransformHandles.cs b/sources/SilkTouch/SilkTouch/Mods/TransformHandles.cs
similarity index 100%
rename from sources/SilkTouch/Mods/TransformHandles.cs
rename to sources/SilkTouch/SilkTouch/Mods/TransformHandles.cs
diff --git a/sources/SilkTouch/Mods/Transformation/ArrayParameterTransformer.cs b/sources/SilkTouch/SilkTouch/Mods/Transformation/ArrayParameterTransformer.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Transformation/ArrayParameterTransformer.cs
rename to sources/SilkTouch/SilkTouch/Mods/Transformation/ArrayParameterTransformer.cs
diff --git a/sources/SilkTouch/Mods/Transformation/BoolTransformer.cs b/sources/SilkTouch/SilkTouch/Mods/Transformation/BoolTransformer.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Transformation/BoolTransformer.cs
rename to sources/SilkTouch/SilkTouch/Mods/Transformation/BoolTransformer.cs
diff --git a/sources/SilkTouch/Mods/Transformation/FunctionTransformer.cs b/sources/SilkTouch/SilkTouch/Mods/Transformation/FunctionTransformer.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Transformation/FunctionTransformer.cs
rename to sources/SilkTouch/SilkTouch/Mods/Transformation/FunctionTransformer.cs
diff --git a/sources/SilkTouch/Mods/Transformation/IFunctionTransformer.cs b/sources/SilkTouch/SilkTouch/Mods/Transformation/IFunctionTransformer.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Transformation/IFunctionTransformer.cs
rename to sources/SilkTouch/SilkTouch/Mods/Transformation/IFunctionTransformer.cs
diff --git a/sources/SilkTouch/Mods/Transformation/ITransformationContext.cs b/sources/SilkTouch/SilkTouch/Mods/Transformation/ITransformationContext.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Transformation/ITransformationContext.cs
rename to sources/SilkTouch/SilkTouch/Mods/Transformation/ITransformationContext.cs
diff --git a/sources/SilkTouch/Mods/Transformation/PtrRefTransformer.cs b/sources/SilkTouch/SilkTouch/Mods/Transformation/PtrRefTransformer.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Transformation/PtrRefTransformer.cs
rename to sources/SilkTouch/SilkTouch/Mods/Transformation/PtrRefTransformer.cs
diff --git a/sources/SilkTouch/Mods/Transformation/TransformationUtils.cs b/sources/SilkTouch/SilkTouch/Mods/Transformation/TransformationUtils.cs
similarity index 100%
rename from sources/SilkTouch/Mods/Transformation/TransformationUtils.cs
rename to sources/SilkTouch/SilkTouch/Mods/Transformation/TransformationUtils.cs
diff --git a/sources/SilkTouch/Naming/INameTrimmer.cs b/sources/SilkTouch/SilkTouch/Naming/INameTrimmer.cs
similarity index 100%
rename from sources/SilkTouch/Naming/INameTrimmer.cs
rename to sources/SilkTouch/SilkTouch/Naming/INameTrimmer.cs
diff --git a/sources/SilkTouch/Naming/NameTrimmer.cs b/sources/SilkTouch/SilkTouch/Naming/NameTrimmer.cs
similarity index 100%
rename from sources/SilkTouch/Naming/NameTrimmer.cs
rename to sources/SilkTouch/SilkTouch/Naming/NameTrimmer.cs
diff --git a/sources/SilkTouch/Naming/NameTrimmer217.cs b/sources/SilkTouch/SilkTouch/Naming/NameTrimmer217.cs
similarity index 100%
rename from sources/SilkTouch/Naming/NameTrimmer217.cs
rename to sources/SilkTouch/SilkTouch/Naming/NameTrimmer217.cs
diff --git a/sources/SilkTouch/Naming/NameTrimmer218.cs b/sources/SilkTouch/SilkTouch/Naming/NameTrimmer218.cs
similarity index 100%
rename from sources/SilkTouch/Naming/NameTrimmer218.cs
rename to sources/SilkTouch/SilkTouch/Naming/NameTrimmer218.cs
diff --git a/sources/SilkTouch/Naming/NameUtils.cs b/sources/SilkTouch/SilkTouch/Naming/NameUtils.cs
similarity index 100%
rename from sources/SilkTouch/Naming/NameUtils.cs
rename to sources/SilkTouch/SilkTouch/Naming/NameUtils.cs
diff --git a/sources/SilkTouch/Program.cs b/sources/SilkTouch/SilkTouch/Program.cs
similarity index 100%
rename from sources/SilkTouch/Program.cs
rename to sources/SilkTouch/SilkTouch/Program.cs
diff --git a/sources/SilkTouch/ServiceCollectionExtensions.cs b/sources/SilkTouch/SilkTouch/ServiceCollectionExtensions.cs
similarity index 100%
rename from sources/SilkTouch/ServiceCollectionExtensions.cs
rename to sources/SilkTouch/SilkTouch/ServiceCollectionExtensions.cs
diff --git a/sources/SilkTouch/Silk.NET.SilkTouch.csproj b/sources/SilkTouch/SilkTouch/Silk.NET.SilkTouch.csproj
similarity index 96%
rename from sources/SilkTouch/Silk.NET.SilkTouch.csproj
rename to sources/SilkTouch/SilkTouch/Silk.NET.SilkTouch.csproj
index 0049f51e92..459e37077b 100644
--- a/sources/SilkTouch/Silk.NET.SilkTouch.csproj
+++ b/sources/SilkTouch/SilkTouch/Silk.NET.SilkTouch.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Core\Silk.NET.Core.csproj" />
+    <ProjectReference Include="..\..\Core\Core\Silk.NET.Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/sources/SilkTouch/Silk.NET.SilkTouch.csproj.DotSettings b/sources/SilkTouch/SilkTouch/Silk.NET.SilkTouch.csproj.DotSettings
similarity index 100%
rename from sources/SilkTouch/Silk.NET.SilkTouch.csproj.DotSettings
rename to sources/SilkTouch/SilkTouch/Silk.NET.SilkTouch.csproj.DotSettings
diff --git a/sources/SilkTouch/SilkTouchConfiguration.cs b/sources/SilkTouch/SilkTouch/SilkTouchConfiguration.cs
similarity index 100%
rename from sources/SilkTouch/SilkTouchConfiguration.cs
rename to sources/SilkTouch/SilkTouch/SilkTouchConfiguration.cs
diff --git a/sources/SilkTouch/SilkTouchGenerator.cs b/sources/SilkTouch/SilkTouch/SilkTouchGenerator.cs
similarity index 100%
rename from sources/SilkTouch/SilkTouchGenerator.cs
rename to sources/SilkTouch/SilkTouch/SilkTouchGenerator.cs
diff --git a/sources/SilkTouch/Sources/GitInputSource.cs b/sources/SilkTouch/SilkTouch/Sources/GitInputSource.cs
similarity index 100%
rename from sources/SilkTouch/Sources/GitInputSource.cs
rename to sources/SilkTouch/SilkTouch/Sources/GitInputSource.cs
diff --git a/sources/SilkTouch/Sources/IInputResolver.cs b/sources/SilkTouch/SilkTouch/Sources/IInputResolver.cs
similarity index 100%
rename from sources/SilkTouch/Sources/IInputResolver.cs
rename to sources/SilkTouch/SilkTouch/Sources/IInputResolver.cs
diff --git a/sources/SilkTouch/Sources/IInputSource.cs b/sources/SilkTouch/SilkTouch/Sources/IInputSource.cs
similarity index 100%
rename from sources/SilkTouch/Sources/IInputSource.cs
rename to sources/SilkTouch/SilkTouch/Sources/IInputSource.cs
diff --git a/sources/SilkTouch/Sources/NuGetInputSource.cs b/sources/SilkTouch/SilkTouch/Sources/NuGetInputSource.cs
similarity index 100%
rename from sources/SilkTouch/Sources/NuGetInputSource.cs
rename to sources/SilkTouch/SilkTouch/Sources/NuGetInputSource.cs
diff --git a/sources/SilkTouch/Sources/UriBasedInputResolver.cs b/sources/SilkTouch/SilkTouch/Sources/UriBasedInputResolver.cs
similarity index 100%
rename from sources/SilkTouch/Sources/UriBasedInputResolver.cs
rename to sources/SilkTouch/SilkTouch/Sources/UriBasedInputResolver.cs
diff --git a/sources/SilkTouch/Workspace/DepsFile.cs b/sources/SilkTouch/SilkTouch/Workspace/DepsFile.cs
similarity index 100%
rename from sources/SilkTouch/Workspace/DepsFile.cs
rename to sources/SilkTouch/SilkTouch/Workspace/DepsFile.cs
diff --git a/sources/SilkTouch/Workspace/DirectOutputWriter.cs b/sources/SilkTouch/SilkTouch/Workspace/DirectOutputWriter.cs
similarity index 100%
rename from sources/SilkTouch/Workspace/DirectOutputWriter.cs
rename to sources/SilkTouch/SilkTouch/Workspace/DirectOutputWriter.cs
diff --git a/sources/SilkTouch/Workspace/IOutputWriter.cs b/sources/SilkTouch/SilkTouch/Workspace/IOutputWriter.cs
similarity index 100%
rename from sources/SilkTouch/Workspace/IOutputWriter.cs
rename to sources/SilkTouch/SilkTouch/Workspace/IOutputWriter.cs
diff --git a/sources/SilkTouch/Workspace/IWorkspaceSolutionProvider.cs b/sources/SilkTouch/SilkTouch/Workspace/IWorkspaceSolutionProvider.cs
similarity index 100%
rename from sources/SilkTouch/Workspace/IWorkspaceSolutionProvider.cs
rename to sources/SilkTouch/SilkTouch/Workspace/IWorkspaceSolutionProvider.cs
diff --git a/sources/SilkTouch/Workspace/OutputUtils.cs b/sources/SilkTouch/SilkTouch/Workspace/OutputUtils.cs
similarity index 100%
rename from sources/SilkTouch/Workspace/OutputUtils.cs
rename to sources/SilkTouch/SilkTouch/Workspace/OutputUtils.cs
diff --git a/sources/SilkTouch/Workspace/WorkspaceLogger.cs b/sources/SilkTouch/SilkTouch/Workspace/WorkspaceLogger.cs
similarity index 100%
rename from sources/SilkTouch/Workspace/WorkspaceLogger.cs
rename to sources/SilkTouch/SilkTouch/Workspace/WorkspaceLogger.cs
diff --git a/sources/SilkTouch/Workspace/WorkspaceOutputWriter.cs b/sources/SilkTouch/SilkTouch/Workspace/WorkspaceOutputWriter.cs
similarity index 100%
rename from sources/SilkTouch/Workspace/WorkspaceOutputWriter.cs
rename to sources/SilkTouch/SilkTouch/Workspace/WorkspaceOutputWriter.cs
diff --git a/sources/SilkTouch/Workspace/WorkspaceSolutionProvider.cs b/sources/SilkTouch/SilkTouch/Workspace/WorkspaceSolutionProvider.cs
similarity index 100%
rename from sources/SilkTouch/Workspace/WorkspaceSolutionProvider.cs
rename to sources/SilkTouch/SilkTouch/Workspace/WorkspaceSolutionProvider.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/CLSID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/CLSID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/CLSID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/CLSID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODE1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODE1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODE1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODE1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_OP.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_OP.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_OP.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_OP.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_AXIS_SHADING_RATE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_AXIS_SHADING_RATE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_AXIS_SHADING_RATE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_AXIS_SHADING_RATE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BACKGROUND_PROCESSING_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BACKGROUND_PROCESSING_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BACKGROUND_PROCESSING_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BACKGROUND_PROCESSING_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BARRIER_ACCESS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_ACCESS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BARRIER_ACCESS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_ACCESS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BARRIER_GROUP.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_GROUP.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BARRIER_GROUP.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_GROUP.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BARRIER_LAYOUT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_LAYOUT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BARRIER_LAYOUT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_LAYOUT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BARRIER_SUBRESOURCE_RANGE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_SUBRESOURCE_RANGE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BARRIER_SUBRESOURCE_RANGE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_SUBRESOURCE_RANGE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BARRIER_SYNC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_SYNC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BARRIER_SYNC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_SYNC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BARRIER_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BARRIER_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BLEND.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BLEND.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BLEND.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BLEND.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BLEND_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BLEND_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BLEND_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BLEND_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BLEND_OP.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BLEND_OP.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BLEND_OP.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BLEND_OP.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BOX.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BOX.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BOX.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BOX.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BUFFER_BARRIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_BARRIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BUFFER_BARRIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_BARRIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BUFFER_RTV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_RTV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BUFFER_RTV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_RTV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BUFFER_SRV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_SRV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BUFFER_SRV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_SRV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BUFFER_SRV_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_SRV_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BUFFER_SRV_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_SRV_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BUFFER_UAV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_UAV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BUFFER_UAV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_UAV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BUFFER_UAV_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_UAV_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BUFFER_UAV_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_UAV_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_TOOLS_VISUALIZATION_HEADER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_TOOLS_VISUALIZATION_HEADER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_TOOLS_VISUALIZATION_HEADER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_TOOLS_VISUALIZATION_HEADER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_CACHED_PIPELINE_STATE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CACHED_PIPELINE_STATE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_CACHED_PIPELINE_STATE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CACHED_PIPELINE_STATE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_CLEAR_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CLEAR_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_CLEAR_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CLEAR_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_CLEAR_VALUE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CLEAR_VALUE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_CLEAR_VALUE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CLEAR_VALUE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_COLOR_WRITE_ENABLE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COLOR_WRITE_ENABLE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_COLOR_WRITE_ENABLE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COLOR_WRITE_ENABLE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_LIST_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_LIST_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_LIST_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_LIST_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_LIST_SUPPORT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_LIST_SUPPORT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_LIST_SUPPORT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_LIST_SUPPORT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_LIST_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_LIST_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_LIST_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_LIST_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_POOL_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_POOL_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_POOL_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_POOL_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_PRIORITY.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_PRIORITY.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_PRIORITY.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_PRIORITY.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_RECORDER_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_RECORDER_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_RECORDER_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_RECORDER_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_SIGNATURE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_SIGNATURE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_COMMAND_SIGNATURE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_SIGNATURE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_COMPARISON_FUNC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMPARISON_FUNC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_COMPARISON_FUNC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMPARISON_FUNC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_COMPUTE_PIPELINE_STATE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMPUTE_PIPELINE_STATE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_COMPUTE_PIPELINE_STATE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_COMPUTE_PIPELINE_STATE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_CONSERVATIVE_RASTERIZATION_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CONSERVATIVE_RASTERIZATION_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_CONSERVATIVE_RASTERIZATION_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CONSERVATIVE_RASTERIZATION_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_CONSERVATIVE_RASTERIZATION_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CONSERVATIVE_RASTERIZATION_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_CONSERVATIVE_RASTERIZATION_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CONSERVATIVE_RASTERIZATION_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_CONSTANT_BUFFER_VIEW_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CONSTANT_BUFFER_VIEW_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_CONSTANT_BUFFER_VIEW_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CONSTANT_BUFFER_VIEW_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_CPU_DESCRIPTOR_HANDLE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CPU_DESCRIPTOR_HANDLE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_CPU_DESCRIPTOR_HANDLE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CPU_DESCRIPTOR_HANDLE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_CPU_PAGE_PROPERTY.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CPU_PAGE_PROPERTY.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_CPU_PAGE_PROPERTY.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CPU_PAGE_PROPERTY.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_CROSS_NODE_SHARING_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CROSS_NODE_SHARING_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_CROSS_NODE_SHARING_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CROSS_NODE_SHARING_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_CULL_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CULL_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_CULL_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_CULL_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESC1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESC1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESC1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESC1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VALUE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VALUE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VALUE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VALUE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VIEW_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VIEW_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VIEW_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VIEW_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_WRITE_MASK.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_WRITE_MASK.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEPTH_WRITE_MASK.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_WRITE_MASK.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_CONFIGURATION_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_CONFIGURATION_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_CONFIGURATION_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_CONFIGURATION_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_FACTORY_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_FACTORY_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_FACTORY_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_FACTORY_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA3.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA3.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA3.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA3.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DISCARD_REGION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DISCARD_REGION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DISCARD_REGION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DISCARD_REGION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DISPATCH_ARGUMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DISPATCH_ARGUMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DISPATCH_ARGUMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DISPATCH_ARGUMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DISPATCH_MESH_ARGUMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DISPATCH_MESH_ARGUMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DISPATCH_MESH_ARGUMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DISPATCH_MESH_ARGUMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DISPATCH_RAYS_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DISPATCH_RAYS_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DISPATCH_RAYS_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DISPATCH_RAYS_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRAW_ARGUMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRAW_ARGUMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRAW_ARGUMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRAW_ARGUMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRAW_INDEXED_ARGUMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRAW_INDEXED_ARGUMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRAW_INDEXED_ARGUMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRAW_INDEXED_ARGUMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODE1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODE1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODE1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODE1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUT1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUT1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUT1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUT1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_BREADCRUMB_CONTEXT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_BREADCRUMB_CONTEXT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_BREADCRUMB_CONTEXT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_BREADCRUMB_CONTEXT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_DEVICE_STATE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_DEVICE_STATE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_DEVICE_STATE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_DEVICE_STATE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_ENABLEMENT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_ENABLEMENT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_ENABLEMENT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_ENABLEMENT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRED_VERSION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_VERSION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRED_VERSION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_VERSION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DRIVER_MATCHING_IDENTIFIER_STATUS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRIVER_MATCHING_IDENTIFIER_STATUS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DRIVER_MATCHING_IDENTIFIER_STATUS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DRIVER_MATCHING_IDENTIFIER_STATUS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DSV_DIMENSION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DSV_DIMENSION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DSV_DIMENSION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DSV_DIMENSION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DSV_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DSV_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DSV_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DSV_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DXIL_LIBRARY_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DXIL_LIBRARY_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DXIL_LIBRARY_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DXIL_LIBRARY_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_ELEMENTS_LAYOUT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ELEMENTS_LAYOUT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_ELEMENTS_LAYOUT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ELEMENTS_LAYOUT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_EXISTING_COLLECTION_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_EXISTING_COLLECTION_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_EXISTING_COLLECTION_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_EXISTING_COLLECTION_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_EXPORT_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_EXPORT_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_EXPORT_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_EXPORT_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_EXPORT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_EXPORT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_EXPORT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_EXPORT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURE1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURE1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURE1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURE1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_CROSS_NODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_CROSS_NODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_CROSS_NODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_CROSS_NODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS10.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS10.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS10.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS10.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS11.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS11.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS11.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS11.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS12.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS12.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS12.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS12.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS13.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS13.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS13.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS13.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS14.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS14.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS14.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS14.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS15.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS15.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS15.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS15.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS3.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS3.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS3.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS3.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS4.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS4.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS4.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS4.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS5.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS5.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS5.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS5.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS6.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS6.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS6.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS6.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS7.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS7.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS7.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS7.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS8.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS8.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS8.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS8.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS9.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS9.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS9.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS9.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_DISPLAYABLE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_DISPLAYABLE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_DISPLAYABLE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_DISPLAYABLE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_EXISTING_HEAPS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_EXISTING_HEAPS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_EXISTING_HEAPS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_EXISTING_HEAPS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FEATURE_LEVELS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FEATURE_LEVELS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FEATURE_LEVELS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FEATURE_LEVELS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_INFO.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_INFO.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_INFO.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_INFO.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPES.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPES.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPES.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPES.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPE_COUNT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPE_COUNT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPE_COUNT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPE_COUNT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_QUERY_META_COMMAND.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_QUERY_META_COMMAND.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_QUERY_META_COMMAND.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_QUERY_META_COMMAND.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ROOT_SIGNATURE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ROOT_SIGNATURE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ROOT_SIGNATURE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ROOT_SIGNATURE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SERIALIZATION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SERIALIZATION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SERIALIZATION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SERIALIZATION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_CACHE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_CACHE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_CACHE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_CACHE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_MODEL.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_MODEL.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_MODEL.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_MODEL.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FENCE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FENCE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FENCE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FENCE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FILL_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FILL_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FILL_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FILL_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FILTER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FILTER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FILTER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FILTER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FILTER_REDUCTION_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FILTER_REDUCTION_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FILTER_REDUCTION_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FILTER_REDUCTION_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FILTER_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FILTER_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FILTER_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FILTER_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FORMAT_SUPPORT1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FORMAT_SUPPORT1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FORMAT_SUPPORT1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FORMAT_SUPPORT1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_FORMAT_SUPPORT2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FORMAT_SUPPORT2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_FORMAT_SUPPORT2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_FORMAT_SUPPORT2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_GLOBAL_BARRIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GLOBAL_BARRIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_GLOBAL_BARRIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GLOBAL_BARRIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_GLOBAL_ROOT_SIGNATURE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GLOBAL_ROOT_SIGNATURE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_GLOBAL_ROOT_SIGNATURE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GLOBAL_ROOT_SIGNATURE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_GPU_DESCRIPTOR_HANDLE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_DESCRIPTOR_HANDLE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_GPU_DESCRIPTOR_HANDLE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_DESCRIPTOR_HANDLE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_AND_STRIDE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_AND_STRIDE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_AND_STRIDE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_AND_STRIDE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGE_AND_STRIDE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGE_AND_STRIDE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGE_AND_STRIDE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGE_AND_STRIDE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_GRAPHICS_PIPELINE_STATE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GRAPHICS_PIPELINE_STATE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_GRAPHICS_PIPELINE_STATE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GRAPHICS_PIPELINE_STATE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_GRAPHICS_STATES.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GRAPHICS_STATES.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_GRAPHICS_STATES.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_GRAPHICS_STATES.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_HEAP_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_HEAP_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_HEAP_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_HEAP_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_HEAP_PROPERTIES.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_PROPERTIES.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_HEAP_PROPERTIES.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_PROPERTIES.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_HEAP_SERIALIZATION_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_SERIALIZATION_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_HEAP_SERIALIZATION_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_SERIALIZATION_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_HEAP_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_HEAP_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_HIT_GROUP_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HIT_GROUP_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_HIT_GROUP_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HIT_GROUP_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_HIT_GROUP_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HIT_GROUP_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_HIT_GROUP_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HIT_GROUP_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_HIT_KIND.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HIT_KIND.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_HIT_KIND.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_HIT_KIND.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_INDEX_BUFFER_STRIP_CUT_VALUE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INDEX_BUFFER_STRIP_CUT_VALUE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_INDEX_BUFFER_STRIP_CUT_VALUE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INDEX_BUFFER_STRIP_CUT_VALUE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_INDEX_BUFFER_VIEW.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INDEX_BUFFER_VIEW.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_INDEX_BUFFER_VIEW.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INDEX_BUFFER_VIEW.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_INDIRECT_ARGUMENT_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INDIRECT_ARGUMENT_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_INDIRECT_ARGUMENT_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INDIRECT_ARGUMENT_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_INDIRECT_ARGUMENT_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INDIRECT_ARGUMENT_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_INDIRECT_ARGUMENT_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INDIRECT_ARGUMENT_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_INPUT_CLASSIFICATION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INPUT_CLASSIFICATION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_INPUT_CLASSIFICATION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INPUT_CLASSIFICATION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_INPUT_ELEMENT_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INPUT_ELEMENT_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_INPUT_ELEMENT_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INPUT_ELEMENT_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_INPUT_LAYOUT_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INPUT_LAYOUT_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_INPUT_LAYOUT_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_INPUT_LAYOUT_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_LIFETIME_STATE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_LIFETIME_STATE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_LIFETIME_STATE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_LIFETIME_STATE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_LOCAL_ROOT_SIGNATURE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_LOCAL_ROOT_SIGNATURE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_LOCAL_ROOT_SIGNATURE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_LOCAL_ROOT_SIGNATURE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_LOGIC_OP.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_LOGIC_OP.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_LOGIC_OP.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_LOGIC_OP.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_MEASUREMENTS_ACTION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MEASUREMENTS_ACTION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_MEASUREMENTS_ACTION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MEASUREMENTS_ACTION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_MEMCPY_DEST.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MEMCPY_DEST.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_MEMCPY_DEST.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MEMCPY_DEST.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_MEMORY_POOL.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MEMORY_POOL.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_MEMORY_POOL.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MEMORY_POOL.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_MESH_SHADER_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MESH_SHADER_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_MESH_SHADER_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MESH_SHADER_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_STAGE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_STAGE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_STAGE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_STAGE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_MIP_REGION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MIP_REGION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_MIP_REGION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MIP_REGION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_MULTIPLE_FENCE_WAIT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MULTIPLE_FENCE_WAIT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_MULTIPLE_FENCE_WAIT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MULTIPLE_FENCE_WAIT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_NODE_MASK.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_NODE_MASK.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_NODE_MASK.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_NODE_MASK.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_PACKED_MIP_INFO.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PACKED_MIP_INFO.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_PACKED_MIP_INFO.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PACKED_MIP_INFO.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_STREAM_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_STREAM_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_STREAM_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_STREAM_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_SUBOBJECT_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_SUBOBJECT_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_SUBOBJECT_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_SUBOBJECT_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_PLACED_SUBRESOURCE_FOOTPRINT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PLACED_SUBRESOURCE_FOOTPRINT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_PLACED_SUBRESOURCE_FOOTPRINT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PLACED_SUBRESOURCE_FOOTPRINT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_PREDICATION_OP.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PREDICATION_OP.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_PREDICATION_OP.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PREDICATION_OP.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_PRIMITIVE_TOPOLOGY_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PRIMITIVE_TOPOLOGY_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_PRIMITIVE_TOPOLOGY_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PRIMITIVE_TOPOLOGY_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESC1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESC1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESC1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESC1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_SUPPORT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_SUPPORT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_SUPPORT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_SUPPORT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_SESSION_STATUS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_SESSION_STATUS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_SESSION_STATUS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_SESSION_STATUS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICS1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICS1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICS1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICS1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_QUERY_DATA_SO_STATISTICS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_DATA_SO_STATISTICS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_QUERY_DATA_SO_STATISTICS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_DATA_SO_STATISTICS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_QUERY_HEAP_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_HEAP_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_QUERY_HEAP_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_HEAP_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_QUERY_HEAP_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_HEAP_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_QUERY_HEAP_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_HEAP_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_QUERY_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_QUERY_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RANGE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RANGE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RANGE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RANGE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RANGE_UINT64.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RANGE_UINT64.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RANGE_UINT64.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RANGE_UINT64.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RASTERIZER_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RASTERIZER_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RASTERIZER_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RASTERIZER_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_AABB.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_AABB.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_AABB.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_AABB.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_BUILD_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_BUILD_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_BUILD_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_BUILD_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_COPY_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_COPY_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_COPY_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_COPY_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_COMPACTED_SIZE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_COMPACTED_SIZE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_COMPACTED_SIZE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_COMPACTED_SIZE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_CURRENT_SIZE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_CURRENT_SIZE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_CURRENT_SIZE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_CURRENT_SIZE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_SERIALIZATION_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_SERIALIZATION_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_SERIALIZATION_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_SERIALIZATION_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_TOOLS_VISUALIZATION_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_TOOLS_VISUALIZATION_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_TOOLS_VISUALIZATION_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_TOOLS_VISUALIZATION_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_PREBUILD_INFO.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_PREBUILD_INFO.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_PREBUILD_INFO.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_PREBUILD_INFO.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_SRV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_SRV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_SRV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_SRV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_AABBS_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_AABBS_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_AABBS_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_AABBS_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_TRIANGLES_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_TRIANGLES_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_TRIANGLES_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_TRIANGLES_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_INSTANCE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_INSTANCE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_INSTANCE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_INSTANCE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_INSTANCE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_INSTANCE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_INSTANCE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_INSTANCE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIG.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIG.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIG.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIG.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIG1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIG1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIG1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIG1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_SHADER_CONFIG.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_SHADER_CONFIG.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_SHADER_CONFIG.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_SHADER_CONFIG.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RAY_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAY_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RAY_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RAY_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS_CLEAR_PARAMETERS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS_CLEAR_PARAMETERS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS_CLEAR_PARAMETERS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS_CLEAR_PARAMETERS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_DEPTH_STENCIL_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_DEPTH_STENCIL_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_DEPTH_STENCIL_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_DEPTH_STENCIL_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_PARAMETERS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_PARAMETERS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_PARAMETERS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_PARAMETERS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_SUBRESOURCE_PARAMETERS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_SUBRESOURCE_PARAMETERS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_SUBRESOURCE_PARAMETERS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_SUBRESOURCE_PARAMETERS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_RENDER_TARGET_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_RENDER_TARGET_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_RENDER_TARGET_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_RENDER_TARGET_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_TARGET_BLEND_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_TARGET_BLEND_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_TARGET_BLEND_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_TARGET_BLEND_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_TARGET_VIEW_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_TARGET_VIEW_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RENDER_TARGET_VIEW_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_TARGET_VIEW_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESIDENCY_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESIDENCY_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESIDENCY_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESIDENCY_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESIDENCY_PRIORITY.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESIDENCY_PRIORITY.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESIDENCY_PRIORITY.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESIDENCY_PRIORITY.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOLVE_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOLVE_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOLVE_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOLVE_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_ALIASING_BARRIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_ALIASING_BARRIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_ALIASING_BARRIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_ALIASING_BARRIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFO.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFO.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFO.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFO.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFO1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFO1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFO1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFO1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIER_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIER_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIER_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIER_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIER_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIER_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIER_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIER_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_BINDING_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_BINDING_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_BINDING_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_BINDING_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_DESC1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_DESC1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_DESC1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_DESC1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_DIMENSION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_DIMENSION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_DIMENSION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_DIMENSION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_HEAP_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_HEAP_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_HEAP_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_HEAP_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_STATES.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_STATES.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_STATES.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_STATES.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_TRANSITION_BARRIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_TRANSITION_BARRIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_TRANSITION_BARRIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_TRANSITION_BARRIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_UAV_BARRIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_UAV_BARRIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_UAV_BARRIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_UAV_BARRIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_CONSTANTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_CONSTANTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_CONSTANTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_CONSTANTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLE1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLE1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLE1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLE1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESC1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESC1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESC1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESC1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RTV_DIMENSION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RTV_DIMENSION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RTV_DIMENSION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RTV_DIMENSION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_RT_FORMAT_ARRAY.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RT_FORMAT_ARRAY.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_RT_FORMAT_ARRAY.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_RT_FORMAT_ARRAY.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SAMPLER_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLER_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SAMPLER_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLER_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SAMPLER_DESC2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLER_DESC2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SAMPLER_DESC2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLER_DESC2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SAMPLER_FEEDBACK_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLER_FEEDBACK_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SAMPLER_FEEDBACK_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLER_FEEDBACK_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SAMPLER_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLER_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SAMPLER_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLER_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SAMPLE_POSITION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLE_POSITION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SAMPLE_POSITION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLE_POSITION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SERIALIZED_DATA_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SERIALIZED_DATA_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SERIALIZED_DATA_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SERIALIZED_DATA_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SERIALIZED_RAYTRACING_ACCELERATION_STRUCTURE_HEADER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SERIALIZED_RAYTRACING_ACCELERATION_STRUCTURE_HEADER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SERIALIZED_RAYTRACING_ACCELERATION_STRUCTURE_HEADER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SERIALIZED_RAYTRACING_ACCELERATION_STRUCTURE_HEADER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_BYTECODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_BYTECODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_BYTECODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_BYTECODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_CONTROL_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_CONTROL_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_CONTROL_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_CONTROL_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_KIND_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_KIND_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_KIND_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_KIND_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_SESSION_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_SESSION_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_SESSION_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_SESSION_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_SUPPORT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_SUPPORT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_SUPPORT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_SUPPORT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_COMPONENT_MAPPING.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_COMPONENT_MAPPING.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_COMPONENT_MAPPING.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_COMPONENT_MAPPING.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_MIN_PRECISION_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_MIN_PRECISION_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_MIN_PRECISION_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_MIN_PRECISION_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_RESOURCE_VIEW_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_RESOURCE_VIEW_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_RESOURCE_VIEW_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_RESOURCE_VIEW_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_VISIBILITY.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_VISIBILITY.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHADER_VISIBILITY.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_VISIBILITY.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHADING_RATE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADING_RATE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHADING_RATE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADING_RATE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHADING_RATE_COMBINER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADING_RATE_COMBINER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHADING_RATE_COMBINER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADING_RATE_COMBINER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SHARED_RESOURCE_COMPATIBILITY_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SO_DECLARATION_ENTRY.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SO_DECLARATION_ENTRY.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SO_DECLARATION_ENTRY.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SO_DECLARATION_ENTRY.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SRV_DIMENSION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SRV_DIMENSION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SRV_DIMENSION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SRV_DIMENSION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_STATE_OBJECT_CONFIG.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_OBJECT_CONFIG.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_STATE_OBJECT_CONFIG.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_OBJECT_CONFIG.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_STATE_OBJECT_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_OBJECT_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_STATE_OBJECT_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_OBJECT_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_STATE_OBJECT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_OBJECT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_STATE_OBJECT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_OBJECT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_STATE_OBJECT_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_OBJECT_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_STATE_OBJECT_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_OBJECT_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_STATE_SUBOBJECT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_SUBOBJECT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_STATE_SUBOBJECT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_SUBOBJECT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_STATE_SUBOBJECT_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_SUBOBJECT_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_STATE_SUBOBJECT_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_SUBOBJECT_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_STATIC_BORDER_COLOR.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATIC_BORDER_COLOR.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_STATIC_BORDER_COLOR.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATIC_BORDER_COLOR.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_STATIC_SAMPLER_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATIC_SAMPLER_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_STATIC_SAMPLER_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STATIC_SAMPLER_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_STENCIL_OP.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STENCIL_OP.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_STENCIL_OP.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STENCIL_OP.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_BUFFER_VIEW.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_BUFFER_VIEW.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_BUFFER_VIEW.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_BUFFER_VIEW.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SUBOBJECT_TO_EXPORTS_ASSOCIATION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBOBJECT_TO_EXPORTS_ASSOCIATION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SUBOBJECT_TO_EXPORTS_ASSOCIATION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBOBJECT_TO_EXPORTS_ASSOCIATION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_DATA.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_DATA.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_DATA.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_DATA.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_FOOTPRINT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_FOOTPRINT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_FOOTPRINT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_FOOTPRINT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_INFO.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_INFO.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_INFO.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_INFO.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_RANGE_UINT64.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_RANGE_UINT64.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_RANGE_UINT64.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_RANGE_UINT64.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_TILING.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_TILING.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_TILING.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_TILING.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_DSV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_DSV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_DSV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_DSV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_RTV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_RTV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_RTV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_RTV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_SRV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_SRV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_SRV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_SRV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_UAV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_UAV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_UAV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_UAV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_DSV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_DSV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_DSV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_DSV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_RTV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_RTV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_RTV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_RTV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_SRV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_SRV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_SRV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_SRV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_UAV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_UAV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX1D_UAV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_UAV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_DSV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_DSV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_DSV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_DSV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_RTV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_RTV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_RTV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_RTV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_SRV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_SRV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_SRV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_SRV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_UAV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_UAV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_UAV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_UAV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_DSV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_DSV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_DSV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_DSV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_RTV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_RTV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_RTV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_RTV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_SRV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_SRV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_SRV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_SRV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_UAV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_UAV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_UAV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_UAV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_DSV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_DSV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_DSV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_DSV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_RTV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_RTV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_RTV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_RTV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_SRV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_SRV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_SRV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_SRV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_UAV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_UAV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_UAV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_UAV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_DSV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_DSV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_DSV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_DSV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_RTV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_RTV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_RTV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_RTV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_SRV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_SRV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_SRV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_SRV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_UAV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_UAV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX2D_UAV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_UAV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX3D_RTV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX3D_RTV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX3D_RTV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX3D_RTV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX3D_SRV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX3D_SRV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX3D_SRV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX3D_SRV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEX3D_UAV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX3D_UAV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEX3D_UAV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX3D_UAV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEXCUBE_ARRAY_SRV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXCUBE_ARRAY_SRV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEXCUBE_ARRAY_SRV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXCUBE_ARRAY_SRV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEXCUBE_SRV.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXCUBE_SRV.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEXCUBE_SRV.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXCUBE_SRV.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_ADDRESS_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_ADDRESS_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_ADDRESS_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_ADDRESS_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_BARRIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_BARRIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_BARRIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_BARRIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_BARRIER_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_BARRIER_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_BARRIER_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_BARRIER_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_COPY_LOCATION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_COPY_LOCATION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_COPY_LOCATION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_COPY_LOCATION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_COPY_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_COPY_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_COPY_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_COPY_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_LAYOUT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_LAYOUT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_LAYOUT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_LAYOUT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TILED_RESOURCES_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILED_RESOURCES_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TILED_RESOURCES_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILED_RESOURCES_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TILED_RESOURCE_COORDINATE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILED_RESOURCE_COORDINATE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TILED_RESOURCE_COORDINATE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILED_RESOURCE_COORDINATE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TILE_COPY_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_COPY_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TILE_COPY_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_COPY_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TILE_MAPPING_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_MAPPING_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TILE_MAPPING_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_MAPPING_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TILE_RANGE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_RANGE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TILE_RANGE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_RANGE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TILE_REGION_SIZE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_REGION_SIZE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TILE_REGION_SIZE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_REGION_SIZE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TILE_SHAPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_SHAPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TILE_SHAPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_SHAPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_TRI_STATE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TRI_STATE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_TRI_STATE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_TRI_STATE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_UAV_DIMENSION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_UAV_DIMENSION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_UAV_DIMENSION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_UAV_DIMENSION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_UNORDERED_ACCESS_VIEW_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_UNORDERED_ACCESS_VIEW_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_UNORDERED_ACCESS_VIEW_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_UNORDERED_ACCESS_VIEW_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_VARIABLE_SHADING_RATE_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VARIABLE_SHADING_RATE_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_VARIABLE_SHADING_RATE_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VARIABLE_SHADING_RATE_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATA.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATA.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATA.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATA.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_VERSIONED_ROOT_SIGNATURE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VERSIONED_ROOT_SIGNATURE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_VERSIONED_ROOT_SIGNATURE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VERSIONED_ROOT_SIGNATURE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_VERTEX_BUFFER_VIEW.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VERTEX_BUFFER_VIEW.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_VERTEX_BUFFER_VIEW.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VERTEX_BUFFER_VIEW.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_VIEWPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEWPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_VIEWPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEWPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_VIEW_INSTANCE_LOCATION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEW_INSTANCE_LOCATION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_VIEW_INSTANCE_LOCATION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEW_INSTANCE_LOCATION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_WAVE_MMA_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_WAVE_MMA_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_WAVE_MMA_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_WAVE_MMA_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_WRITEBUFFERIMMEDIATE_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_WRITEBUFFERIMMEDIATE_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_WRITEBUFFERIMMEDIATE_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_WRITEBUFFERIMMEDIATE_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D12_WRITEBUFFERIMMEDIATE_PARAMETER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D12_WRITEBUFFERIMMEDIATE_PARAMETER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D12_WRITEBUFFERIMMEDIATE_PARAMETER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D12_WRITEBUFFERIMMEDIATE_PARAMETER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D_ROOT_SIGNATURE_VERSION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D_ROOT_SIGNATURE_VERSION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D_ROOT_SIGNATURE_VERSION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D_ROOT_SIGNATURE_VERSION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/D3D_SHADER_MODEL.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/D3D_SHADER_MODEL.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/D3D_SHADER_MODEL.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/D3D_SHADER_MODEL.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/DirectX.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/DirectX.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/DirectX.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/DirectX.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12CommandAllocator.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandAllocator.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12CommandAllocator.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandAllocator.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12CommandList.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandList.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12CommandList.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandList.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12CommandQueue.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandQueue.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12CommandQueue.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandQueue.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12CommandSignature.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandSignature.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12CommandSignature.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandSignature.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12DescriptorHeap.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DescriptorHeap.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12DescriptorHeap.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DescriptorHeap.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Device.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Device.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Device1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Device1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Device10.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device10.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Device10.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device10.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Device11.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device11.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Device11.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device11.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Device2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Device2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Device3.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device3.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Device3.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device3.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Device4.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device4.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Device4.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device4.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Device5.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device5.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Device5.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device5.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Device6.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device6.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Device6.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device6.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Device7.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device7.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Device7.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device7.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Device8.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device8.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Device8.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device8.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Device9.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device9.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Device9.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Device9.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12DeviceChild.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceChild.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12DeviceChild.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceChild.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12DeviceConfiguration.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceConfiguration.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12DeviceConfiguration.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceConfiguration.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12DeviceFactory.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceFactory.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12DeviceFactory.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceFactory.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Fence.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Fence.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Fence.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Fence.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Fence1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Fence1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Fence1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Fence1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList3.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList3.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList3.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList3.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList4.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList4.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList4.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList4.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList5.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList5.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList5.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList5.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList6.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList6.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList6.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList6.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList7.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList7.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList7.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList7.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList8.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList8.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList8.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList8.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Heap.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Heap.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Heap.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Heap.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Heap1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Heap1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Heap1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Heap1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12LifetimeOwner.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12LifetimeOwner.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12LifetimeOwner.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12LifetimeOwner.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12LifetimeTracker.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12LifetimeTracker.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12LifetimeTracker.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12LifetimeTracker.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12MetaCommand.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12MetaCommand.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12MetaCommand.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12MetaCommand.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Object.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Object.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Object.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Object.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Pageable.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Pageable.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Pageable.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Pageable.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12PipelineLibrary.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12PipelineLibrary.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12PipelineLibrary.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12PipelineLibrary.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12PipelineLibrary1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12PipelineLibrary1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12PipelineLibrary1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12PipelineLibrary1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12PipelineState.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12PipelineState.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12PipelineState.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12PipelineState.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12ProtectedResourceSession.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12ProtectedResourceSession.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12ProtectedResourceSession.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12ProtectedResourceSession.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12ProtectedResourceSession1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12ProtectedResourceSession1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12ProtectedResourceSession1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12ProtectedResourceSession1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12ProtectedSession.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12ProtectedSession.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12ProtectedSession.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12ProtectedSession.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12QueryHeap.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12QueryHeap.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12QueryHeap.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12QueryHeap.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Resource.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Resource.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Resource.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Resource.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Resource1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Resource1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Resource1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Resource1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Resource2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Resource2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Resource2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Resource2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12RootSignature.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12RootSignature.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12RootSignature.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12RootSignature.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12RootSignatureDeserializer.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12RootSignatureDeserializer.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12RootSignatureDeserializer.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12RootSignatureDeserializer.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12SDKConfiguration.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12SDKConfiguration.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12SDKConfiguration.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12SDKConfiguration.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12SDKConfiguration1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12SDKConfiguration1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12SDKConfiguration1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12SDKConfiguration1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12ShaderCacheSession.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12ShaderCacheSession.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12ShaderCacheSession.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12ShaderCacheSession.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12StateObject.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12StateObject.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12StateObject.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12StateObject.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12StateObjectProperties.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12StateObjectProperties.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12StateObjectProperties.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12StateObjectProperties.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12SwapChainAssistant.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12SwapChainAssistant.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12SwapChainAssistant.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12SwapChainAssistant.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12Tools.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Tools.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12Tools.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12Tools.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12VersionedRootSignatureDeserializer.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12VersionedRootSignatureDeserializer.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12VersionedRootSignatureDeserializer.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12VersionedRootSignatureDeserializer.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/ID3D12VirtualizationGuestDevice.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/ID3D12VirtualizationGuestDevice.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/ID3D12VirtualizationGuestDevice.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/ID3D12VirtualizationGuestDevice.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12/IID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12/IID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12/IID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12/IID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12compatibility/D3D11On12CreatorID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12compatibility/D3D11On12CreatorID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12compatibility/D3D11On12CreatorID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12compatibility/D3D11On12CreatorID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12compatibility/D3D12_COMPATIBILITY_SHARED_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12compatibility/D3D12_COMPATIBILITY_SHARED_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12compatibility/D3D12_COMPATIBILITY_SHARED_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12compatibility/D3D12_COMPATIBILITY_SHARED_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12compatibility/D3D12_REFLECT_SHARED_PROPERTY.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12compatibility/D3D12_REFLECT_SHARED_PROPERTY.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12compatibility/D3D12_REFLECT_SHARED_PROPERTY.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12compatibility/D3D12_REFLECT_SHARED_PROPERTY.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12compatibility/D3D9On12CreatorID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12compatibility/D3D9On12CreatorID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12compatibility/D3D9On12CreatorID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12compatibility/D3D9On12CreatorID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12compatibility/DirectMLPyTorchCreatorID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12compatibility/DirectMLPyTorchCreatorID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12compatibility/DirectMLPyTorchCreatorID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12compatibility/DirectMLPyTorchCreatorID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12compatibility/DirectMLTensorFlowCreatorID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12compatibility/DirectMLTensorFlowCreatorID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12compatibility/DirectMLTensorFlowCreatorID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12compatibility/DirectMLTensorFlowCreatorID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12compatibility/ID3D12CompatibilityDevice.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12compatibility/ID3D12CompatibilityDevice.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12compatibility/ID3D12CompatibilityDevice.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12compatibility/ID3D12CompatibilityDevice.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12compatibility/IID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12compatibility/IID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12compatibility/IID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12compatibility/IID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12compatibility/OpenCLOn12CreatorID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12compatibility/OpenCLOn12CreatorID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12compatibility/OpenCLOn12CreatorID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12compatibility/OpenCLOn12CreatorID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12compatibility/OpenGLOn12CreatorID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12compatibility/OpenGLOn12CreatorID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12compatibility/OpenGLOn12CreatorID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12compatibility/OpenGLOn12CreatorID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_COMMAND_LIST_GPU_BASED_VALIDATION_SETTINGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_COMMAND_LIST_GPU_BASED_VALIDATION_SETTINGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_COMMAND_LIST_GPU_BASED_VALIDATION_SETTINGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_COMMAND_LIST_GPU_BASED_VALIDATION_SETTINGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTOR.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTOR.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTOR.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTOR.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_PARAMETER_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_PARAMETER_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_PARAMETER_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_PARAMETER_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_FEATURE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_FEATURE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_FEATURE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_FEATURE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_GPU_BASED_VALIDATION_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_GPU_BASED_VALIDATION_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_GPU_BASED_VALIDATION_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_GPU_BASED_VALIDATION_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTER_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTER_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTER_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTER_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_CALLBACK_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_CALLBACK_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_CALLBACK_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_CALLBACK_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_CATEGORY.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_CATEGORY.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_CATEGORY.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_CATEGORY.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_ID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_ID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_ID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_ID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_SEVERITY.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_SEVERITY.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_SEVERITY.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_MESSAGE_SEVERITY.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_RLDO_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_RLDO_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/D3D12_RLDO_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_RLDO_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/DXGI.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/DXGI.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/DXGI.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/DXGI.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/DirectX.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/DirectX.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/DirectX.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/DirectX.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug3.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug3.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug3.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug3.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug4.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug4.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug4.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug4.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug5.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug5.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug5.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug5.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug6.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug6.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug6.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug6.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList3.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList3.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList3.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList3.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueue.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueue.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueue.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueue.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueue1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueue1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueue1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueue1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12InfoQueue.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12InfoQueue.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12InfoQueue.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12InfoQueue.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12InfoQueue1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12InfoQueue1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12InfoQueue1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12InfoQueue1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12SharingContract.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12SharingContract.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/ID3D12SharingContract.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12SharingContract.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12sdklayers/IID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12sdklayers/IID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12sdklayers/IID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12sdklayers/IID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/D3D.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/D3D.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/D3D.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/D3D.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/D3D12_FUNCTION_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_FUNCTION_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/D3D12_FUNCTION_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_FUNCTION_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/D3D12_LIBRARY_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_LIBRARY_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/D3D12_LIBRARY_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_LIBRARY_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/D3D12_PARAMETER_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_PARAMETER_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/D3D12_PARAMETER_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_PARAMETER_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_BUFFER_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_BUFFER_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_BUFFER_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_BUFFER_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_INPUT_BIND_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_INPUT_BIND_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_INPUT_BIND_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_INPUT_BIND_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_TYPE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_TYPE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_TYPE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_TYPE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_VARIABLE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_VARIABLE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_VARIABLE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_VARIABLE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_VERSION_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_VERSION_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_VERSION_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_VERSION_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/D3D12_SIGNATURE_PARAMETER_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SIGNATURE_PARAMETER_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/D3D12_SIGNATURE_PARAMETER_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SIGNATURE_PARAMETER_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/ID3D12FunctionParameterReflection.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12FunctionParameterReflection.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/ID3D12FunctionParameterReflection.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12FunctionParameterReflection.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/ID3D12FunctionReflection.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12FunctionReflection.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/ID3D12FunctionReflection.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12FunctionReflection.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/ID3D12LibraryReflection.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12LibraryReflection.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/ID3D12LibraryReflection.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12LibraryReflection.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflection.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflection.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflection.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflection.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionConstantBuffer.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionConstantBuffer.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionConstantBuffer.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionConstantBuffer.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionType.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionType.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionType.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionType.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionVariable.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionVariable.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionVariable.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionVariable.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12shader/IID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12shader/IID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12shader/IID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12shader/IID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_BITSTREAM_ENCRYPTION_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_BITSTREAM_ENCRYPTION_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_BITSTREAM_ENCRYPTION_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_BITSTREAM_ENCRYPTION_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ARCHITECTURE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ARCHITECTURE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ARCHITECTURE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ARCHITECTURE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZE1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZE1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZE1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZE1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_CONVERSION_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_CONVERSION_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_CONVERSION_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_CONVERSION_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_HISTOGRAM.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_HISTOGRAM.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_HISTOGRAM.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_HISTOGRAM.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILES.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILES.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILES.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILES.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROTECTED_RESOURCES.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROTECTED_RESOURCES.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROTECTED_RESOURCES.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROTECTED_RESOURCES.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_HEAP_SIZE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_HEAP_SIZE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_HEAP_SIZE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_HEAP_SIZE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INPUT_FORMAT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INPUT_FORMAT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INPUT_FORMAT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INPUT_FORMAT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INTRA_REFRESH_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INTRA_REFRESH_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INTRA_REFRESH_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INTRA_REFRESH_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION_RATIOS_COUNT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION_RATIOS_COUNT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION_RATIOS_COUNT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION_RATIOS_COUNT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_PROFILE_LEVEL.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_PROFILE_LEVEL.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_PROFILE_LEVEL.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_PROFILE_LEVEL.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RATE_CONTROL_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RATE_CONTROL_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RATE_CONTROL_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RATE_CONTROL_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMANDS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMANDS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMANDS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMANDS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_COUNT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_COUNT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_COUNT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_COUNT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETERS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETERS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETERS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETERS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETER_COUNT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETER_COUNT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETER_COUNT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETER_COUNT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SIZE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SIZE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SIZE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SIZE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_FEATURE_AREA_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_FEATURE_AREA_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_FEATURE_AREA_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_FEATURE_AREA_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_PROTECTED_RESOURCES.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_PROTECTED_RESOURCES.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_PROTECTED_RESOURCES.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_PROTECTED_RESOURCES.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_SIZE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_SIZE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_SIZE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_SIZE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZE1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZE1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZE1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZE1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_MAX_INPUT_STREAMS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_MAX_INPUT_STREAMS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_MAX_INPUT_STREAMS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_MAX_INPUT_STREAMS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_PROTECTED_RESOURCES.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_PROTECTED_RESOURCES.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_PROTECTED_RESOURCES.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_PROTECTED_RESOURCES.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_REFERENCE_INFO.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_REFERENCE_INFO.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_REFERENCE_INFO.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_REFERENCE_INFO.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_VIDEO.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_VIDEO.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_VIDEO.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_VIDEO.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_QUERY_DATA_VIDEO_DECODE_STATISTICS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_QUERY_DATA_VIDEO_DECODE_STATISTICS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_QUERY_DATA_VIDEO_DECODE_STATISTICS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_QUERY_DATA_VIDEO_DECODE_STATISTICS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_INPUT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_INPUT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_INPUT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_INPUT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_OUTPUT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_OUTPUT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_OUTPUT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_OUTPUT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_RESOURCE_COORDINATE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_RESOURCE_COORDINATE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_RESOURCE_COORDINATE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_RESOURCE_COORDINATE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_HEAP_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_HEAP_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_HEAP_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_HEAP_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_ARGUMENT_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_ARGUMENT_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_ARGUMENT_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_ARGUMENT_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONFIGURATION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONFIGURATION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONFIGURATION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONFIGURATION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_SUPPORT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_SUPPORT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_SUPPORT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_SUPPORT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_FRAME_ARGUMENT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_FRAME_ARGUMENT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_FRAME_ARGUMENT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_FRAME_ARGUMENT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_HISTOGRAM_COMPONENT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_HISTOGRAM_COMPONENT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_HISTOGRAM_COMPONENT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_HISTOGRAM_COMPONENT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_HISTOGRAM_COMPONENT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_HISTOGRAM_COMPONENT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_HISTOGRAM_COMPONENT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_HISTOGRAM_COMPONENT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_HISTOGRAM.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_HISTOGRAM.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_HISTOGRAM.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_HISTOGRAM.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_REFERENCE_FRAMES.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_REFERENCE_FRAMES.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_REFERENCE_FRAMES.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_REFERENCE_FRAMES.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_STATUS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_STATUS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_STATUS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_STATUS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_SUPPORT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_SUPPORT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_SUPPORT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_SUPPORT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_TIER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_TIER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_TIER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_TIER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_DIRECT_MODES.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_DIRECT_MODES.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_DIRECT_MODES.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_DIRECT_MODES.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODES.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODES.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODES.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODES.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_CUSIZE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVC_TUSIZE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVC_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_H264.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_H264.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_H264.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_H264.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_HEVC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_HEVC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_HEVC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_HEVC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_COMPRESSED_BITSTREAM.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_COMPRESSED_BITSTREAM.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_COMPRESSED_BITSTREAM.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_COMPRESSED_BITSTREAM.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_INPUT_ARGUMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_INPUT_ARGUMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_INPUT_ARGUMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_INPUT_ARGUMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_OUTPUT_ARGUMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_OUTPUT_ARGUMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_OUTPUT_ARGUMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_OUTPUT_ARGUMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODE_OPERATION_METADATA_BUFFER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODE_OPERATION_METADATA_BUFFER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODE_OPERATION_METADATA_BUFFER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODE_OPERATION_METADATA_BUFFER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_TYPE_H264.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_TYPE_H264.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_TYPE_H264.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_TYPE_H264.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_TYPE_HEVC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_TYPE_HEVC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_TYPE_HEVC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_TYPE_HEVC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_HEAP_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_HEAP_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_HEAP_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_HEAP_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_HEAP_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_HEAP_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_HEAP_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_HEAP_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_INTRA_REFRESH.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_INTRA_REFRESH.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_INTRA_REFRESH.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_INTRA_REFRESH.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_INTRA_REFRESH_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVELS_H264.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVELS_H264.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVELS_H264.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVELS_H264.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVELS_HEVC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVELS_HEVC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVELS_HEVC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVELS_HEVC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_SETTING.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_SETTING.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_SETTING.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_SETTING.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATA.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATA.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATA.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATA.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATA_STATISTICS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATA_STATISTICS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATA_STATISTICS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATA_STATISTICS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_LIST_MODIFICATION_OPERATION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_LIST_MODIFICATION_OPERATION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_LIST_MODIFICATION_OPERATION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_LIST_MODIFICATION_OPERATION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_MARKING_OPERATION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_MARKING_OPERATION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_MARKING_OPERATION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_MARKING_OPERATION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVC_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_SLICES.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_SLICES.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_SLICES.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_SLICES.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_RATIO_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_RATIO_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_RATIO_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_RATIO_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_H264.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_H264.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_H264.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_H264.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_HEVC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_HEVC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_HEVC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_HEVC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CBR.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CBR.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CBR.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CBR.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CONFIGURATION_PARAMS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CONFIGURATION_PARAMS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CONFIGURATION_PARAMS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CONFIGURATION_PARAMS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CQP.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CQP.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CQP.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CQP.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_QVBR.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_QVBR.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_QVBR.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_QVBR.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_VBR.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_VBR.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_VBR.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_VBR.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_H264.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_H264.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_H264.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_H264.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_HEVC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_HEVC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_HEVC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_HEVC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_INPUT_ARGUMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_INPUT_ARGUMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_INPUT_ARGUMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_INPUT_ARGUMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_OUTPUT_ARGUMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_OUTPUT_ARGUMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_OUTPUT_ARGUMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_OUTPUT_ARGUMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_HEVC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_HEVC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_HEVC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_HEVC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SUPPORT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SUPPORT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SUPPORT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SUPPORT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_TIER_HEVC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_TIER_HEVC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_TIER_HEVC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_TIER_HEVC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_VALIDATION_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_VALIDATION_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_VALIDATION_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_VALIDATION_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODE_REFERENCE_FRAMES.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODE_REFERENCE_FRAMES.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODE_REFERENCE_FRAMES.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODE_REFERENCE_FRAMES.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_INFO.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_INFO.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_INFO.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_INFO.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_INFO.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_INFO.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_INFO.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_INFO.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_STAGE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_STAGE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_STAGE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_STAGE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_FIELD_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_FIELD_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_FIELD_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_FIELD_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_FORMAT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_FORMAT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_FORMAT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_FORMAT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_FRAME_STEREO_FORMAT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_FRAME_STEREO_FORMAT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_FRAME_STEREO_FORMAT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_FRAME_STEREO_FORMAT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_INPUT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_INPUT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_INPUT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_INPUT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_OUTPUT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_OUTPUT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_OUTPUT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_OUTPUT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_SEARCH_BLOCK_SIZE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_VECTOR_PRECISION_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_VECTOR_HEAP_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_VECTOR_HEAP_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_VECTOR_HEAP_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_VECTOR_HEAP_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ALPHA_BLENDING.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ALPHA_BLENDING.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ALPHA_BLENDING.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ALPHA_BLENDING.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FEATURE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FEATURE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FEATURE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FEATURE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER_RANGE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER_RANGE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER_RANGE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER_RANGE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_RATE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_RATE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_RATE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_RATE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_LUMA_KEY.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_LUMA_KEY.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_LUMA_KEY.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_LUMA_KEY.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ORIENTATION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ORIENTATION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ORIENTATION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ORIENTATION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_REFERENCE_SET.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_REFERENCE_SET.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_REFERENCE_SET.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_REFERENCE_SET.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_SUPPORT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_SUPPORT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_SUPPORT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_SUPPORT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_TRANSFORM.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_TRANSFORM.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_TRANSFORM.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_TRANSFORM.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROTECTED_RESOURCE_SUPPORT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROTECTED_RESOURCE_SUPPORT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROTECTED_RESOURCE_SUPPORT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROTECTED_RESOURCE_SUPPORT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SAMPLE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SAMPLE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SAMPLE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SAMPLE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SCALE_SUPPORT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SCALE_SUPPORT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SCALE_SUPPORT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SCALE_SUPPORT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SCALE_SUPPORT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SCALE_SUPPORT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SCALE_SUPPORT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SCALE_SUPPORT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SIZE_RANGE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SIZE_RANGE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SIZE_RANGE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SIZE_RANGE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList3.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList3.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList3.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList3.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoder.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoder.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoder.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoder.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoder1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoder1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoder1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoder1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoderHeap.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoderHeap.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoderHeap.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoderHeap.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoderHeap1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoderHeap1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoderHeap1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoderHeap1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice3.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice3.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice3.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice3.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList3.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList3.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList3.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList3.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoEncoder.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncoder.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoEncoder.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncoder.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoEncoderHeap.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncoderHeap.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoEncoderHeap.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncoderHeap.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoExtensionCommand.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoExtensionCommand.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoExtensionCommand.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoExtensionCommand.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoMotionEstimator.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoMotionEstimator.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoMotionEstimator.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoMotionEstimator.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoMotionVectorHeap.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoMotionVectorHeap.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoMotionVectorHeap.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoMotionVectorHeap.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList2.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList2.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList2.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList2.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList3.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList3.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList3.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList3.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessor.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessor.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessor.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessor.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessor1.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessor1.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessor1.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessor1.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3d12video/IID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3d12video/IID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3d12video/IID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3d12video/IID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_CBUFFER_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_CBUFFER_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_CBUFFER_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_CBUFFER_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_DRIVER_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_DRIVER_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_DRIVER_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_DRIVER_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_FEATURE_LEVEL.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_FEATURE_LEVEL.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_FEATURE_LEVEL.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_FEATURE_LEVEL.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_FORMAT_COMPONENT_INTERPRETATION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_FORMAT_COMPONENT_INTERPRETATION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_FORMAT_COMPONENT_INTERPRETATION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_FORMAT_COMPONENT_INTERPRETATION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_FORMAT_COMPONENT_NAME.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_FORMAT_COMPONENT_NAME.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_FORMAT_COMPONENT_NAME.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_FORMAT_COMPONENT_NAME.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_FORMAT_LAYOUT.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_FORMAT_LAYOUT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_FORMAT_LAYOUT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_FORMAT_LAYOUT.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_FORMAT_TYPE_LEVEL.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_FORMAT_TYPE_LEVEL.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_FORMAT_TYPE_LEVEL.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_FORMAT_TYPE_LEVEL.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_INCLUDE_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_INCLUDE_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_INCLUDE_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_INCLUDE_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_INTERPOLATION_MODE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_INTERPOLATION_MODE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_INTERPOLATION_MODE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_INTERPOLATION_MODE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_MIN_PRECISION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_MIN_PRECISION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_MIN_PRECISION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_MIN_PRECISION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_NAME.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_NAME.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_NAME.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_NAME.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_PARAMETER_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_PARAMETER_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_PARAMETER_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_PARAMETER_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_PRIMITIVE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_PRIMITIVE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_PRIMITIVE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_PRIMITIVE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_PRIMITIVE_TOPOLOGY.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_PRIMITIVE_TOPOLOGY.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_PRIMITIVE_TOPOLOGY.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_PRIMITIVE_TOPOLOGY.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_REGISTER_COMPONENT_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_REGISTER_COMPONENT_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_REGISTER_COMPONENT_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_REGISTER_COMPONENT_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_RESOURCE_RETURN_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_RESOURCE_RETURN_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_RESOURCE_RETURN_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_RESOURCE_RETURN_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_CBUFFER_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_CBUFFER_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_CBUFFER_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_CBUFFER_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_INPUT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_INPUT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_INPUT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_INPUT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_INPUT_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_INPUT_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_INPUT_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_INPUT_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_MACRO.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_MACRO.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_MACRO.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_MACRO.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_VARIABLE_CLASS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_VARIABLE_CLASS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_VARIABLE_CLASS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_VARIABLE_CLASS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_VARIABLE_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_VARIABLE_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_VARIABLE_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_VARIABLE_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_VARIABLE_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_VARIABLE_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_SHADER_VARIABLE_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_VARIABLE_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_SRV_DIMENSION.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SRV_DIMENSION.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_SRV_DIMENSION.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_SRV_DIMENSION.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_TESSELLATOR_DOMAIN.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_TESSELLATOR_DOMAIN.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_TESSELLATOR_DOMAIN.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_TESSELLATOR_DOMAIN.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_TESSELLATOR_OUTPUT_PRIMITIVE.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_TESSELLATOR_OUTPUT_PRIMITIVE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_TESSELLATOR_OUTPUT_PRIMITIVE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_TESSELLATOR_OUTPUT_PRIMITIVE.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/D3D_TESSELLATOR_PARTITIONING.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_TESSELLATOR_PARTITIONING.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/D3D_TESSELLATOR_PARTITIONING.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/D3D_TESSELLATOR_PARTITIONING.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/DirectX.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/DirectX.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/DirectX.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/DirectX.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/ID3DBlob.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/ID3DBlob.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/ID3DBlob.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/ID3DBlob.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/ID3DDestructionNotifier.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/ID3DDestructionNotifier.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/ID3DDestructionNotifier.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/ID3DDestructionNotifier.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/ID3DInclude.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/ID3DInclude.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/ID3DInclude.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/ID3DInclude.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dcommon/IID.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dcommon/IID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dcommon/IID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dcommon/IID.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dx12/D3DX12_MESH_SHADER_PIPELINE_STATE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dx12/D3DX12_MESH_SHADER_PIPELINE_STATE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dx12/D3DX12_MESH_SHADER_PIPELINE_STATE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dx12/D3DX12_MESH_SHADER_PIPELINE_STATE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dx12/DirectX.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dx12/DirectX.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dx12/DirectX.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dx12/DirectX.gen.cs
diff --git a/sources/Windows/DirectX/headers/d3dx12/ID3DX12PipelineParserCallbacks.gen.cs b/sources/Win32/Win32/DirectX/headers/d3dx12/ID3DX12PipelineParserCallbacks.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/d3dx12/ID3DX12PipelineParserCallbacks.gen.cs
rename to sources/Win32/Win32/DirectX/headers/d3dx12/ID3DX12PipelineParserCallbacks.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore/DirectX.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore/DirectX.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore/DirectX.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore/DirectX.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudget.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudget.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudget.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudget.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudgetNodeSegmentGroup.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudgetNodeSegmentGroup.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudgetNodeSegmentGroup.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudgetNodeSegmentGroup.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterPreference.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterPreference.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterPreference.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterPreference.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterProperty.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterProperty.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterProperty.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterProperty.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterState.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterState.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterState.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterState.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/DXCoreHardwareID.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreHardwareID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/DXCoreHardwareID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreHardwareID.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/DXCoreHardwareIDParts.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreHardwareIDParts.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/DXCoreHardwareIDParts.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreHardwareIDParts.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/DXCoreNotificationType.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreNotificationType.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/DXCoreNotificationType.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreNotificationType.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/DXCoreSegmentGroup.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreSegmentGroup.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/DXCoreSegmentGroup.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreSegmentGroup.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/DirectX.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/DirectX.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/DirectX.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/DirectX.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/IDXCoreAdapter.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/IDXCoreAdapter.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/IDXCoreAdapter.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/IDXCoreAdapter.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/IDXCoreAdapterFactory.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/IDXCoreAdapterFactory.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/IDXCoreAdapterFactory.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/IDXCoreAdapterFactory.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/IDXCoreAdapterList.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/IDXCoreAdapterList.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/IDXCoreAdapterList.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/IDXCoreAdapterList.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxcore_interface/IID.gen.cs b/sources/Win32/Win32/DirectX/headers/dxcore_interface/IID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxcore_interface/IID.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxcore_interface/IID.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxgicommon/DXGI.gen.cs b/sources/Win32/Win32/DirectX/headers/dxgicommon/DXGI.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxgicommon/DXGI.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxgicommon/DXGI.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxgicommon/DXGI_COLOR_SPACE_TYPE.gen.cs b/sources/Win32/Win32/DirectX/headers/dxgicommon/DXGI_COLOR_SPACE_TYPE.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxgicommon/DXGI_COLOR_SPACE_TYPE.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxgicommon/DXGI_COLOR_SPACE_TYPE.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxgicommon/DXGI_RATIONAL.gen.cs b/sources/Win32/Win32/DirectX/headers/dxgicommon/DXGI_RATIONAL.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxgicommon/DXGI_RATIONAL.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxgicommon/DXGI_RATIONAL.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxgicommon/DXGI_SAMPLE_DESC.gen.cs b/sources/Win32/Win32/DirectX/headers/dxgicommon/DXGI_SAMPLE_DESC.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxgicommon/DXGI_SAMPLE_DESC.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxgicommon/DXGI_SAMPLE_DESC.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxgiformat/DXGI.gen.cs b/sources/Win32/Win32/DirectX/headers/dxgiformat/DXGI.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxgiformat/DXGI.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxgiformat/DXGI.gen.cs
diff --git a/sources/Windows/DirectX/headers/dxgiformat/DXGI_FORMAT.gen.cs b/sources/Win32/Win32/DirectX/headers/dxgiformat/DXGI_FORMAT.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/headers/dxgiformat/DXGI_FORMAT.gen.cs
rename to sources/Win32/Win32/DirectX/headers/dxgiformat/DXGI_FORMAT.gen.cs
diff --git a/sources/Windows/DirectX/other/D3D11On12On7/ID3D11On12On7.gen.cs b/sources/Win32/Win32/DirectX/other/D3D11On12On7/ID3D11On12On7.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/other/D3D11On12On7/ID3D11On12On7.gen.cs
rename to sources/Win32/Win32/DirectX/other/D3D11On12On7/ID3D11On12On7.gen.cs
diff --git a/sources/Windows/DirectX/other/D3D11On12On7/ID3D11On12On7Device.gen.cs b/sources/Win32/Win32/DirectX/other/D3D11On12On7/ID3D11On12On7Device.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/other/D3D11On12On7/ID3D11On12On7Device.gen.cs
rename to sources/Win32/Win32/DirectX/other/D3D11On12On7/ID3D11On12On7Device.gen.cs
diff --git a/sources/Windows/DirectX/other/D3D12Downlevel/D3D12_DOWNLEVEL_PRESENT_FLAGS.gen.cs b/sources/Win32/Win32/DirectX/other/D3D12Downlevel/D3D12_DOWNLEVEL_PRESENT_FLAGS.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/other/D3D12Downlevel/D3D12_DOWNLEVEL_PRESENT_FLAGS.gen.cs
rename to sources/Win32/Win32/DirectX/other/D3D12Downlevel/D3D12_DOWNLEVEL_PRESENT_FLAGS.gen.cs
diff --git a/sources/Windows/DirectX/other/D3D12Downlevel/ID3D12CommandQueueDownlevel.gen.cs b/sources/Win32/Win32/DirectX/other/D3D12Downlevel/ID3D12CommandQueueDownlevel.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/other/D3D12Downlevel/ID3D12CommandQueueDownlevel.gen.cs
rename to sources/Win32/Win32/DirectX/other/D3D12Downlevel/ID3D12CommandQueueDownlevel.gen.cs
diff --git a/sources/Windows/DirectX/other/D3D12Downlevel/ID3D12DeviceDownlevel.gen.cs b/sources/Win32/Win32/DirectX/other/D3D12Downlevel/ID3D12DeviceDownlevel.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/other/D3D12Downlevel/ID3D12DeviceDownlevel.gen.cs
rename to sources/Win32/Win32/DirectX/other/D3D12Downlevel/ID3D12DeviceDownlevel.gen.cs
diff --git a/sources/Windows/DirectX/other/D3D12Downlevel/IID.gen.cs b/sources/Win32/Win32/DirectX/other/D3D12Downlevel/IID.gen.cs
similarity index 100%
rename from sources/Windows/DirectX/other/D3D12Downlevel/IID.gen.cs
rename to sources/Win32/Win32/DirectX/other/D3D12Downlevel/IID.gen.cs
diff --git a/sources/Windows/Silk.NET.Win32.csproj b/sources/Win32/Win32/Silk.NET.Win32.csproj
similarity index 100%
rename from sources/Windows/Silk.NET.Win32.csproj
rename to sources/Win32/Win32/Silk.NET.Win32.csproj
diff --git a/sources/Windows/Windows/other/helper-types/APARTMENT_SHUTDOWN_REGISTRATION_COOKIE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/APARTMENT_SHUTDOWN_REGISTRATION_COOKIE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/APARTMENT_SHUTDOWN_REGISTRATION_COOKIE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/APARTMENT_SHUTDOWN_REGISTRATION_COOKIE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/ASYNCCOMPLETIONHANDLE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/ASYNCCOMPLETIONHANDLE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/ASYNCCOMPLETIONHANDLE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/ASYNCCOMPLETIONHANDLE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/BOOL.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/BOOL.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/BOOL.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/BOOL.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/COLORREF.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/COLORREF.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/COLORREF.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/COLORREF.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/COMPRESSOR_HANDLE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/COMPRESSOR_HANDLE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/COMPRESSOR_HANDLE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/COMPRESSOR_HANDLE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/CO_DEVICE_CATALOG_COOKIE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/CO_DEVICE_CATALOG_COOKIE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/CO_DEVICE_CATALOG_COOKIE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/CO_DEVICE_CATALOG_COOKIE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/CO_MTA_USAGE_COOKIE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/CO_MTA_USAGE_COOKIE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/CO_MTA_USAGE_COOKIE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/CO_MTA_USAGE_COOKIE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/DPI_AWARENESS_CONTEXT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/DPI_AWARENESS_CONTEXT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/DPI_AWARENESS_CONTEXT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/DPI_AWARENESS_CONTEXT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/EC_HANDLE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/EC_HANDLE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/EC_HANDLE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/EC_HANDLE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/EC_OBJECT_ARRAY_PROPERTY_HANDLE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/EC_OBJECT_ARRAY_PROPERTY_HANDLE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/EC_OBJECT_ARRAY_PROPERTY_HANDLE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/EC_OBJECT_ARRAY_PROPERTY_HANDLE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HACCEL.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HACCEL.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HACCEL.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HACCEL.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HANDLE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HANDLE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HANDLE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HANDLE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HANDLE_PTR.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HANDLE_PTR.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HANDLE_PTR.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HANDLE_PTR.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HANIMATIONBUFFER.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HANIMATIONBUFFER.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HANIMATIONBUFFER.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HANIMATIONBUFFER.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HBITMAP.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HBITMAP.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HBITMAP.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HBITMAP.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HBRUSH.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HBRUSH.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HBRUSH.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HBRUSH.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCATADMIN.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCATADMIN.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCATADMIN.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCATADMIN.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCERTCHAINENGINE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCERTCHAINENGINE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCERTCHAINENGINE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCERTCHAINENGINE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCERTSTORE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCERTSTORE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCERTSTORE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCERTSTORE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCERTSTOREPROV.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCERTSTOREPROV.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCERTSTOREPROV.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCERTSTOREPROV.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCERT_SERVER_OCSP_RESPONSE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCERT_SERVER_OCSP_RESPONSE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCERT_SERVER_OCSP_RESPONSE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCERT_SERVER_OCSP_RESPONSE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCMTRANSFORM.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCMTRANSFORM.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCMTRANSFORM.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCMTRANSFORM.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCOLORSPACE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCOLORSPACE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCOLORSPACE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCOLORSPACE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCOMDB.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCOMDB.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCOMDB.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCOMDB.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCRYPTASYNC.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCRYPTASYNC.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCRYPTASYNC.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCRYPTASYNC.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCRYPTDEFAULTCONTEXT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCRYPTDEFAULTCONTEXT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCRYPTDEFAULTCONTEXT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCRYPTDEFAULTCONTEXT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCRYPTHASH.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCRYPTHASH.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCRYPTHASH.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCRYPTHASH.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCRYPTKEY.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCRYPTKEY.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCRYPTKEY.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCRYPTKEY.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCRYPTMSG.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCRYPTMSG.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCRYPTMSG.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCRYPTMSG.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCRYPTOIDFUNCADDR.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCRYPTOIDFUNCADDR.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCRYPTOIDFUNCADDR.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCRYPTOIDFUNCADDR.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCRYPTOIDFUNCSET.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCRYPTOIDFUNCSET.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCRYPTOIDFUNCSET.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCRYPTOIDFUNCSET.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCRYPTPROV.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCRYPTPROV.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCRYPTPROV.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCRYPTPROV.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCRYPTPROV_LEGACY.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCRYPTPROV_LEGACY.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCRYPTPROV_LEGACY.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCRYPTPROV_LEGACY.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCRYPTPROV_OR_NCRYPT_KEY_HANDLE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCRYPTPROV_OR_NCRYPT_KEY_HANDLE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCRYPTPROV_OR_NCRYPT_KEY_HANDLE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCRYPTPROV_OR_NCRYPT_KEY_HANDLE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HCURSOR.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HCURSOR.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HCURSOR.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HCURSOR.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HDC.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HDC.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HDC.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HDC.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HDESK.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HDESK.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HDESK.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HDESK.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HDEVINFO.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HDEVINFO.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HDEVINFO.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HDEVINFO.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HDEVNOTIFY.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HDEVNOTIFY.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HDEVNOTIFY.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HDEVNOTIFY.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HDROP.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HDROP.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HDROP.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HDROP.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HDSKSPC.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HDSKSPC.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HDSKSPC.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HDSKSPC.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HDWP.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HDWP.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HDWP.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HDWP.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HENHMETAFILE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HENHMETAFILE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HENHMETAFILE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HENHMETAFILE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HEVENT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HEVENT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HEVENT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HEVENT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HFONT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HFONT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HFONT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HFONT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HGDIOBJ.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HGDIOBJ.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HGDIOBJ.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HGDIOBJ.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HGESTUREINFO.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HGESTUREINFO.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HGESTUREINFO.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HGESTUREINFO.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HGLOBAL.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HGLOBAL.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HGLOBAL.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HGLOBAL.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HGLRC.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HGLRC.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HGLRC.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HGLRC.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HHANDLE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HHANDLE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HHANDLE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HHANDLE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HHOOK.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HHOOK.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HHOOK.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HHOOK.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HICON.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HICON.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HICON.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HICON.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HIFTIMESTAMPCHANGE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HIFTIMESTAMPCHANGE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HIFTIMESTAMPCHANGE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HIFTIMESTAMPCHANGE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HIMAGELIST.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HIMAGELIST.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HIMAGELIST.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HIMAGELIST.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HIMC.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HIMC.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HIMC.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HIMC.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HIMCC.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HIMCC.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HIMCC.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HIMCC.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HINF.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HINF.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HINF.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HINF.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HINSTANCE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HINSTANCE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HINSTANCE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HINSTANCE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HINTERACTIONCONTEXT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HINTERACTIONCONTEXT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HINTERACTIONCONTEXT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HINTERACTIONCONTEXT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HINTERNET.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HINTERNET.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HINTERNET.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HINTERNET.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HKEY.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HKEY.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HKEY.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HKEY.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HKL.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HKL.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HKL.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HKL.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HLOCAL.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HLOCAL.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HLOCAL.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HLOCAL.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HMENU.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HMENU.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HMENU.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HMENU.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HMETAFILE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HMETAFILE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HMETAFILE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HMETAFILE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HMETAFILEPICT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HMETAFILEPICT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HMETAFILEPICT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HMETAFILEPICT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HMIDI.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HMIDI.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HMIDI.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HMIDI.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HMIDIIN.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HMIDIIN.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HMIDIIN.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HMIDIIN.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HMIDIOUT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HMIDIOUT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HMIDIOUT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HMIDIOUT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HMIDISTRM.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HMIDISTRM.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HMIDISTRM.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HMIDISTRM.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HMIXER.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HMIXER.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HMIXER.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HMIXER.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HMIXEROBJ.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HMIXEROBJ.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HMIXEROBJ.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HMIXEROBJ.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HMODULE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HMODULE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HMODULE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HMODULE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HMONITOR.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HMONITOR.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HMONITOR.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HMONITOR.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HPAINTBUFFER.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HPAINTBUFFER.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HPAINTBUFFER.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HPAINTBUFFER.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HPALETTE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HPALETTE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HPALETTE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HPALETTE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HPCON.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HPCON.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HPCON.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HPCON.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HPEN.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HPEN.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HPEN.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HPEN.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HPOWERNOTIFY.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HPOWERNOTIFY.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HPOWERNOTIFY.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HPOWERNOTIFY.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HPROFILE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HPROFILE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HPROFILE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HPROFILE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HPROPSHEETPAGE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HPROPSHEETPAGE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HPROPSHEETPAGE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HPROPSHEETPAGE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HPSS.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HPSS.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HPSS.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HPSS.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HPSSWALK.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HPSSWALK.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HPSSWALK.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HPSSWALK.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HPSXA.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HPSXA.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HPSXA.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HPSXA.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HRAWINPUT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HRAWINPUT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HRAWINPUT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HRAWINPUT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HRESULT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HRESULT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HRESULT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HRESULT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HRGN.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HRGN.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HRGN.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HRGN.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HRSRC.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HRSRC.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HRSRC.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HRSRC.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HSEMAPHORE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HSEMAPHORE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HSEMAPHORE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HSEMAPHORE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HSPFILELOG.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HSPFILELOG.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HSPFILELOG.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HSPFILELOG.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HSPFILEQ.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HSPFILEQ.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HSPFILEQ.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HSPFILEQ.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HSTRING.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HSTRING.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HSTRING.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HSTRING.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HSTRING_BUFFER.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HSTRING_BUFFER.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HSTRING_BUFFER.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HSTRING_BUFFER.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HSWDEVICE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HSWDEVICE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HSWDEVICE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HSWDEVICE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HSYNTHETICPOINTERDEVICE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HSYNTHETICPOINTERDEVICE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HSYNTHETICPOINTERDEVICE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HSYNTHETICPOINTERDEVICE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HTASK.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HTASK.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HTASK.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HTASK.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HTHEME.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HTHEME.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HTHEME.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HTHEME.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HTHUMBNAIL.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HTHUMBNAIL.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HTHUMBNAIL.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HTHUMBNAIL.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HTOUCHINPUT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HTOUCHINPUT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HTOUCHINPUT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HTOUCHINPUT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HTRANSFORM.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HTRANSFORM.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HTRANSFORM.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HTRANSFORM.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HTREEITEM.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HTREEITEM.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HTREEITEM.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HTREEITEM.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HUSKEY.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HUSKEY.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HUSKEY.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HUSKEY.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HWAVEIN.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HWAVEIN.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HWAVEIN.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HWAVEIN.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HWAVEOUT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HWAVEOUT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HWAVEOUT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HWAVEOUT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HWINEVENTHOOK.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HWINEVENTHOOK.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HWINEVENTHOOK.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HWINEVENTHOOK.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HWINSTA.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HWINSTA.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HWINSTA.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HWINSTA.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/HWND.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/HWND.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/HWND.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/HWND.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/InstanceHandle.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/InstanceHandle.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/InstanceHandle.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/InstanceHandle.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/LPARAM.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/LPARAM.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/LPARAM.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/LPARAM.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/LPPROC_THREAD_ATTRIBUTE_LIST.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/LPPROC_THREAD_ATTRIBUTE_LIST.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/LPPROC_THREAD_ATTRIBUTE_LIST.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/LPPROC_THREAD_ATTRIBUTE_LIST.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/LRESULT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/LRESULT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/LRESULT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/LRESULT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/MSIHANDLE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/MSIHANDLE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/MSIHANDLE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/MSIHANDLE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/MachineGlobalObjectTableRegistrationToken.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/MachineGlobalObjectTableRegistrationToken.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/MachineGlobalObjectTableRegistrationToken.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/MachineGlobalObjectTableRegistrationToken.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/NativeInheritanceAttribute.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/NativeInheritanceAttribute.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/NativeInheritanceAttribute.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/NativeInheritanceAttribute.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/NativeTypeNameAttribute.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/NativeTypeNameAttribute.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/NativeTypeNameAttribute.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/NativeTypeNameAttribute.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/OAHWND.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/OAHWND.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/OAHWND.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/OAHWND.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/PACKAGEDEPENDENCY_CONTEXT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/PACKAGEDEPENDENCY_CONTEXT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/PACKAGEDEPENDENCY_CONTEXT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/PACKAGEDEPENDENCY_CONTEXT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/PACKAGE_INFO_REFERENCE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/PACKAGE_INFO_REFERENCE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/PACKAGE_INFO_REFERENCE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/PACKAGE_INFO_REFERENCE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/PAPPCONSTRAIN_REGISTRATION.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/PAPPCONSTRAIN_REGISTRATION.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/PAPPCONSTRAIN_REGISTRATION.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/PAPPCONSTRAIN_REGISTRATION.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/PAPPSTATE_REGISTRATION.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/PAPPSTATE_REGISTRATION.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/PAPPSTATE_REGISTRATION.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/PAPPSTATE_REGISTRATION.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/PCUSERIALIZEDPROPSTORAGE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/PCUSERIALIZEDPROPSTORAGE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/PCUSERIALIZEDPROPSTORAGE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/PCUSERIALIZEDPROPSTORAGE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/PHIDP_PREPARSED_DATA.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/PHIDP_PREPARSED_DATA.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/PHIDP_PREPARSED_DATA.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/PHIDP_PREPARSED_DATA.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/PRJ_DIR_ENTRY_BUFFER_HANDLE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/PRJ_DIR_ENTRY_BUFFER_HANDLE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/PRJ_DIR_ENTRY_BUFFER_HANDLE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/PRJ_DIR_ENTRY_BUFFER_HANDLE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/PRJ_NAMESPACE_VIRTUALIZATION_CONTEXT.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/PRJ_NAMESPACE_VIRTUALIZATION_CONTEXT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/PRJ_NAMESPACE_VIRTUALIZATION_CONTEXT.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/PRJ_NAMESPACE_VIRTUALIZATION_CONTEXT.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/PTP_CALLBACK_INSTANCE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/PTP_CALLBACK_INSTANCE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/PTP_CALLBACK_INSTANCE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/PTP_CALLBACK_INSTANCE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/PTP_CLEANUP_GROUP.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/PTP_CLEANUP_GROUP.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/PTP_CLEANUP_GROUP.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/PTP_CLEANUP_GROUP.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/PTP_POOL.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/PTP_POOL.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/PTP_POOL.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/PTP_POOL.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/ROPARAMIIDHANDLE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/ROPARAMIIDHANDLE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/ROPARAMIIDHANDLE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/ROPARAMIIDHANDLE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/RO_REGISTRATION_COOKIE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/RO_REGISTRATION_COOKIE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/RO_REGISTRATION_COOKIE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/RO_REGISTRATION_COOKIE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/SPSTATEHANDLE.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/SPSTATEHANDLE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/SPSTATEHANDLE.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/SPSTATEHANDLE.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/SetsLastSystemErrorAttribute.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/SetsLastSystemErrorAttribute.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/SetsLastSystemErrorAttribute.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/SetsLastSystemErrorAttribute.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/UI_ANIMATION_KEYFRAME.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/UI_ANIMATION_KEYFRAME.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/UI_ANIMATION_KEYFRAME.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/UI_ANIMATION_KEYFRAME.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/VtblIndexAttribute.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/VtblIndexAttribute.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/VtblIndexAttribute.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/VtblIndexAttribute.gen.cs
diff --git a/sources/Windows/Windows/other/helper-types/WPARAM.gen.cs b/sources/Win32/Win32/Windows/other/helper-types/WPARAM.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/helper-types/WPARAM.gen.cs
rename to sources/Win32/Win32/Windows/other/helper-types/WPARAM.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/APPX_SIP_CLIENT_DATA.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/APPX_SIP_CLIENT_DATA.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/APPX_SIP_CLIENT_DATA.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/APPX_SIP_CLIENT_DATA.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/SIGNER.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/SIGNER.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/SIGNER.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/SIGNER.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/SIGNER_ATTR_AUTHCODE.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/SIGNER_ATTR_AUTHCODE.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/SIGNER_ATTR_AUTHCODE.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/SIGNER_ATTR_AUTHCODE.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/SIGNER_BLOB_INFO.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/SIGNER_BLOB_INFO.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/SIGNER_BLOB_INFO.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/SIGNER_BLOB_INFO.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/SIGNER_CERT.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/SIGNER_CERT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/SIGNER_CERT.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/SIGNER_CERT.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/SIGNER_CERT_STORE_INFO.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/SIGNER_CERT_STORE_INFO.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/SIGNER_CERT_STORE_INFO.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/SIGNER_CERT_STORE_INFO.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/SIGNER_CONTEXT.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/SIGNER_CONTEXT.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/SIGNER_CONTEXT.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/SIGNER_CONTEXT.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/SIGNER_FILE_INFO.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/SIGNER_FILE_INFO.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/SIGNER_FILE_INFO.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/SIGNER_FILE_INFO.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/SIGNER_PROVIDER_INFO.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/SIGNER_PROVIDER_INFO.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/SIGNER_PROVIDER_INFO.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/SIGNER_PROVIDER_INFO.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/SIGNER_SIGNATURE_INFO.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/SIGNER_SIGNATURE_INFO.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/SIGNER_SIGNATURE_INFO.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/SIGNER_SIGNATURE_INFO.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/SIGNER_SIGN_EX2_PARAMS.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/SIGNER_SIGN_EX2_PARAMS.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/SIGNER_SIGN_EX2_PARAMS.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/SIGNER_SIGN_EX2_PARAMS.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/SIGNER_SPC_CHAIN_INFO.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/SIGNER_SPC_CHAIN_INFO.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/SIGNER_SPC_CHAIN_INFO.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/SIGNER_SPC_CHAIN_INFO.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/SIGNER_SUBJECT_INFO.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/SIGNER_SUBJECT_INFO.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/SIGNER_SUBJECT_INFO.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/SIGNER_SUBJECT_INFO.gen.cs
diff --git a/sources/Windows/Windows/other/mssign32/Windows.gen.cs b/sources/Win32/Win32/Windows/other/mssign32/Windows.gen.cs
similarity index 100%
rename from sources/Windows/Windows/other/mssign32/Windows.gen.cs
rename to sources/Win32/Win32/Windows/other/mssign32/Windows.gen.cs
diff --git a/tests/Core/Globals.cs b/tests/Core/Core/Globals.cs
similarity index 100%
rename from tests/Core/Globals.cs
rename to tests/Core/Core/Globals.cs
diff --git a/tests/Core/Ptr2DTests.cs b/tests/Core/Core/Ptr2DTests.cs
similarity index 100%
rename from tests/Core/Ptr2DTests.cs
rename to tests/Core/Core/Ptr2DTests.cs
diff --git a/tests/Core/PtrTests.cs b/tests/Core/Core/PtrTests.cs
similarity index 100%
rename from tests/Core/PtrTests.cs
rename to tests/Core/Core/PtrTests.cs
diff --git a/tests/Core/Ref2DTests.cs b/tests/Core/Core/Ref2DTests.cs
similarity index 100%
rename from tests/Core/Ref2DTests.cs
rename to tests/Core/Core/Ref2DTests.cs
diff --git a/tests/Core/RefTests.cs b/tests/Core/Core/RefTests.cs
similarity index 100%
rename from tests/Core/RefTests.cs
rename to tests/Core/Core/RefTests.cs
diff --git a/tests/Core/Silk.NET.Core.UnitTests.csproj b/tests/Core/Core/Silk.NET.Core.UnitTests.csproj
similarity index 86%
rename from tests/Core/Silk.NET.Core.UnitTests.csproj
rename to tests/Core/Core/Silk.NET.Core.UnitTests.csproj
index 5bc46dd32a..45964a442b 100644
--- a/tests/Core/Silk.NET.Core.UnitTests.csproj
+++ b/tests/Core/Core/Silk.NET.Core.UnitTests.csproj
@@ -21,11 +21,11 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\sources\Core\Silk.NET.Core.csproj" />
+      <ProjectReference Include="..\..\..\sources\Core\Core\Silk.NET.Core.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-      <Compile Include="..\..\sources\Core\Silk.NET.Core.cs">
+      <Compile Include="..\..\..\sources\Core\Core\Silk.NET.Core.cs">
         <Link>Silk.NET.Core.cs</Link>
       </Compile>
     </ItemGroup>
diff --git a/tests/Core/SilkMarshalTests.cs b/tests/Core/Core/SilkMarshalTests.cs
similarity index 100%
rename from tests/Core/SilkMarshalTests.cs
rename to tests/Core/Core/SilkMarshalTests.cs
diff --git a/tests/GLFW/glfw3/GLFWallocatorTests.gen.cs b/tests/GLFW/glfw3/GLFWallocatorTests.gen.cs
deleted file mode 100644
index e4247683dc..0000000000
--- a/tests/GLFW/glfw3/GLFWallocatorTests.gen.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// Ported from glfw3.h and corresponding dependencies of GLFW3
-// Original source is Copyright © 2002-2006 Marcus Geelnard, 2006-2019 Camilla Löwy. Licensed under the zlib license.
-using System;
-using System.Runtime.InteropServices;
-using NUnit.Framework;
-
-namespace Silk.NET.GLFW.UnitTests;
-
-/// <summary>Provides validation of the <see cref = "GLFWallocator"/> struct.</summary>
-public static unsafe partial class GLFWallocatorTests
-{
-    /// <summary>Validates that the <see cref = "GLFWallocator"/> struct is blittable.</summary>
-
-    [Test]
-    public static void IsBlittableTest()
-    {
-        Assert.That(Marshal.SizeOf<GLFWallocator>(), Is.EqualTo(sizeof(Allocator)));
-    }
-
-    /// <summary>Validates that the <see cref = "GLFWallocator"/> struct has the right <see cref = "LayoutKind"/>.</summary>
-
-    [Test]
-    public static void IsLayoutSequentialTest()
-    {
-        Assert.That(typeof(Allocator).IsLayoutSequential, Is.True);
-    }
-
-    /// <summary>Validates that the <see cref = "GLFWallocator"/> struct has the correct size.</summary>
-
-    [Test]
-    public static void SizeOfTest()
-    {
-        if (Environment.Is64BitProcess)
-        {
-            Assert.That(sizeof(Allocator), Is.EqualTo(32));
-        }
-        else
-        {
-            Assert.That(sizeof(Allocator), Is.EqualTo(16));
-        }
-    }
-}
diff --git a/tests/GLFW/glfw3/GLFWgamepadstateTests.gen.cs b/tests/GLFW/glfw3/GLFWgamepadstateTests.gen.cs
deleted file mode 100644
index 683935e1b0..0000000000
--- a/tests/GLFW/glfw3/GLFWgamepadstateTests.gen.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// Ported from glfw3.h and corresponding dependencies of GLFW3
-// Original source is Copyright © 2002-2006 Marcus Geelnard, 2006-2019 Camilla Löwy. Licensed under the zlib license.
-using System.Runtime.InteropServices;
-using NUnit.Framework;
-
-namespace Silk.NET.GLFW.UnitTests;
-
-/// <summary>Provides validation of the <see cref = "GLFWgamepadstate"/> struct.</summary>
-public static unsafe partial class GLFWgamepadstateTests
-{
-    /// <summary>Validates that the <see cref = "GLFWgamepadstate"/> struct is blittable.</summary>
-
-    [Test]
-    public static void IsBlittableTest()
-    {
-        Assert.That(Marshal.SizeOf<GLFWgamepadstate>(), Is.EqualTo(sizeof(Gamepadstate)));
-    }
-
-    /// <summary>Validates that the <see cref = "GLFWgamepadstate"/> struct has the right <see cref = "LayoutKind"/>.</summary>
-
-    [Test]
-    public static void IsLayoutSequentialTest()
-    {
-        Assert.That(typeof(Gamepadstate).IsLayoutSequential, Is.True);
-    }
-
-    /// <summary>Validates that the <see cref = "GLFWgamepadstate"/> struct has the correct size.</summary>
-
-    [Test]
-    public static void SizeOfTest()
-    {
-        Assert.That(sizeof(Gamepadstate), Is.EqualTo(40));
-    }
-}
diff --git a/tests/GLFW/glfw3/GLFWgammarampTests.gen.cs b/tests/GLFW/glfw3/GLFWgammarampTests.gen.cs
deleted file mode 100644
index a1c4f0f123..0000000000
--- a/tests/GLFW/glfw3/GLFWgammarampTests.gen.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// Ported from glfw3.h and corresponding dependencies of GLFW3
-// Original source is Copyright © 2002-2006 Marcus Geelnard, 2006-2019 Camilla Löwy. Licensed under the zlib license.
-using System;
-using System.Runtime.InteropServices;
-using NUnit.Framework;
-
-namespace Silk.NET.GLFW.UnitTests;
-
-/// <summary>Provides validation of the <see cref = "GLFWgammaramp"/> struct.</summary>
-public static unsafe partial class GLFWgammarampTests
-{
-    /// <summary>Validates that the <see cref = "GLFWgammaramp"/> struct is blittable.</summary>
-
-    [Test]
-    public static void IsBlittableTest()
-    {
-        Assert.That(Marshal.SizeOf<GLFWgammaramp>(), Is.EqualTo(sizeof(Gammaramp)));
-    }
-
-    /// <summary>Validates that the <see cref = "GLFWgammaramp"/> struct has the right <see cref = "LayoutKind"/>.</summary>
-
-    [Test]
-    public static void IsLayoutSequentialTest()
-    {
-        Assert.That(typeof(Gammaramp).IsLayoutSequential, Is.True);
-    }
-
-    /// <summary>Validates that the <see cref = "GLFWgammaramp"/> struct has the correct size.</summary>
-
-    [Test]
-    public static void SizeOfTest()
-    {
-        if (Environment.Is64BitProcess)
-        {
-            Assert.That(sizeof(Gammaramp), Is.EqualTo(32));
-        }
-        else
-        {
-            Assert.That(sizeof(Gammaramp), Is.EqualTo(16));
-        }
-    }
-}
diff --git a/tests/GLFW/glfw3/GLFWimageTests.gen.cs b/tests/GLFW/glfw3/GLFWimageTests.gen.cs
deleted file mode 100644
index 65eaaae64d..0000000000
--- a/tests/GLFW/glfw3/GLFWimageTests.gen.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// Ported from glfw3.h and corresponding dependencies of GLFW3
-// Original source is Copyright © 2002-2006 Marcus Geelnard, 2006-2019 Camilla Löwy. Licensed under the zlib license.
-using System;
-using System.Runtime.InteropServices;
-using NUnit.Framework;
-
-namespace Silk.NET.GLFW.UnitTests;
-
-/// <summary>Provides validation of the <see cref = "GLFWimage"/> struct.</summary>
-public static unsafe partial class GLFWimageTests
-{
-    /// <summary>Validates that the <see cref = "GLFWimage"/> struct is blittable.</summary>
-
-    [Test]
-    public static void IsBlittableTest()
-    {
-        Assert.That(Marshal.SizeOf<GLFWimage>(), Is.EqualTo(sizeof(Image)));
-    }
-
-    /// <summary>Validates that the <see cref = "GLFWimage"/> struct has the right <see cref = "LayoutKind"/>.</summary>
-
-    [Test]
-    public static void IsLayoutSequentialTest()
-    {
-        Assert.That(typeof(Image).IsLayoutSequential, Is.True);
-    }
-
-    /// <summary>Validates that the <see cref = "GLFWimage"/> struct has the correct size.</summary>
-
-    [Test]
-    public static void SizeOfTest()
-    {
-        if (Environment.Is64BitProcess)
-        {
-            Assert.That(sizeof(Image), Is.EqualTo(16));
-        }
-        else
-        {
-            Assert.That(sizeof(Image), Is.EqualTo(12));
-        }
-    }
-}
diff --git a/tests/GLFW/glfw3/GLFWvidmodeTests.gen.cs b/tests/GLFW/glfw3/GLFWvidmodeTests.gen.cs
deleted file mode 100644
index d7f7839212..0000000000
--- a/tests/GLFW/glfw3/GLFWvidmodeTests.gen.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// Ported from glfw3.h and corresponding dependencies of GLFW3
-// Original source is Copyright © 2002-2006 Marcus Geelnard, 2006-2019 Camilla Löwy. Licensed under the zlib license.
-using System.Runtime.InteropServices;
-using NUnit.Framework;
-
-namespace Silk.NET.GLFW.UnitTests;
-
-/// <summary>Provides validation of the <see cref = "GLFWvidmode"/> struct.</summary>
-public static unsafe partial class GLFWvidmodeTests
-{
-    /// <summary>Validates that the <see cref = "GLFWvidmode"/> struct is blittable.</summary>
-
-    [Test]
-    public static void IsBlittableTest()
-    {
-        Assert.That(Marshal.SizeOf<GLFWvidmode>(), Is.EqualTo(sizeof(Vidmode)));
-    }
-
-    /// <summary>Validates that the <see cref = "GLFWvidmode"/> struct has the right <see cref = "LayoutKind"/>.</summary>
-
-    [Test]
-    public static void IsLayoutSequentialTest()
-    {
-        Assert.That(typeof(Vidmode).IsLayoutSequential, Is.True);
-    }
-
-    /// <summary>Validates that the <see cref = "GLFWvidmode"/> struct has the correct size.</summary>
-
-    [Test]
-    public static void SizeOfTest()
-    {
-        Assert.That(sizeof(Vidmode), Is.EqualTo(24));
-    }
-}
diff --git a/tests/Maths/ExpTests.cs b/tests/Maths/Maths/ExpTests.cs
similarity index 100%
rename from tests/Maths/ExpTests.cs
rename to tests/Maths/Maths/ExpTests.cs
diff --git a/tests/Maths/LogTests.cs b/tests/Maths/Maths/LogTests.cs
similarity index 100%
rename from tests/Maths/LogTests.cs
rename to tests/Maths/Maths/LogTests.cs
diff --git a/tests/Maths/MathHelper.cs b/tests/Maths/Maths/MathHelper.cs
similarity index 100%
rename from tests/Maths/MathHelper.cs
rename to tests/Maths/Maths/MathHelper.cs
diff --git a/tests/Maths/Matrix3x2Tests.cs b/tests/Maths/Maths/Matrix3x2Tests.cs
similarity index 100%
rename from tests/Maths/Matrix3x2Tests.cs
rename to tests/Maths/Maths/Matrix3x2Tests.cs
diff --git a/tests/Maths/Matrix4x4Tests.cs b/tests/Maths/Maths/Matrix4x4Tests.cs
similarity index 100%
rename from tests/Maths/Matrix4x4Tests.cs
rename to tests/Maths/Maths/Matrix4x4Tests.cs
diff --git a/tests/Maths/PlaneTests.cs b/tests/Maths/Maths/PlaneTests.cs
similarity index 100%
rename from tests/Maths/PlaneTests.cs
rename to tests/Maths/Maths/PlaneTests.cs
diff --git a/tests/Maths/PowIntTests.cs b/tests/Maths/Maths/PowIntTests.cs
similarity index 100%
rename from tests/Maths/PowIntTests.cs
rename to tests/Maths/Maths/PowIntTests.cs
diff --git a/tests/Maths/QuaternionTests.cs b/tests/Maths/Maths/QuaternionTests.cs
similarity index 100%
rename from tests/Maths/QuaternionTests.cs
rename to tests/Maths/Maths/QuaternionTests.cs
diff --git a/tests/Maths/Scalar.Bitwise.cs b/tests/Maths/Maths/Scalar.Bitwise.cs
similarity index 100%
rename from tests/Maths/Scalar.Bitwise.cs
rename to tests/Maths/Maths/Scalar.Bitwise.cs
diff --git a/tests/Maths/ScalarTests.cs b/tests/Maths/Maths/ScalarTests.cs
similarity index 100%
rename from tests/Maths/ScalarTests.cs
rename to tests/Maths/Maths/ScalarTests.cs
diff --git a/tests/Maths/Silk.NET.Maths.Tests.csproj b/tests/Maths/Maths/Silk.NET.Maths.Tests.csproj
similarity index 89%
rename from tests/Maths/Silk.NET.Maths.Tests.csproj
rename to tests/Maths/Maths/Silk.NET.Maths.Tests.csproj
index e6b57503b1..ff7c57320c 100644
--- a/tests/Maths/Silk.NET.Maths.Tests.csproj
+++ b/tests/Maths/Maths/Silk.NET.Maths.Tests.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\sources\Maths\Silk.NET.Maths.csproj" />
+      <ProjectReference Include="..\..\..\sources\Maths\Maths\Silk.NET.Maths.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/tests/Maths/Vector2Tests.cs b/tests/Maths/Maths/Vector2Tests.cs
similarity index 100%
rename from tests/Maths/Vector2Tests.cs
rename to tests/Maths/Maths/Vector2Tests.cs
diff --git a/tests/Maths/Vector3Tests.cs b/tests/Maths/Maths/Vector3Tests.cs
similarity index 100%
rename from tests/Maths/Vector3Tests.cs
rename to tests/Maths/Maths/Vector3Tests.cs
diff --git a/tests/Maths/Vector4Tests.cs b/tests/Maths/Maths/Vector4Tests.cs
similarity index 100%
rename from tests/Maths/Vector4Tests.cs
rename to tests/Maths/Maths/Vector4Tests.cs
diff --git a/tests/SDL/SDL3/SDL_AssertDataTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_AssertDataTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_AssertDataTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_AssertDataTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_AtomicIntTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_AtomicIntTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_AtomicIntTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_AtomicIntTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_AudioDeviceEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_AudioDeviceEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_AudioDeviceEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_AudioDeviceEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_AudioSpecTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_AudioSpecTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_AudioSpecTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_AudioSpecTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_CameraDeviceEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_CameraDeviceEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_CameraDeviceEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_CameraDeviceEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_CameraSpecTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_CameraSpecTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_CameraSpecTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_CameraSpecTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_ClipboardEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_ClipboardEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_ClipboardEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_ClipboardEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_ColorTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_ColorTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_ColorTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_ColorTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_CommonEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_CommonEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_CommonEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_CommonEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_DateTimeTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_DateTimeTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_DateTimeTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_DateTimeTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_DialogFileFilterTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_DialogFileFilterTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_DialogFileFilterTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_DialogFileFilterTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_DisplayEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_DisplayEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_DisplayEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_DisplayEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_DisplayModeTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_DisplayModeTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_DisplayModeTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_DisplayModeTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_DropEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_DropEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_DropEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_DropEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_EventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_EventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_EventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_EventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_FColorTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_FColorTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_FColorTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_FColorTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_FPointTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_FPointTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_FPointTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_FPointTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_FRectTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_FRectTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_FRectTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_FRectTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_FingerTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_FingerTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_FingerTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_FingerTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_GUIDTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_GUIDTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_GUIDTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_GUIDTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_GamepadAxisEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_GamepadAxisEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_GamepadAxisEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_GamepadAxisEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_GamepadBindingTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_GamepadBindingTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_GamepadBindingTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_GamepadBindingTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_GamepadButtonEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_GamepadButtonEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_GamepadButtonEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_GamepadButtonEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_GamepadDeviceEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_GamepadDeviceEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_GamepadDeviceEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_GamepadDeviceEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_GamepadSensorEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_GamepadSensorEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_GamepadSensorEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_GamepadSensorEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_GamepadTouchpadEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_GamepadTouchpadEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_GamepadTouchpadEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_GamepadTouchpadEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_HapticConditionTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_HapticConditionTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_HapticConditionTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_HapticConditionTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_HapticConstantTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_HapticConstantTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_HapticConstantTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_HapticConstantTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_HapticCustomTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_HapticCustomTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_HapticCustomTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_HapticCustomTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_HapticDirectionTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_HapticDirectionTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_HapticDirectionTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_HapticDirectionTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_HapticEffectTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_HapticEffectTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_HapticEffectTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_HapticEffectTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_HapticLeftRightTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_HapticLeftRightTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_HapticLeftRightTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_HapticLeftRightTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_HapticPeriodicTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_HapticPeriodicTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_HapticPeriodicTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_HapticPeriodicTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_HapticRampTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_HapticRampTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_HapticRampTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_HapticRampTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_IOStreamInterfaceTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_IOStreamInterfaceTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_IOStreamInterfaceTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_IOStreamInterfaceTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_JoyAxisEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_JoyAxisEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_JoyAxisEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_JoyAxisEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_JoyBallEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_JoyBallEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_JoyBallEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_JoyBallEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_JoyBatteryEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_JoyBatteryEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_JoyBatteryEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_JoyBatteryEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_JoyButtonEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_JoyButtonEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_JoyButtonEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_JoyButtonEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_JoyDeviceEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_JoyDeviceEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_JoyDeviceEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_JoyDeviceEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_JoyHatEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_JoyHatEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_JoyHatEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_JoyHatEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_KeyboardDeviceEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_KeyboardDeviceEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_KeyboardDeviceEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_KeyboardDeviceEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_KeyboardEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_KeyboardEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_KeyboardEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_KeyboardEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_KeysymTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_KeysymTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_KeysymTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_KeysymTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_LocaleTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_LocaleTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_LocaleTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_LocaleTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_MessageBoxButtonDataTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_MessageBoxButtonDataTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_MessageBoxButtonDataTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_MessageBoxButtonDataTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_MessageBoxColorSchemeTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_MessageBoxColorSchemeTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_MessageBoxColorSchemeTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_MessageBoxColorSchemeTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_MessageBoxColorTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_MessageBoxColorTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_MessageBoxColorTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_MessageBoxColorTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_MessageBoxDataTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_MessageBoxDataTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_MessageBoxDataTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_MessageBoxDataTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_MouseButtonEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_MouseButtonEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_MouseButtonEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_MouseButtonEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_MouseDeviceEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_MouseDeviceEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_MouseDeviceEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_MouseDeviceEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_MouseMotionEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_MouseMotionEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_MouseMotionEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_MouseMotionEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_MouseWheelEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_MouseWheelEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_MouseWheelEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_MouseWheelEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_PaletteTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_PaletteTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_PaletteTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_PaletteTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_PathInfoTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_PathInfoTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_PathInfoTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_PathInfoTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_PenButtonEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_PenButtonEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_PenButtonEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_PenButtonEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_PenCapabilityInfoTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_PenCapabilityInfoTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_PenCapabilityInfoTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_PenCapabilityInfoTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_PenMotionEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_PenMotionEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_PenMotionEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_PenMotionEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_PenTipEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_PenTipEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_PenTipEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_PenTipEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_PixelFormatTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_PixelFormatTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_PixelFormatTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_PixelFormatTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_PointTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_PointTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_PointTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_PointTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_QuitEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_QuitEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_QuitEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_QuitEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_RectTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_RectTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_RectTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_RectTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_RendererInfoTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_RendererInfoTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_RendererInfoTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_RendererInfoTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_SensorEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_SensorEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_SensorEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_SensorEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_StorageInterfaceTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_StorageInterfaceTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_StorageInterfaceTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_StorageInterfaceTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_SurfaceTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_SurfaceTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_SurfaceTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_SurfaceTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_TextEditingEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_TextEditingEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_TextEditingEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_TextEditingEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_TextInputEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_TextInputEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_TextInputEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_TextInputEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_TouchFingerEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_TouchFingerEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_TouchFingerEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_TouchFingerEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_UserEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_UserEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_UserEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_UserEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_VersionTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_VersionTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_VersionTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_VersionTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_VertexTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_VertexTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_VertexTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_VertexTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_VirtualJoystickDescTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_VirtualJoystickDescTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_VirtualJoystickDescTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_VirtualJoystickDescTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_WindowEventTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_WindowEventTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_WindowEventTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_WindowEventTests.gen.cs
diff --git a/tests/SDL/SDL3/SDL_hid_device_infoTests.gen.cs b/tests/SDL/SDL/SDL3/SDL_hid_device_infoTests.gen.cs
similarity index 100%
rename from tests/SDL/SDL3/SDL_hid_device_infoTests.gen.cs
rename to tests/SDL/SDL/SDL3/SDL_hid_device_infoTests.gen.cs
diff --git a/tests/SDL/Silk.NET.SDL.UnitTests.csproj b/tests/SDL/SDL/Silk.NET.SDL.UnitTests.csproj
similarity index 86%
rename from tests/SDL/Silk.NET.SDL.UnitTests.csproj
rename to tests/SDL/SDL/Silk.NET.SDL.UnitTests.csproj
index 0a13b7ce40..bc3d14976c 100644
--- a/tests/SDL/Silk.NET.SDL.UnitTests.csproj
+++ b/tests/SDL/SDL/Silk.NET.SDL.UnitTests.csproj
@@ -21,11 +21,11 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\sources\SDL\Silk.NET.SDL.csproj" />
+      <ProjectReference Include="..\..\..\sources\SDL\SDL\Silk.NET.SDL.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-      <Compile Include="..\..\sources\Core\Silk.NET.Core.cs">
+      <Compile Include="..\..\..\sources\Core\Core\Silk.NET.Core.cs">
         <Link>Silk.NET.Core.cs</Link>
       </Compile>
     </ItemGroup>
diff --git a/tests/SilkTouch/ArrayParameterTransformerTests.cs b/tests/SilkTouch/SilkTouch/ArrayParameterTransformerTests.cs
similarity index 100%
rename from tests/SilkTouch/ArrayParameterTransformerTests.cs
rename to tests/SilkTouch/SilkTouch/ArrayParameterTransformerTests.cs
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.cl.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.cl.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.cl.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.cl.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.gl.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.gl.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.gl.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.gl.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.glx.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.glx.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.glx.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.glx.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.vk.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.vk.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.vk.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.vk.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.wgl.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.wgl.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.wgl.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.ApiSets.wgl.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.EnumGroupRegression.cl.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumGroupRegression.cl.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.EnumGroupRegression.cl.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumGroupRegression.cl.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.EnumGroupRegression.gl.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumGroupRegression.gl.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.EnumGroupRegression.gl.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumGroupRegression.gl.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.cl.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.cl.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.cl.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.cl.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.gl.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.gl.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.gl.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.gl.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.glx.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.glx.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.glx.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.glx.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.wgl.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.wgl.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.wgl.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumsToGroups.wgl.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.cl.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.cl.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.cl.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.cl.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.gl.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.gl.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.gl.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.gl.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.glx.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.glx.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.glx.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.glx.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.vk.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.vk.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.vk.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.vk.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.wgl.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.wgl.xml.verified.txt
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.wgl.xml.verified.txt
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.SupportedApiProfiles.wgl.xml.verified.txt
diff --git a/tests/SilkTouch/Khronos/MixKhronosDataTests.cs b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.cs
similarity index 100%
rename from tests/SilkTouch/Khronos/MixKhronosDataTests.cs
rename to tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.cs
diff --git a/tests/SilkTouch/Khronos/testcl.xml b/tests/SilkTouch/SilkTouch/Khronos/testcl.xml
similarity index 100%
rename from tests/SilkTouch/Khronos/testcl.xml
rename to tests/SilkTouch/SilkTouch/Khronos/testcl.xml
diff --git a/tests/SilkTouch/Khronos/testgl.xml b/tests/SilkTouch/SilkTouch/Khronos/testgl.xml
similarity index 100%
rename from tests/SilkTouch/Khronos/testgl.xml
rename to tests/SilkTouch/SilkTouch/Khronos/testgl.xml
diff --git a/tests/SilkTouch/Khronos/testglx.xml b/tests/SilkTouch/SilkTouch/Khronos/testglx.xml
similarity index 100%
rename from tests/SilkTouch/Khronos/testglx.xml
rename to tests/SilkTouch/SilkTouch/Khronos/testglx.xml
diff --git a/tests/SilkTouch/Khronos/testregression.2.21.cl.json.gz b/tests/SilkTouch/SilkTouch/Khronos/testregression.2.21.cl.json.gz
similarity index 100%
rename from tests/SilkTouch/Khronos/testregression.2.21.cl.json.gz
rename to tests/SilkTouch/SilkTouch/Khronos/testregression.2.21.cl.json.gz
diff --git a/tests/SilkTouch/Khronos/testregression.2.21.gl.json.gz b/tests/SilkTouch/SilkTouch/Khronos/testregression.2.21.gl.json.gz
similarity index 100%
rename from tests/SilkTouch/Khronos/testregression.2.21.gl.json.gz
rename to tests/SilkTouch/SilkTouch/Khronos/testregression.2.21.gl.json.gz
diff --git a/tests/SilkTouch/Khronos/testregression.2.21.glcore.json.gz b/tests/SilkTouch/SilkTouch/Khronos/testregression.2.21.glcore.json.gz
similarity index 100%
rename from tests/SilkTouch/Khronos/testregression.2.21.glcore.json.gz
rename to tests/SilkTouch/SilkTouch/Khronos/testregression.2.21.glcore.json.gz
diff --git a/tests/SilkTouch/Khronos/testregression.2.21.gles2.json.gz b/tests/SilkTouch/SilkTouch/Khronos/testregression.2.21.gles2.json.gz
similarity index 100%
rename from tests/SilkTouch/Khronos/testregression.2.21.gles2.json.gz
rename to tests/SilkTouch/SilkTouch/Khronos/testregression.2.21.gles2.json.gz
diff --git a/tests/SilkTouch/Khronos/testvk.xml b/tests/SilkTouch/SilkTouch/Khronos/testvk.xml
similarity index 100%
rename from tests/SilkTouch/Khronos/testvk.xml
rename to tests/SilkTouch/SilkTouch/Khronos/testvk.xml
diff --git a/tests/SilkTouch/Khronos/testwgl.xml b/tests/SilkTouch/SilkTouch/Khronos/testwgl.xml
similarity index 100%
rename from tests/SilkTouch/Khronos/testwgl.xml
rename to tests/SilkTouch/SilkTouch/Khronos/testwgl.xml
diff --git a/tests/SilkTouch/MetadataUtilsTests.cs b/tests/SilkTouch/SilkTouch/MetadataUtilsTests.cs
similarity index 100%
rename from tests/SilkTouch/MetadataUtilsTests.cs
rename to tests/SilkTouch/SilkTouch/MetadataUtilsTests.cs
diff --git a/tests/SilkTouch/ModUtilsTests.cs b/tests/SilkTouch/SilkTouch/ModUtilsTests.cs
similarity index 100%
rename from tests/SilkTouch/ModUtilsTests.cs
rename to tests/SilkTouch/SilkTouch/ModUtilsTests.cs
diff --git a/tests/SilkTouch/Naming/NameTests.cs b/tests/SilkTouch/SilkTouch/Naming/NameTests.cs
similarity index 100%
rename from tests/SilkTouch/Naming/NameTests.cs
rename to tests/SilkTouch/SilkTouch/Naming/NameTests.cs
diff --git a/tests/SilkTouch/Silk.NET.SilkTouch.UnitTests.csproj b/tests/SilkTouch/SilkTouch/Silk.NET.SilkTouch.UnitTests.csproj
similarity index 87%
rename from tests/SilkTouch/Silk.NET.SilkTouch.UnitTests.csproj
rename to tests/SilkTouch/SilkTouch/Silk.NET.SilkTouch.UnitTests.csproj
index b4672190e5..6ba0b8ffbe 100644
--- a/tests/SilkTouch/Silk.NET.SilkTouch.UnitTests.csproj
+++ b/tests/SilkTouch/SilkTouch/Silk.NET.SilkTouch.UnitTests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\sources\SilkTouch\Silk.NET.SilkTouch.csproj" />
+    <ProjectReference Include="..\..\..\sources\SilkTouch\SilkTouch\Silk.NET.SilkTouch.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Windows/DirectX/headers/d3d12/CLSIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/CLSIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/CLSIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/CLSIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODE1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODE1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODE1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODE1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_AUTO_BREADCRUMB_NODETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_BARRIER_GROUPTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_GROUPTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_BARRIER_GROUPTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_GROUPTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_BARRIER_SUBRESOURCE_RANGETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_SUBRESOURCE_RANGETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_BARRIER_SUBRESOURCE_RANGETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BARRIER_SUBRESOURCE_RANGETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_BLEND_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BLEND_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_BLEND_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BLEND_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_BOXTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BOXTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_BOXTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BOXTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_BUFFER_BARRIERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_BARRIERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_BUFFER_BARRIERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_BARRIERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_BUFFER_RTVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_RTVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_BUFFER_RTVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_RTVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_BUFFER_SRVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_SRVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_BUFFER_SRVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_SRVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_BUFFER_UAVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_UAVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_BUFFER_UAVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUFFER_UAVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_TOOLS_VISUALIZATION_HEADERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_TOOLS_VISUALIZATION_HEADERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_TOOLS_VISUALIZATION_HEADERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_TOOLS_VISUALIZATION_HEADERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_CACHED_PIPELINE_STATETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_CACHED_PIPELINE_STATETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_CACHED_PIPELINE_STATETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_CACHED_PIPELINE_STATETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_CLEAR_VALUETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_CLEAR_VALUETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_CLEAR_VALUETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_CLEAR_VALUETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_QUEUE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_COMMAND_SIGNATURE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_SIGNATURE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_COMMAND_SIGNATURE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_COMMAND_SIGNATURE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_COMPUTE_PIPELINE_STATE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_COMPUTE_PIPELINE_STATE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_COMPUTE_PIPELINE_STATE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_COMPUTE_PIPELINE_STATE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_CONSTANT_BUFFER_VIEW_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_CONSTANT_BUFFER_VIEW_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_CONSTANT_BUFFER_VIEW_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_CONSTANT_BUFFER_VIEW_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_CPU_DESCRIPTOR_HANDLETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_CPU_DESCRIPTOR_HANDLETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_CPU_DESCRIPTOR_HANDLETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_CPU_DESCRIPTOR_HANDLETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESC1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESC1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESC1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESC1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCILOP_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESC2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VALUETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VALUETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VALUETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VALUETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VIEW_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VIEW_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VIEW_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEPTH_STENCIL_VIEW_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_HEAP_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGE1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DESCRIPTOR_RANGETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DEVICE_CONFIGURATION_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_CONFIGURATION_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DEVICE_CONFIGURATION_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_CONFIGURATION_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA3Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA3Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA3Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATA3Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATATests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATATests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATATests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DEVICE_REMOVED_EXTENDED_DATATests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DISCARD_REGIONTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DISCARD_REGIONTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DISCARD_REGIONTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DISCARD_REGIONTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DISPATCH_ARGUMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DISPATCH_ARGUMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DISPATCH_ARGUMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DISPATCH_ARGUMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DISPATCH_MESH_ARGUMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DISPATCH_MESH_ARGUMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DISPATCH_MESH_ARGUMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DISPATCH_MESH_ARGUMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DISPATCH_RAYS_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DISPATCH_RAYS_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DISPATCH_RAYS_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DISPATCH_RAYS_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DRAW_ARGUMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRAW_ARGUMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DRAW_ARGUMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRAW_ARGUMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DRAW_INDEXED_ARGUMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRAW_INDEXED_ARGUMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DRAW_INDEXED_ARGUMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRAW_INDEXED_ARGUMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODE1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODE1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODE1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODE1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_ALLOCATION_NODETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUT1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUT1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUT1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUT1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_AUTO_BREADCRUMBS_OUTPUTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DRED_BREADCRUMB_CONTEXTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_BREADCRUMB_CONTEXTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DRED_BREADCRUMB_CONTEXTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_BREADCRUMB_CONTEXTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUT2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DRED_PAGE_FAULT_OUTPUTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DXIL_LIBRARY_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DXIL_LIBRARY_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DXIL_LIBRARY_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DXIL_LIBRARY_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATIONTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATIONTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATIONTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATIONTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_EXISTING_COLLECTION_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_EXISTING_COLLECTION_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_EXISTING_COLLECTION_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_EXISTING_COLLECTION_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_EXPORT_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_EXPORT_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_EXPORT_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_EXPORT_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURE1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURE1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURE1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURE1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ARCHITECTURETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITYTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITYTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITYTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITYTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_CROSS_NODETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_CROSS_NODETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_CROSS_NODETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_CROSS_NODETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS10Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS10Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS10Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS10Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS11Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS11Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS11Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS11Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS12Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS12Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS12Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS12Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS13Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS13Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS13Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS13Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS14Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS14Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS14Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS14Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS15Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS15Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS15Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS15Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS3Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS3Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS3Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS3Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS4Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS4Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS4Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS4Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS5Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS5Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS5Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS5Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS6Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS6Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS6Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS6Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS7Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS7Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS7Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS7Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS8Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS8Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS8Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS8Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS9Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS9Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS9Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONS9Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_D3D12_OPTIONSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_DISPLAYABLETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_DISPLAYABLETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_DISPLAYABLETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_DISPLAYABLETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_EXISTING_HEAPSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_EXISTING_HEAPSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_EXISTING_HEAPSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_EXISTING_HEAPSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FEATURE_LEVELSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FEATURE_LEVELSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FEATURE_LEVELSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FEATURE_LEVELSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_INFOTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_INFOTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_INFOTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_FORMAT_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPESTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPESTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPESTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPESTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPE_COUNTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPE_COUNTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPE_COUNTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPE_COUNTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_QUERY_META_COMMANDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_QUERY_META_COMMANDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_QUERY_META_COMMANDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_QUERY_META_COMMANDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ROOT_SIGNATURETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ROOT_SIGNATURETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ROOT_SIGNATURETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_ROOT_SIGNATURETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SERIALIZATIONTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SERIALIZATIONTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SERIALIZATIONTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SERIALIZATIONTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_CACHETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_CACHETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_CACHETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_CACHETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_MODELTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_MODELTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_MODELTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_FEATURE_DATA_SHADER_MODELTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_GLOBAL_BARRIERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GLOBAL_BARRIERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_GLOBAL_BARRIERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GLOBAL_BARRIERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_GLOBAL_ROOT_SIGNATURETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GLOBAL_ROOT_SIGNATURETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_GLOBAL_ROOT_SIGNATURETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GLOBAL_ROOT_SIGNATURETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_GPU_DESCRIPTOR_HANDLETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_DESCRIPTOR_HANDLETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_GPU_DESCRIPTOR_HANDLETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_DESCRIPTOR_HANDLETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_AND_STRIDETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_AND_STRIDETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_AND_STRIDETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_AND_STRIDETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGE_AND_STRIDETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGE_AND_STRIDETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGE_AND_STRIDETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GPU_VIRTUAL_ADDRESS_RANGE_AND_STRIDETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_GRAPHICS_PIPELINE_STATE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GRAPHICS_PIPELINE_STATE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_GRAPHICS_PIPELINE_STATE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_GRAPHICS_PIPELINE_STATE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_HEAP_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_HEAP_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_HEAP_PROPERTIESTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_PROPERTIESTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_HEAP_PROPERTIESTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_HEAP_PROPERTIESTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_HIT_GROUP_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_HIT_GROUP_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_HIT_GROUP_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_HIT_GROUP_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_INDEX_BUFFER_VIEWTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_INDEX_BUFFER_VIEWTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_INDEX_BUFFER_VIEWTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_INDEX_BUFFER_VIEWTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_INDIRECT_ARGUMENT_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_INDIRECT_ARGUMENT_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_INDIRECT_ARGUMENT_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_INDIRECT_ARGUMENT_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_INPUT_ELEMENT_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_INPUT_ELEMENT_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_INPUT_ELEMENT_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_INPUT_ELEMENT_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_INPUT_LAYOUT_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_INPUT_LAYOUT_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_INPUT_LAYOUT_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_INPUT_LAYOUT_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_LOCAL_ROOT_SIGNATURETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_LOCAL_ROOT_SIGNATURETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_LOCAL_ROOT_SIGNATURETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_LOCAL_ROOT_SIGNATURETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_MEMCPY_DESTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_MEMCPY_DESTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_MEMCPY_DESTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_MEMCPY_DESTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_META_COMMAND_PARAMETER_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_MIP_REGIONTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_MIP_REGIONTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_MIP_REGIONTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_MIP_REGIONTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_NODE_MASKTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_NODE_MASKTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_NODE_MASKTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_NODE_MASKTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_PACKED_MIP_INFOTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_PACKED_MIP_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_PACKED_MIP_INFOTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_PACKED_MIP_INFOTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_STREAM_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_STREAM_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_STREAM_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_PIPELINE_STATE_STREAM_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_PLACED_SUBRESOURCE_FOOTPRINTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_PLACED_SUBRESOURCE_FOOTPRINTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_PLACED_SUBRESOURCE_FOOTPRINTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_PLACED_SUBRESOURCE_FOOTPRINTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESC1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESC1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESC1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESC1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_PROTECTED_RESOURCE_SESSION_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICS1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICS1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICS1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICS1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_DATA_PIPELINE_STATISTICSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_QUERY_DATA_SO_STATISTICSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_DATA_SO_STATISTICSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_QUERY_DATA_SO_STATISTICSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_DATA_SO_STATISTICSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_QUERY_HEAP_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_HEAP_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_QUERY_HEAP_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_QUERY_HEAP_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RANGETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RANGETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RANGETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RANGETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RANGE_UINT64Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RANGE_UINT64Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RANGE_UINT64Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RANGE_UINT64Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RASTERIZER_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RASTERIZER_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RASTERIZER_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RASTERIZER_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_AABBTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_AABBTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_AABBTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_AABBTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_COMPACTED_SIZE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_COMPACTED_SIZE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_COMPACTED_SIZE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_COMPACTED_SIZE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_CURRENT_SIZE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_CURRENT_SIZE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_CURRENT_SIZE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_CURRENT_SIZE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_SERIALIZATION_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_SERIALIZATION_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_SERIALIZATION_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_SERIALIZATION_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_TOOLS_VISUALIZATION_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_TOOLS_VISUALIZATION_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_TOOLS_VISUALIZATION_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_POSTBUILD_INFO_TOOLS_VISUALIZATION_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_PREBUILD_INFOTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_PREBUILD_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_PREBUILD_INFOTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_PREBUILD_INFOTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_SRVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_SRVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_SRVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_ACCELERATION_STRUCTURE_SRVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_AABBS_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_AABBS_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_AABBS_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_AABBS_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_TRIANGLES_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_TRIANGLES_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_TRIANGLES_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_GEOMETRY_TRIANGLES_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_INSTANCE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_INSTANCE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_INSTANCE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_INSTANCE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIG1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIG1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIG1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIG1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIGTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIGTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIGTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_PIPELINE_CONFIGTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_SHADER_CONFIGTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_SHADER_CONFIGTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RAYTRACING_SHADER_CONFIGTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RAYTRACING_SHADER_CONFIGTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS_CLEAR_PARAMETERSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS_CLEAR_PARAMETERSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS_CLEAR_PARAMETERSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_BEGINNING_ACCESS_CLEAR_PARAMETERSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_DEPTH_STENCIL_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_DEPTH_STENCIL_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_DEPTH_STENCIL_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_DEPTH_STENCIL_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_PARAMETERSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_PARAMETERSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_PARAMETERSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_PARAMETERSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_SUBRESOURCE_PARAMETERSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_SUBRESOURCE_PARAMETERSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_SUBRESOURCE_PARAMETERSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_SUBRESOURCE_PARAMETERSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_RENDER_TARGET_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_RENDER_TARGET_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_PASS_RENDER_TARGET_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_PASS_RENDER_TARGET_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_TARGET_BLEND_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_TARGET_BLEND_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_TARGET_BLEND_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_TARGET_BLEND_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_TARGET_VIEW_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_TARGET_VIEW_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RENDER_TARGET_VIEW_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RENDER_TARGET_VIEW_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_ALIASING_BARRIERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_ALIASING_BARRIERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_ALIASING_BARRIERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_ALIASING_BARRIERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFO1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFO1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFO1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFO1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFOTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFOTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_ALLOCATION_INFOTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_BARRIERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_DESC1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_DESC1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_DESC1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_DESC1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_TRANSITION_BARRIERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_TRANSITION_BARRIERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_TRANSITION_BARRIERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_TRANSITION_BARRIERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_UAV_BARRIERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_UAV_BARRIERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RESOURCE_UAV_BARRIERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RESOURCE_UAV_BARRIERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_CONSTANTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_CONSTANTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_CONSTANTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_CONSTANTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTORTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTORTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTORTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTORTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLE1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLE1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLE1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLE1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_DESCRIPTOR_TABLETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_PARAMETER1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_PARAMETERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_PARAMETERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_PARAMETERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_PARAMETERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESC1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESC1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESC1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESC1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_ROOT_SIGNATURE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_RT_FORMAT_ARRAYTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RT_FORMAT_ARRAYTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_RT_FORMAT_ARRAYTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_RT_FORMAT_ARRAYTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SAMPLER_DESC2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLER_DESC2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SAMPLER_DESC2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLER_DESC2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SAMPLER_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLER_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SAMPLER_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLER_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SAMPLE_POSITIONTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLE_POSITIONTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SAMPLE_POSITIONTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SAMPLE_POSITIONTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SERIALIZED_RAYTRACING_ACCELERATION_STRUCTURE_HEADERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SERIALIZED_RAYTRACING_ACCELERATION_STRUCTURE_HEADERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SERIALIZED_RAYTRACING_ACCELERATION_STRUCTURE_HEADERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SERIALIZED_RAYTRACING_ACCELERATION_STRUCTURE_HEADERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SHADER_BYTECODETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_BYTECODETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SHADER_BYTECODETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_BYTECODETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_SESSION_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_SESSION_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SHADER_CACHE_SESSION_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_CACHE_SESSION_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SHADER_RESOURCE_VIEW_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_RESOURCE_VIEW_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SHADER_RESOURCE_VIEW_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SHADER_RESOURCE_VIEW_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SO_DECLARATION_ENTRYTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SO_DECLARATION_ENTRYTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SO_DECLARATION_ENTRYTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SO_DECLARATION_ENTRYTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_STATE_OBJECT_CONFIGTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_OBJECT_CONFIGTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_STATE_OBJECT_CONFIGTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_OBJECT_CONFIGTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_STATE_OBJECT_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_OBJECT_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_STATE_OBJECT_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_OBJECT_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_STATE_SUBOBJECTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_SUBOBJECTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_STATE_SUBOBJECTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_STATE_SUBOBJECTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_STATIC_SAMPLER_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_STATIC_SAMPLER_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_STATIC_SAMPLER_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_STATIC_SAMPLER_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_BUFFER_VIEWTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_BUFFER_VIEWTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_BUFFER_VIEWTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_BUFFER_VIEWTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_STREAM_OUTPUT_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SUBOBJECT_TO_EXPORTS_ASSOCIATIONTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBOBJECT_TO_EXPORTS_ASSOCIATIONTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SUBOBJECT_TO_EXPORTS_ASSOCIATIONTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBOBJECT_TO_EXPORTS_ASSOCIATIONTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_DATATests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_DATATests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_DATATests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_DATATests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_FOOTPRINTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_FOOTPRINTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_FOOTPRINTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_FOOTPRINTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_INFOTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_INFOTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_INFOTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_RANGE_UINT64Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_RANGE_UINT64Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_RANGE_UINT64Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_RANGE_UINT64Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_TILINGTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_TILINGTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_SUBRESOURCE_TILINGTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_SUBRESOURCE_TILINGTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_DSVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_DSVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_DSVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_DSVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_RTVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_RTVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_RTVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_RTVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_SRVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_SRVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_SRVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_SRVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_UAVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_UAVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_UAVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_ARRAY_UAVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_DSVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_DSVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_DSVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_DSVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_RTVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_RTVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_RTVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_RTVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_SRVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_SRVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_SRVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_SRVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_UAVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_UAVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX1D_UAVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX1D_UAVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_DSVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_DSVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_DSVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_DSVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_RTVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_RTVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_RTVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_RTVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_SRVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_SRVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_SRVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_SRVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_UAVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_UAVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_UAVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_ARRAY_UAVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_DSVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_DSVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_DSVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_DSVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_RTVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_RTVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_RTVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_RTVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_SRVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_SRVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_SRVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_SRVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_UAVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_UAVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2DMS_UAVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2DMS_UAVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_DSVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_DSVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_DSVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_DSVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_RTVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_RTVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_RTVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_RTVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_SRVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_SRVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_SRVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_SRVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_UAVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_UAVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_UAVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_ARRAY_UAVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_DSVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_DSVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_DSVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_DSVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_RTVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_RTVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_RTVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_RTVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_SRVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_SRVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_SRVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_SRVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_UAVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_UAVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX2D_UAVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX2D_UAVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX3D_RTVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX3D_RTVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX3D_RTVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX3D_RTVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX3D_SRVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX3D_SRVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX3D_SRVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX3D_SRVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEX3D_UAVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX3D_UAVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEX3D_UAVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEX3D_UAVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEXCUBE_ARRAY_SRVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXCUBE_ARRAY_SRVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEXCUBE_ARRAY_SRVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXCUBE_ARRAY_SRVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEXCUBE_SRVTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXCUBE_SRVTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEXCUBE_SRVTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXCUBE_SRVTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_BARRIERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_BARRIERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_BARRIERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_BARRIERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_COPY_LOCATIONTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_COPY_LOCATIONTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TEXTURE_COPY_LOCATIONTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TEXTURE_COPY_LOCATIONTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TILED_RESOURCE_COORDINATETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TILED_RESOURCE_COORDINATETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TILED_RESOURCE_COORDINATETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TILED_RESOURCE_COORDINATETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TILE_REGION_SIZETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_REGION_SIZETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TILE_REGION_SIZETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_REGION_SIZETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_TILE_SHAPETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_SHAPETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_TILE_SHAPETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_TILE_SHAPETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_UNORDERED_ACCESS_VIEW_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_UNORDERED_ACCESS_VIEW_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_UNORDERED_ACCESS_VIEW_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_UNORDERED_ACCESS_VIEW_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATATests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATATests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATATests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATATests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_VERSIONED_ROOT_SIGNATURE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_VERSIONED_ROOT_SIGNATURE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_VERSIONED_ROOT_SIGNATURE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_VERSIONED_ROOT_SIGNATURE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_VERTEX_BUFFER_VIEWTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_VERTEX_BUFFER_VIEWTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_VERTEX_BUFFER_VIEWTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_VERTEX_BUFFER_VIEWTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_VIEWPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEWPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_VIEWPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEWPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_VIEW_INSTANCE_LOCATIONTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEW_INSTANCE_LOCATIONTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_VIEW_INSTANCE_LOCATIONTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEW_INSTANCE_LOCATIONTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_VIEW_INSTANCING_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/D3D12_WRITEBUFFERIMMEDIATE_PARAMETERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/D3D12_WRITEBUFFERIMMEDIATE_PARAMETERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/D3D12_WRITEBUFFERIMMEDIATE_PARAMETERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/D3D12_WRITEBUFFERIMMEDIATE_PARAMETERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/DirectXTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/DirectXTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/DirectXTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/DirectXTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12CommandAllocatorTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandAllocatorTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12CommandAllocatorTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandAllocatorTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12CommandListTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandListTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12CommandListTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandListTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12CommandQueueTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandQueueTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12CommandQueueTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandQueueTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12CommandSignatureTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandSignatureTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12CommandSignatureTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12CommandSignatureTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12DescriptorHeapTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DescriptorHeapTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12DescriptorHeapTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DescriptorHeapTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Device10Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device10Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Device10Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device10Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Device11Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device11Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Device11Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device11Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Device1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Device1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Device2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Device2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Device3Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device3Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Device3Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device3Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Device4Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device4Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Device4Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device4Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Device5Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device5Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Device5Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device5Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Device6Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device6Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Device6Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device6Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Device7Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device7Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Device7Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device7Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Device8Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device8Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Device8Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device8Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Device9Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device9Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Device9Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Device9Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12DeviceChildTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceChildTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12DeviceChildTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceChildTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12DeviceConfigurationTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceConfigurationTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12DeviceConfigurationTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceConfigurationTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12DeviceFactoryTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceFactoryTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12DeviceFactoryTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceFactoryTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedData2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettings2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettingsTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettingsTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettingsTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataSettingsTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceRemovedExtendedDataTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12DeviceTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12DeviceTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12DeviceTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Fence1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Fence1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Fence1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Fence1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12FenceTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12FenceTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12FenceTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12FenceTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList3Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList3Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList3Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList3Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList4Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList4Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList4Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList4Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList5Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList5Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList5Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList5Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList6Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList6Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList6Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList6Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList7Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList7Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList7Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList7Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList8Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList8Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandList8Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandList8Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandListTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandListTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12GraphicsCommandListTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12GraphicsCommandListTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Heap1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Heap1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Heap1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Heap1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12HeapTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12HeapTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12HeapTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12HeapTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12LifetimeOwnerTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12LifetimeOwnerTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12LifetimeOwnerTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12LifetimeOwnerTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12LifetimeTrackerTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12LifetimeTrackerTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12LifetimeTrackerTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12LifetimeTrackerTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12MetaCommandTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12MetaCommandTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12MetaCommandTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12MetaCommandTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12ObjectTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ObjectTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12ObjectTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ObjectTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12PageableTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12PageableTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12PageableTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12PageableTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12PipelineLibrary1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12PipelineLibrary1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12PipelineLibrary1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12PipelineLibrary1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12PipelineLibraryTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12PipelineLibraryTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12PipelineLibraryTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12PipelineLibraryTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12PipelineStateTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12PipelineStateTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12PipelineStateTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12PipelineStateTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12ProtectedResourceSession1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ProtectedResourceSession1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12ProtectedResourceSession1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ProtectedResourceSession1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12ProtectedResourceSessionTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ProtectedResourceSessionTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12ProtectedResourceSessionTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ProtectedResourceSessionTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12ProtectedSessionTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ProtectedSessionTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12ProtectedSessionTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ProtectedSessionTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12QueryHeapTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12QueryHeapTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12QueryHeapTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12QueryHeapTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Resource1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Resource1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Resource1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Resource1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12Resource2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Resource2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12Resource2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12Resource2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12ResourceTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ResourceTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12ResourceTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ResourceTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12RootSignatureDeserializerTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12RootSignatureDeserializerTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12RootSignatureDeserializerTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12RootSignatureDeserializerTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12RootSignatureTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12RootSignatureTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12RootSignatureTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12RootSignatureTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12SDKConfiguration1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12SDKConfiguration1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12SDKConfiguration1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12SDKConfiguration1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12SDKConfigurationTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12SDKConfigurationTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12SDKConfigurationTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12SDKConfigurationTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12ShaderCacheSessionTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ShaderCacheSessionTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12ShaderCacheSessionTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ShaderCacheSessionTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12StateObjectPropertiesTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12StateObjectPropertiesTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12StateObjectPropertiesTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12StateObjectPropertiesTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12StateObjectTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12StateObjectTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12StateObjectTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12StateObjectTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12SwapChainAssistantTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12SwapChainAssistantTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12SwapChainAssistantTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12SwapChainAssistantTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12ToolsTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ToolsTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12ToolsTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12ToolsTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12VersionedRootSignatureDeserializerTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12VersionedRootSignatureDeserializerTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12VersionedRootSignatureDeserializerTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12VersionedRootSignatureDeserializerTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/ID3D12VirtualizationGuestDeviceTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/ID3D12VirtualizationGuestDeviceTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/ID3D12VirtualizationGuestDeviceTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/ID3D12VirtualizationGuestDeviceTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12/IIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12/IIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12/IIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12/IIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12compatibility/D3D11On12CreatorIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12compatibility/D3D11On12CreatorIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12compatibility/D3D11On12CreatorIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12compatibility/D3D11On12CreatorIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12compatibility/D3D9On12CreatorIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12compatibility/D3D9On12CreatorIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12compatibility/D3D9On12CreatorIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12compatibility/D3D9On12CreatorIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12compatibility/DirectMLPyTorchCreatorIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12compatibility/DirectMLPyTorchCreatorIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12compatibility/DirectMLPyTorchCreatorIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12compatibility/DirectMLPyTorchCreatorIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12compatibility/DirectMLTensorFlowCreatorIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12compatibility/DirectMLTensorFlowCreatorIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12compatibility/DirectMLTensorFlowCreatorIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12compatibility/DirectMLTensorFlowCreatorIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12compatibility/ID3D12CompatibilityDeviceTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12compatibility/ID3D12CompatibilityDeviceTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12compatibility/ID3D12CompatibilityDeviceTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12compatibility/ID3D12CompatibilityDeviceTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12compatibility/IIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12compatibility/IIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12compatibility/IIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12compatibility/IIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12compatibility/OpenCLOn12CreatorIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12compatibility/OpenCLOn12CreatorIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12compatibility/OpenCLOn12CreatorIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12compatibility/OpenCLOn12CreatorIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12compatibility/OpenGLOn12CreatorIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12compatibility/OpenGLOn12CreatorIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12compatibility/OpenGLOn12CreatorIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12compatibility/OpenGLOn12CreatorIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_COMMAND_LIST_GPU_BASED_VALIDATION_SETTINGSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_COMMAND_LIST_GPU_BASED_VALIDATION_SETTINGSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_COMMAND_LIST_GPU_BASED_VALIDATION_SETTINGSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_COMMAND_LIST_GPU_BASED_VALIDATION_SETTINGSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTORTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTORTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTORTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTORTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTER_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTER_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTER_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_INFO_QUEUE_FILTER_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/D3D12_MESSAGETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_MESSAGETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/D3D12_MESSAGETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/D3D12_MESSAGETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/DXGITests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/DXGITests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/DXGITests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/DXGITests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/DirectXTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/DirectXTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/DirectXTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/DirectXTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug3Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug3Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug3Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug3Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug4Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug4Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug4Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug4Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug5Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug5Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug5Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug5Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug6Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug6Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12Debug6Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12Debug6Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList3Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList3Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList3Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandList3Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandListTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandListTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandListTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandListTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueue1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueue1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueue1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueue1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueueTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueueTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueueTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugCommandQueueTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugDevice2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugDeviceTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugDeviceTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugDeviceTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugDeviceTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12DebugTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12DebugTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12InfoQueue1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12InfoQueue1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12InfoQueue1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12InfoQueue1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12InfoQueueTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12InfoQueueTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12InfoQueueTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12InfoQueueTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12SharingContractTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12SharingContractTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/ID3D12SharingContractTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/ID3D12SharingContractTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12sdklayers/IIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12sdklayers/IIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12sdklayers/IIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12sdklayers/IIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/D3D12_FUNCTION_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_FUNCTION_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/D3D12_FUNCTION_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_FUNCTION_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/D3D12_LIBRARY_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_LIBRARY_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/D3D12_LIBRARY_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_LIBRARY_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/D3D12_PARAMETER_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_PARAMETER_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/D3D12_PARAMETER_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_PARAMETER_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_BUFFER_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_BUFFER_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_BUFFER_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_BUFFER_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_INPUT_BIND_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_INPUT_BIND_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_INPUT_BIND_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_INPUT_BIND_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_TYPE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_TYPE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_TYPE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_TYPE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_VARIABLE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_VARIABLE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/D3D12_SHADER_VARIABLE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SHADER_VARIABLE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/D3D12_SIGNATURE_PARAMETER_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SIGNATURE_PARAMETER_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/D3D12_SIGNATURE_PARAMETER_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/D3D12_SIGNATURE_PARAMETER_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/ID3D12FunctionParameterReflectionTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12FunctionParameterReflectionTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/ID3D12FunctionParameterReflectionTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12FunctionParameterReflectionTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/ID3D12FunctionReflectionTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12FunctionReflectionTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/ID3D12FunctionReflectionTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12FunctionReflectionTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/ID3D12LibraryReflectionTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12LibraryReflectionTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/ID3D12LibraryReflectionTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12LibraryReflectionTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionConstantBufferTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionConstantBufferTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionConstantBufferTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionConstantBufferTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionTypeTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionTypeTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionTypeTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionTypeTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionVariableTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionVariableTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/ID3D12ShaderReflectionVariableTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/ID3D12ShaderReflectionVariableTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12shader/IIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12shader/IIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12shader/IIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12shader/IIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ARCHITECTURETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ARCHITECTURETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ARCHITECTURETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ARCHITECTURETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZE1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZE1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZE1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZE1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODER_HEAP_SIZETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_CONVERSION_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_CONVERSION_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_CONVERSION_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_CONVERSION_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_HISTOGRAMTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_HISTOGRAMTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_HISTOGRAMTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_HISTOGRAMTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILESTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILESTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILESTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILESTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROTECTED_RESOURCESTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROTECTED_RESOURCESTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROTECTED_RESOURCESTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_PROTECTED_RESOURCESTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODECTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODECTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODECTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODECTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_HEAP_SIZETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_HEAP_SIZETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_HEAP_SIZETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_HEAP_SIZETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INPUT_FORMATTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INPUT_FORMATTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INPUT_FORMATTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INPUT_FORMATTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INTRA_REFRESH_MODETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INTRA_REFRESH_MODETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INTRA_REFRESH_MODETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_INTRA_REFRESH_MODETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTIONTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTIONTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTIONTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTIONTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION_RATIOS_COUNTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION_RATIOS_COUNTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION_RATIOS_COUNTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_OUTPUT_RESOLUTION_RATIOS_COUNTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_PROFILE_LEVELTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_PROFILE_LEVELTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_PROFILE_LEVELTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_PROFILE_LEVELTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RATE_CONTROL_MODETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RATE_CONTROL_MODETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RATE_CONTROL_MODETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RATE_CONTROL_MODETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_ENCODER_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMANDSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMANDSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMANDSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMANDSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_COUNTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_COUNTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_COUNTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_COUNTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETERSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETERSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETERSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETERSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETER_COUNTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETER_COUNTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETER_COUNTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_PARAMETER_COUNTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SIZETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SIZETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SIZETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SIZETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_EXTENSION_COMMAND_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_FEATURE_AREA_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_FEATURE_AREA_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_FEATURE_AREA_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_FEATURE_AREA_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATORTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATORTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATORTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATORTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_PROTECTED_RESOURCESTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_PROTECTED_RESOURCESTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_PROTECTED_RESOURCESTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_PROTECTED_RESOURCESTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_SIZETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_SIZETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_SIZETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_MOTION_ESTIMATOR_SIZETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZE1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZE1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZE1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZE1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESSOR_SIZETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_MAX_INPUT_STREAMSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_MAX_INPUT_STREAMSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_MAX_INPUT_STREAMSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_MAX_INPUT_STREAMSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_PROTECTED_RESOURCESTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_PROTECTED_RESOURCESTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_PROTECTED_RESOURCESTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_PROTECTED_RESOURCESTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_REFERENCE_INFOTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_REFERENCE_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_REFERENCE_INFOTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_REFERENCE_INFOTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_FEATURE_DATA_VIDEO_PROCESS_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_QUERY_DATA_VIDEO_DECODE_STATISTICSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_QUERY_DATA_VIDEO_DECODE_STATISTICSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_QUERY_DATA_VIDEO_DECODE_STATISTICSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_QUERY_DATA_VIDEO_DECODE_STATISTICSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_INPUTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_INPUTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_INPUTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_INPUTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_OUTPUTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_OUTPUTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_OUTPUTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_RESOLVE_VIDEO_MOTION_VECTOR_HEAP_OUTPUTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_RESOURCE_COORDINATETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_RESOURCE_COORDINATETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_RESOURCE_COORDINATETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_RESOURCE_COORDINATETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_HEAP_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_HEAP_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_HEAP_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODER_HEAP_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAMTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAMTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAMTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAMTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONFIGURATIONTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONFIGURATIONTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONFIGURATIONTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONFIGURATIONTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_FRAME_ARGUMENTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_FRAME_ARGUMENTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_FRAME_ARGUMENTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_FRAME_ARGUMENTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_HISTOGRAMTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_HISTOGRAMTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_HISTOGRAMTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_HISTOGRAMTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_REFERENCE_FRAMESTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_REFERENCE_FRAMESTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_REFERENCE_FRAMESTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_DECODE_REFERENCE_FRAMESTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATIONTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATIONTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATIONTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATIONTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_HEVCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_H264Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_SUPPORT_HEVCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_H264Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_H264Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_H264Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_H264Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_HEVCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_HEVCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_HEVCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_CODEC_PICTURE_CONTROL_SUPPORT_HEVCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_COMPRESSED_BITSTREAMTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_COMPRESSED_BITSTREAMTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_COMPRESSED_BITSTREAMTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_COMPRESSED_BITSTREAMTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_INPUT_ARGUMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_INPUT_ARGUMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_INPUT_ARGUMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_INPUT_ARGUMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_OUTPUT_ARGUMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_OUTPUT_ARGUMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_OUTPUT_ARGUMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODEFRAME_OUTPUT_ARGUMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODE_OPERATION_METADATA_BUFFERTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODE_OPERATION_METADATA_BUFFERTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODE_OPERATION_METADATA_BUFFERTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_ENCODE_OPERATION_METADATA_BUFFERTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATATests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATATests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATATests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATATests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_HEAP_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_HEAP_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_HEAP_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_HEAP_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_INTRA_REFRESHTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_INTRA_REFRESHTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_INTRA_REFRESHTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_INTRA_REFRESHTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_SETTINGTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_SETTINGTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_SETTINGTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_SETTINGTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATATests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATATests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATATests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATATests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATA_STATISTICSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATA_STATISTICSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATA_STATISTICSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_OUTPUT_METADATA_STATISTICSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATATests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATATests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATATests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATATests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_LIST_MODIFICATION_OPERATIONTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_LIST_MODIFICATION_OPERATIONTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_LIST_MODIFICATION_OPERATIONTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_LIST_MODIFICATION_OPERATIONTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_MARKING_OPERATIONTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_MARKING_OPERATIONTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_MARKING_OPERATIONTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_H264_REFERENCE_PICTURE_MARKING_OPERATIONTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_CODEC_DATA_HEVCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATATests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATATests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATATests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATATests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_SLICESTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_SLICESTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_SLICESTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_CONTROL_SUBREGIONS_LAYOUT_DATA_SLICESTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_RATIO_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_RATIO_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_RATIO_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_RATIO_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_PROFILE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROLTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROLTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROLTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROLTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CBRTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CBRTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CBRTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CBRTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CONFIGURATION_PARAMSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CONFIGURATION_PARAMSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CONFIGURATION_PARAMSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CONFIGURATION_PARAMSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CQPTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CQPTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CQPTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_CQPTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_QVBRTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_QVBRTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_QVBRTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_QVBRTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_VBRTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_VBRTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_VBRTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RATE_CONTROL_VBRTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RECONSTRUCTED_PICTURETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_H264Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_H264Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_H264Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_H264Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_HEVCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_HEVCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_HEVCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_REFERENCE_PICTURE_DESCRIPTOR_HEVCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_INPUT_ARGUMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_INPUT_ARGUMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_INPUT_ARGUMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_INPUT_ARGUMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_OUTPUT_ARGUMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_OUTPUT_ARGUMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_OUTPUT_ARGUMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_RESOLVE_METADATA_OUTPUT_ARGUMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_CONTROL_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_HEVCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_HEVCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_HEVCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_HEVCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODE_REFERENCE_FRAMESTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODE_REFERENCE_FRAMESTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODE_REFERENCE_FRAMESTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_ENCODE_REFERENCE_FRAMESTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_INFOTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_INFOTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_INFOTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_INFOTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_INFOTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_EXTENSION_COMMAND_PARAMETER_INFOTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_FORMATTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_FORMATTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_FORMATTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_FORMATTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_INPUTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_INPUTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_INPUTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_INPUTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_OUTPUTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_OUTPUTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_OUTPUTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_ESTIMATOR_OUTPUTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_VECTOR_HEAP_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_VECTOR_HEAP_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_VECTOR_HEAP_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_MOTION_VECTOR_HEAP_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ALPHA_BLENDINGTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ALPHA_BLENDINGTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ALPHA_BLENDINGTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_ALPHA_BLENDINGTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER_RANGETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER_RANGETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER_RANGETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_FILTER_RANGETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAMTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAMTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAMTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAMTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_RATETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_RATETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_RATETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_RATETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_LUMA_KEYTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_LUMA_KEYTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_LUMA_KEYTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_LUMA_KEYTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAMTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAMTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAMTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAMTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTSTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTSTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTSTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTSTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_REFERENCE_SETTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_REFERENCE_SETTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_REFERENCE_SETTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_REFERENCE_SETTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_TRANSFORMTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_TRANSFORMTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_TRANSFORMTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_PROCESS_TRANSFORMTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SAMPLETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SAMPLETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SAMPLETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SAMPLETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SCALE_SUPPORTTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SCALE_SUPPORTTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SCALE_SUPPORTTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SCALE_SUPPORTTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SIZE_RANGETests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SIZE_RANGETests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/D3D12_VIDEO_SIZE_RANGETests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/D3D12_VIDEO_SIZE_RANGETests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList3Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList3Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList3Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandList3Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandListTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandListTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandListTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecodeCommandListTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoder1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoder1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoder1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoder1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoderHeap1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoderHeap1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoderHeap1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoderHeap1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoderHeapTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoderHeapTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoderHeapTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoderHeapTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoderTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoderTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDecoderTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDecoderTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice3Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice3Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDevice3Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDevice3Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDeviceTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDeviceTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoDeviceTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoDeviceTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList3Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList3Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList3Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandList3Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandListTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandListTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandListTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncodeCommandListTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoEncoderHeapTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncoderHeapTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoEncoderHeapTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncoderHeapTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoEncoderTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncoderTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoEncoderTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoEncoderTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoExtensionCommandTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoExtensionCommandTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoExtensionCommandTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoExtensionCommandTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoMotionEstimatorTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoMotionEstimatorTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoMotionEstimatorTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoMotionEstimatorTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoMotionVectorHeapTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoMotionVectorHeapTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoMotionVectorHeapTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoMotionVectorHeapTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList2Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList2Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList2Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList2Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList3Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList3Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList3Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandList3Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandListTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandListTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessCommandListTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessCommandListTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessor1Tests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessor1Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessor1Tests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessor1Tests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessorTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessorTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/ID3D12VideoProcessorTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/ID3D12VideoProcessorTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3d12video/IIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3d12video/IIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3d12video/IIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3d12video/IIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3dcommon/D3DTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3dcommon/D3DTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3dcommon/D3DTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3dcommon/D3DTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3dcommon/D3D_SHADER_MACROTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_MACROTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3dcommon/D3D_SHADER_MACROTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3dcommon/D3D_SHADER_MACROTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3dcommon/DirectXTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3dcommon/DirectXTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3dcommon/DirectXTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3dcommon/DirectXTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3dcommon/ID3DBlobTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3dcommon/ID3DBlobTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3dcommon/ID3DBlobTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3dcommon/ID3DBlobTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3dcommon/ID3DDestructionNotifierTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3dcommon/ID3DDestructionNotifierTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3dcommon/ID3DDestructionNotifierTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3dcommon/ID3DDestructionNotifierTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3dcommon/ID3DIncludeTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3dcommon/ID3DIncludeTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3dcommon/ID3DIncludeTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3dcommon/ID3DIncludeTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3dcommon/IIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3dcommon/IIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3dcommon/IIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3dcommon/IIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3dx12/D3DX12_MESH_SHADER_PIPELINE_STATE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3dx12/D3DX12_MESH_SHADER_PIPELINE_STATE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3dx12/D3DX12_MESH_SHADER_PIPELINE_STATE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3dx12/D3DX12_MESH_SHADER_PIPELINE_STATE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/d3dx12/ID3DX12PipelineParserCallbacksTests.gen.cs b/tests/Win32/Win32/DirectX/headers/d3dx12/ID3DX12PipelineParserCallbacksTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/d3dx12/ID3DX12PipelineParserCallbacksTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/d3dx12/ID3DX12PipelineParserCallbacksTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudgetNodeSegmentGroupTests.gen.cs b/tests/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudgetNodeSegmentGroupTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudgetNodeSegmentGroupTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudgetNodeSegmentGroupTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudgetTests.gen.cs b/tests/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudgetTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudgetTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreAdapterMemoryBudgetTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/dxcore_interface/DXCoreHardwareIDPartsTests.gen.cs b/tests/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreHardwareIDPartsTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/dxcore_interface/DXCoreHardwareIDPartsTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreHardwareIDPartsTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/dxcore_interface/DXCoreHardwareIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreHardwareIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/dxcore_interface/DXCoreHardwareIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/dxcore_interface/DXCoreHardwareIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/dxcore_interface/DirectXTests.gen.cs b/tests/Win32/Win32/DirectX/headers/dxcore_interface/DirectXTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/dxcore_interface/DirectXTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/dxcore_interface/DirectXTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/dxcore_interface/IDXCoreAdapterFactoryTests.gen.cs b/tests/Win32/Win32/DirectX/headers/dxcore_interface/IDXCoreAdapterFactoryTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/dxcore_interface/IDXCoreAdapterFactoryTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/dxcore_interface/IDXCoreAdapterFactoryTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/dxcore_interface/IDXCoreAdapterListTests.gen.cs b/tests/Win32/Win32/DirectX/headers/dxcore_interface/IDXCoreAdapterListTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/dxcore_interface/IDXCoreAdapterListTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/dxcore_interface/IDXCoreAdapterListTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/dxcore_interface/IDXCoreAdapterTests.gen.cs b/tests/Win32/Win32/DirectX/headers/dxcore_interface/IDXCoreAdapterTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/dxcore_interface/IDXCoreAdapterTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/dxcore_interface/IDXCoreAdapterTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/dxcore_interface/IIDTests.gen.cs b/tests/Win32/Win32/DirectX/headers/dxcore_interface/IIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/dxcore_interface/IIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/dxcore_interface/IIDTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/dxgicommon/DXGI_RATIONALTests.gen.cs b/tests/Win32/Win32/DirectX/headers/dxgicommon/DXGI_RATIONALTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/dxgicommon/DXGI_RATIONALTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/dxgicommon/DXGI_RATIONALTests.gen.cs
diff --git a/tests/Windows/DirectX/headers/dxgicommon/DXGI_SAMPLE_DESCTests.gen.cs b/tests/Win32/Win32/DirectX/headers/dxgicommon/DXGI_SAMPLE_DESCTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/headers/dxgicommon/DXGI_SAMPLE_DESCTests.gen.cs
rename to tests/Win32/Win32/DirectX/headers/dxgicommon/DXGI_SAMPLE_DESCTests.gen.cs
diff --git a/tests/Windows/DirectX/other/D3D11On12On7/ID3D11On12On7DeviceTests.gen.cs b/tests/Win32/Win32/DirectX/other/D3D11On12On7/ID3D11On12On7DeviceTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/other/D3D11On12On7/ID3D11On12On7DeviceTests.gen.cs
rename to tests/Win32/Win32/DirectX/other/D3D11On12On7/ID3D11On12On7DeviceTests.gen.cs
diff --git a/tests/Windows/DirectX/other/D3D11On12On7/ID3D11On12On7Tests.gen.cs b/tests/Win32/Win32/DirectX/other/D3D11On12On7/ID3D11On12On7Tests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/other/D3D11On12On7/ID3D11On12On7Tests.gen.cs
rename to tests/Win32/Win32/DirectX/other/D3D11On12On7/ID3D11On12On7Tests.gen.cs
diff --git a/tests/Windows/DirectX/other/D3D12Downlevel/ID3D12CommandQueueDownlevelTests.gen.cs b/tests/Win32/Win32/DirectX/other/D3D12Downlevel/ID3D12CommandQueueDownlevelTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/other/D3D12Downlevel/ID3D12CommandQueueDownlevelTests.gen.cs
rename to tests/Win32/Win32/DirectX/other/D3D12Downlevel/ID3D12CommandQueueDownlevelTests.gen.cs
diff --git a/tests/Windows/DirectX/other/D3D12Downlevel/ID3D12DeviceDownlevelTests.gen.cs b/tests/Win32/Win32/DirectX/other/D3D12Downlevel/ID3D12DeviceDownlevelTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/other/D3D12Downlevel/ID3D12DeviceDownlevelTests.gen.cs
rename to tests/Win32/Win32/DirectX/other/D3D12Downlevel/ID3D12DeviceDownlevelTests.gen.cs
diff --git a/tests/Windows/DirectX/other/D3D12Downlevel/IIDTests.gen.cs b/tests/Win32/Win32/DirectX/other/D3D12Downlevel/IIDTests.gen.cs
similarity index 100%
rename from tests/Windows/DirectX/other/D3D12Downlevel/IIDTests.gen.cs
rename to tests/Win32/Win32/DirectX/other/D3D12Downlevel/IIDTests.gen.cs
diff --git a/tests/Windows/Windows/other/mssign32/APPX_SIP_CLIENT_DATATests.gen.cs b/tests/Win32/Win32/Windows/other/mssign32/APPX_SIP_CLIENT_DATATests.gen.cs
similarity index 100%
rename from tests/Windows/Windows/other/mssign32/APPX_SIP_CLIENT_DATATests.gen.cs
rename to tests/Win32/Win32/Windows/other/mssign32/APPX_SIP_CLIENT_DATATests.gen.cs
diff --git a/tests/Windows/Windows/other/mssign32/SIGNER_ATTR_AUTHCODETests.gen.cs b/tests/Win32/Win32/Windows/other/mssign32/SIGNER_ATTR_AUTHCODETests.gen.cs
similarity index 100%
rename from tests/Windows/Windows/other/mssign32/SIGNER_ATTR_AUTHCODETests.gen.cs
rename to tests/Win32/Win32/Windows/other/mssign32/SIGNER_ATTR_AUTHCODETests.gen.cs
diff --git a/tests/Windows/Windows/other/mssign32/SIGNER_BLOB_INFOTests.gen.cs b/tests/Win32/Win32/Windows/other/mssign32/SIGNER_BLOB_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/Windows/other/mssign32/SIGNER_BLOB_INFOTests.gen.cs
rename to tests/Win32/Win32/Windows/other/mssign32/SIGNER_BLOB_INFOTests.gen.cs
diff --git a/tests/Windows/Windows/other/mssign32/SIGNER_CERTTests.gen.cs b/tests/Win32/Win32/Windows/other/mssign32/SIGNER_CERTTests.gen.cs
similarity index 100%
rename from tests/Windows/Windows/other/mssign32/SIGNER_CERTTests.gen.cs
rename to tests/Win32/Win32/Windows/other/mssign32/SIGNER_CERTTests.gen.cs
diff --git a/tests/Windows/Windows/other/mssign32/SIGNER_CERT_STORE_INFOTests.gen.cs b/tests/Win32/Win32/Windows/other/mssign32/SIGNER_CERT_STORE_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/Windows/other/mssign32/SIGNER_CERT_STORE_INFOTests.gen.cs
rename to tests/Win32/Win32/Windows/other/mssign32/SIGNER_CERT_STORE_INFOTests.gen.cs
diff --git a/tests/Windows/Windows/other/mssign32/SIGNER_CONTEXTTests.gen.cs b/tests/Win32/Win32/Windows/other/mssign32/SIGNER_CONTEXTTests.gen.cs
similarity index 100%
rename from tests/Windows/Windows/other/mssign32/SIGNER_CONTEXTTests.gen.cs
rename to tests/Win32/Win32/Windows/other/mssign32/SIGNER_CONTEXTTests.gen.cs
diff --git a/tests/Windows/Windows/other/mssign32/SIGNER_FILE_INFOTests.gen.cs b/tests/Win32/Win32/Windows/other/mssign32/SIGNER_FILE_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/Windows/other/mssign32/SIGNER_FILE_INFOTests.gen.cs
rename to tests/Win32/Win32/Windows/other/mssign32/SIGNER_FILE_INFOTests.gen.cs
diff --git a/tests/Windows/Windows/other/mssign32/SIGNER_PROVIDER_INFOTests.gen.cs b/tests/Win32/Win32/Windows/other/mssign32/SIGNER_PROVIDER_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/Windows/other/mssign32/SIGNER_PROVIDER_INFOTests.gen.cs
rename to tests/Win32/Win32/Windows/other/mssign32/SIGNER_PROVIDER_INFOTests.gen.cs
diff --git a/tests/Windows/Windows/other/mssign32/SIGNER_SIGNATURE_INFOTests.gen.cs b/tests/Win32/Win32/Windows/other/mssign32/SIGNER_SIGNATURE_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/Windows/other/mssign32/SIGNER_SIGNATURE_INFOTests.gen.cs
rename to tests/Win32/Win32/Windows/other/mssign32/SIGNER_SIGNATURE_INFOTests.gen.cs
diff --git a/tests/Windows/Windows/other/mssign32/SIGNER_SIGN_EX2_PARAMSTests.gen.cs b/tests/Win32/Win32/Windows/other/mssign32/SIGNER_SIGN_EX2_PARAMSTests.gen.cs
similarity index 100%
rename from tests/Windows/Windows/other/mssign32/SIGNER_SIGN_EX2_PARAMSTests.gen.cs
rename to tests/Win32/Win32/Windows/other/mssign32/SIGNER_SIGN_EX2_PARAMSTests.gen.cs
diff --git a/tests/Windows/Windows/other/mssign32/SIGNER_SPC_CHAIN_INFOTests.gen.cs b/tests/Win32/Win32/Windows/other/mssign32/SIGNER_SPC_CHAIN_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/Windows/other/mssign32/SIGNER_SPC_CHAIN_INFOTests.gen.cs
rename to tests/Win32/Win32/Windows/other/mssign32/SIGNER_SPC_CHAIN_INFOTests.gen.cs
diff --git a/tests/Windows/Windows/other/mssign32/SIGNER_SUBJECT_INFOTests.gen.cs b/tests/Win32/Win32/Windows/other/mssign32/SIGNER_SUBJECT_INFOTests.gen.cs
similarity index 100%
rename from tests/Windows/Windows/other/mssign32/SIGNER_SUBJECT_INFOTests.gen.cs
rename to tests/Win32/Win32/Windows/other/mssign32/SIGNER_SUBJECT_INFOTests.gen.cs