diff --git a/Vortice.Win32.sln b/Vortice.Win32.sln
index 6a035ec..a64cf86 100644
--- a/Vortice.Win32.sln
+++ b/Vortice.Win32.sln
@@ -22,17 +22,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{065268A8
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Direct3D12", "src\Vortice.Win32.Direct3D12\Vortice.Win32.Direct3D12.csproj", "{020F2D80-B3D0-4AB2-AC4D-25F51028E502}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Direct3D12", "src\Vortice.Win32.Graphics.Direct3D12\Vortice.Win32.Graphics.Direct3D12.csproj", "{020F2D80-B3D0-4AB2-AC4D-25F51028E502}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Direct3D11", "src\Vortice.Win32.Direct3D11\Vortice.Win32.Direct3D11.csproj", "{32CE7567-8C9E-43AD-9543-1F0A8CA1CA76}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Direct3D11", "src\Vortice.Win32.Graphics.Direct3D11\Vortice.Win32.Graphics.Direct3D11.csproj", "{32CE7567-8C9E-43AD-9543-1F0A8CA1CA76}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Direct3D11on12", "src\Vortice.Win32.Direct3D11on12\Vortice.Win32.Direct3D11on12.csproj", "{978D804A-9F52-4ED4-95D9-BBED341E48A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Direct3D11on12", "src\Vortice.Win32.Graphics.Direct3D11on12\Vortice.Win32.Graphics.Direct3D11on12.csproj", "{978D804A-9F52-4ED4-95D9-BBED341E48A6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Dxc", "src\Vortice.Win32.Dxc\Vortice.Win32.Dxc.csproj", "{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Imaging", "src\Vortice.Win32.Graphics.Imaging\Vortice.Win32.Graphics.Imaging.csproj", "{08019242-4899-448C-AA40-9F72F3BBE9AD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Direct2D", "src\Vortice.Win32.Direct2D\Vortice.Win32.Direct2D.csproj", "{942D599C-CDAC-479A-825E-1B7B84DE1328}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.DirectWrite", "src\Vortice.Win32.Graphics.DirectWrite\Vortice.Win32.Graphics.DirectWrite.csproj", "{CB383B94-16DF-4937-9CAD-15DE1DC77B3A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.DirectWrite", "src\Vortice.Win32.DirectWrite\Vortice.Win32.DirectWrite.csproj", "{CB383B94-16DF-4937-9CAD-15DE1DC77B3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Direct2D", "src\Vortice.Win32.Graphics.Direct2D\Vortice.Win32.Graphics.Direct2D.csproj", "{942D599C-CDAC-479A-825E-1B7B84DE1328}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Direct3D.Dxc", "src\Vortice.Win32.Graphics.Direct3D.Dxc\Vortice.Win32.Graphics.Direct3D.Dxc.csproj", "{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -68,14 +70,18 @@ Global
 		{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08019242-4899-448C-AA40-9F72F3BBE9AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08019242-4899-448C-AA40-9F72F3BBE9AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08019242-4899-448C-AA40-9F72F3BBE9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08019242-4899-448C-AA40-9F72F3BBE9AD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB383B94-16DF-4937-9CAD-15DE1DC77B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB383B94-16DF-4937-9CAD-15DE1DC77B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB383B94-16DF-4937-9CAD-15DE1DC77B3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB383B94-16DF-4937-9CAD-15DE1DC77B3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs
index ca7285f..6ae1a90 100644
--- a/src/Generator/Program.cs
+++ b/src/Generator/Program.cs
@@ -1038,12 +1038,13 @@ public static class Program
     public static int Main(string[] args)
     {
         string repoRoot = FindRepoRoot();
-        string d3d11Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Direct3D11");
-        string d3d12Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Direct3D12");
-        string d3d11on12Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Direct3D11on12");
-        string d2dPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Direct2D");
-        string dwritePath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.DirectWrite");
-        string dxcPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Dxc");
+        string d3d11Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct3D11");
+        string d3d12Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct3D12");
+        string d3d11on12Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct3D11on12");
+        string dwritePath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.DirectWrite");
+        string wicPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Imaging");
+        string d2dPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct2D");
+        string dxcPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct3D.Dxc");
 
         // Generate docs
         //DocGenerator.Generate(new[] { "DXGI" }, Path.Combine(repoRoot, "Generated", "Graphics", "Dxgi.xml"));
@@ -1080,6 +1081,11 @@ public static class Program
                 outputPath = d3d11on12Path;
                 useSubFolders = false;
             }
+            else if (jsonFile == "Graphics.Imaging.json")
+            {
+                outputPath = wicPath;
+                useSubFolders = false;
+            }
             else if (jsonFile.EndsWith("Direct2D.json"))
             {
                 outputPath = d2dPath;
@@ -1096,6 +1102,7 @@ public static class Program
                 outputPath = dwritePath;
                 useSubFolders = false;
             }
+
             else if (jsonFile.EndsWith("Direct3D.Dxc.json"))
             {
                 outputPath = dxcPath;
@@ -1152,7 +1159,7 @@ public static class Program
 
         if (jsonFile == "Graphics.Direct2D.Common.json")
         {
-            docFile = $"../../../Vortice.Win32.Direct2D/Direct2D";
+            docFile = $"../../../Vortice.Win32.Graphics.Direct2D/Direct2D";
         }
         else if (jsonFile == "Graphics.Imaging.D2D.json")
         {
@@ -1160,7 +1167,7 @@ public static class Program
         }
         else if (jsonFile == "Graphics.Direct3D11on12.json")
         {
-            docFile = $"../Vortice.Win32.Direct3D11/Direct3D11";
+            docFile = $"../Vortice.Win32.Graphics.Direct3D11/Direct3D11";
         }
 
         string apiName = ns;
diff --git a/src/Vortice.Win32.Direct3D11on12/Generated/ResourceFlags.cs b/src/Vortice.Win32.Direct3D11on12/Generated/ResourceFlags.cs
deleted file mode 100644
index a1bad30..0000000
--- a/src/Vortice.Win32.Direct3D11on12/Generated/ResourceFlags.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-
-namespace Win32.Graphics.Direct3D11on12;
-
-/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS"]/*' />
-/// <unmanaged>D3D11_RESOURCE_FLAGS</unmanaged>
-public partial struct ResourceFlags
-{
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS::BindFlags"]/*' />
-	public Graphics.Direct3D11.BindFlags BindFlags;
-
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS::MiscFlags"]/*' />
-	public Graphics.Direct3D11.ResourceMiscFlags MiscFlags;
-
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS::CPUAccessFlags"]/*' />
-	public Graphics.Direct3D11.CpuAccessFlags CPUAccessFlags;
-
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS::StructureByteStride"]/*' />
-	public uint StructureByteStride;
-}
diff --git a/src/Vortice.Win32.Direct2D/Apis.WIC.cs b/src/Vortice.Win32.Graphics.Direct2D/Apis.WIC.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Apis.WIC.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Apis.WIC.cs
diff --git a/src/Vortice.Win32.Direct2D/Direct2D.xml b/src/Vortice.Win32.Graphics.Direct2D/Direct2D.xml
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Direct2D.xml
rename to src/Vortice.Win32.Graphics.Direct2D/Direct2D.xml
diff --git a/src/Vortice.Win32.Direct2D/Generated/AffineTransform2DProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/AffineTransform2DProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/AffineTransform2DProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/AffineTransform2DProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/AntialiasMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/AntialiasMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/AntialiasMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/AntialiasMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/Apis.Functions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Apis.Functions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/Apis.Functions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/Apis.Functions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/Apis.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Apis.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/Apis.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/Apis.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ArcSegment.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ArcSegment.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ArcSegment.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ArcSegment.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ArcSize.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ArcSize.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ArcSize.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ArcSize.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ArithmeticCompositeProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ArithmeticCompositeProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ArithmeticCompositeProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ArithmeticCompositeProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/AtlasProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/AtlasProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/AtlasProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/AtlasProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BitmapBrushProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapBrushProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BitmapBrushProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapBrushProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BitmapBrushProperties1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapBrushProperties1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BitmapBrushProperties1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapBrushProperties1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BitmapInterpolationMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapInterpolationMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BitmapInterpolationMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapInterpolationMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BitmapOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BitmapOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BitmapProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BitmapProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BitmapProperties1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapProperties1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BitmapProperties1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapProperties1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BitmapSourceAlphaMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapSourceAlphaMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BitmapSourceAlphaMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapSourceAlphaMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BitmapSourceInterpolationMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapSourceInterpolationMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BitmapSourceInterpolationMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapSourceInterpolationMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BitmapSourceOrientation.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapSourceOrientation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BitmapSourceOrientation.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapSourceOrientation.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BitmapSourceProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapSourceProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BitmapSourceProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BitmapSourceProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/Blend.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Blend.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/Blend.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/Blend.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BlendDescription.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BlendDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BlendDescription.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BlendDescription.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BlendOperation.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BlendOperation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BlendOperation.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BlendOperation.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BlendProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BlendProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BlendProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BlendProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BorderEdgeMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BorderEdgeMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BorderEdgeMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BorderEdgeMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BorderProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BorderProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BorderProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BorderProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BrightnessProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BrightnessProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BrightnessProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BrightnessProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BrushProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BrushProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BrushProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BrushProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/BufferPrecision.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/BufferPrecision.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/BufferPrecision.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/BufferPrecision.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/CapStyle.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/CapStyle.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/CapStyle.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/CapStyle.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ChangeType.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ChangeType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ChangeType.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ChangeType.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ChannelDepth.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ChannelDepth.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ChannelDepth.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ChannelDepth.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ChannelSelector.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ChannelSelector.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ChannelSelector.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ChannelSelector.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ChromaKeyProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ChromaKeyProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ChromaKeyProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ChromaKeyProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ColorBitmapGlyphSnapOption.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ColorBitmapGlyphSnapOption.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ColorBitmapGlyphSnapOption.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ColorBitmapGlyphSnapOption.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ColorContextType.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ColorContextType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ColorContextType.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ColorContextType.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ColorInterpolationMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ColorInterpolationMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ColorInterpolationMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ColorInterpolationMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ColorManagementAlphaMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ColorManagementAlphaMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ColorManagementAlphaMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ColorManagementAlphaMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ColorManagementProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ColorManagementProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ColorManagementProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ColorManagementProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ColorManagementQuality.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ColorManagementQuality.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ColorManagementQuality.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ColorManagementQuality.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ColorManagementRenderingIntent.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ColorManagementRenderingIntent.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ColorManagementRenderingIntent.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ColorManagementRenderingIntent.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ColorMatrixProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ColorMatrixProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ColorMatrixProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ColorMatrixProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ColorSpace.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ColorSpace.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ColorSpace.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ColorSpace.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/CombineMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/CombineMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/CombineMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/CombineMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/CompatibleRenderTargetOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/CompatibleRenderTargetOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/CompatibleRenderTargetOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/CompatibleRenderTargetOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/CompositeProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/CompositeProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/CompositeProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/CompositeProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ContrastProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ContrastProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ContrastProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ContrastProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ConvolveMatrixProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ConvolveMatrixProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ConvolveMatrixProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ConvolveMatrixProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ConvolveMatrixScaleMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ConvolveMatrixScaleMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ConvolveMatrixScaleMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ConvolveMatrixScaleMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/CreationProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/CreationProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/CreationProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/CreationProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/CropProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/CropProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/CropProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/CropProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/CrossfadeProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/CrossfadeProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/CrossfadeProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/CrossfadeProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/CustomVertexBufferProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/CustomVertexBufferProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/CustomVertexBufferProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/CustomVertexBufferProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DCInitializeMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DCInitializeMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DCInitializeMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DCInitializeMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DashStyle.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DashStyle.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DashStyle.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DashStyle.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DebugLevel.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DebugLevel.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DebugLevel.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DebugLevel.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DeviceContextOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DeviceContextOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DeviceContextOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DeviceContextOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DirectionalBlurOptimization.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DirectionalBlurOptimization.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DirectionalBlurOptimization.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DirectionalBlurOptimization.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DirectionalBlurProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DirectionalBlurProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DirectionalBlurProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DirectionalBlurProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DiscreteTransferProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DiscreteTransferProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DiscreteTransferProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DiscreteTransferProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DisplacementMapProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DisplacementMapProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DisplacementMapProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DisplacementMapProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DistantDiffuseProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DistantDiffuseProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DistantDiffuseProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DistantDiffuseProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DistantDiffuseScaleMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DistantDiffuseScaleMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DistantDiffuseScaleMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DistantDiffuseScaleMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DistantSpecularProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DistantSpecularProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DistantSpecularProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DistantSpecularProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DistantSpecularScaleMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DistantSpecularScaleMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DistantSpecularScaleMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DistantSpecularScaleMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DpiCompensationInterpolationMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DpiCompensationInterpolationMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DpiCompensationInterpolationMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DpiCompensationInterpolationMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DpiCompensationProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DpiCompensationProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DpiCompensationProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DpiCompensationProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DrawTextOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DrawTextOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DrawTextOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DrawTextOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DrawingStateDescription.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DrawingStateDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DrawingStateDescription.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DrawingStateDescription.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/DrawingStateDescription1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/DrawingStateDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/DrawingStateDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/DrawingStateDescription1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/EdgeDetectionMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/EdgeDetectionMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/EdgeDetectionMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/EdgeDetectionMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/EdgeDetectionProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/EdgeDetectionProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/EdgeDetectionProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/EdgeDetectionProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/EffectInputDescription.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/EffectInputDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/EffectInputDescription.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/EffectInputDescription.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/Ellipse.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Ellipse.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/Ellipse.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/Ellipse.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/EmbossProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/EmbossProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/EmbossProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/EmbossProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ExposureProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ExposureProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ExposureProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ExposureProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ExtendMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ExtendMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ExtendMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ExtendMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/FactoryOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/FactoryOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/FactoryOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/FactoryOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/FactoryType.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/FactoryType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/FactoryType.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/FactoryType.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/Feature.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Feature.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/Feature.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/Feature.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/FeatureDataD3D10XHardwareOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/FeatureDataD3D10XHardwareOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/FeatureDataD3D10XHardwareOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/FeatureDataD3D10XHardwareOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/FeatureDataDoubles.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/FeatureDataDoubles.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/FeatureDataDoubles.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/FeatureDataDoubles.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/FeatureLevel.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/FeatureLevel.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/FeatureLevel.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/FeatureLevel.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/Filter.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Filter.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/Filter.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/Filter.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/FloodProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/FloodProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/FloodProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/FloodProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/Gamma.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Gamma.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/Gamma.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/Gamma.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/Gamma1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Gamma1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/Gamma1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/Gamma1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/GammaTransferProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/GammaTransferProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/GammaTransferProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/GammaTransferProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/GaussianBlurOptimization.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/GaussianBlurOptimization.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/GaussianBlurOptimization.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/GaussianBlurOptimization.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/GaussianBlurProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/GaussianBlurProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/GaussianBlurProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/GaussianBlurProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/GeometryRelation.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/GeometryRelation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/GeometryRelation.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/GeometryRelation.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/GeometrySimplificationOption.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/GeometrySimplificationOption.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/GeometrySimplificationOption.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/GeometrySimplificationOption.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/GradientMeshPatch.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/GradientMeshPatch.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/GradientMeshPatch.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/GradientMeshPatch.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/GradientStop.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/GradientStop.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/GradientStop.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/GradientStop.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/HDRTonemapDisplayMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/HDRTonemapDisplayMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/HDRTonemapDisplayMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/HDRTonemapDisplayMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/HDRTonemapProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/HDRTonemapProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/HDRTonemapProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/HDRTonemapProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/HighlightSandShadowsInputGamma.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/HighlightSandShadowsInputGamma.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/HighlightSandShadowsInputGamma.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/HighlightSandShadowsInputGamma.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/HighlightSandShadowsProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/HighlightSandShadowsProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/HighlightSandShadowsProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/HighlightSandShadowsProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/HistogramProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/HistogramProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/HistogramProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/HistogramProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/HueRotationProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/HueRotationProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/HueRotationProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/HueRotationProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/HueToRgbInputColorSpace.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/HueToRgbInputColorSpace.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/HueToRgbInputColorSpace.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/HueToRgbInputColorSpace.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/HueToRgbProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/HueToRgbProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/HueToRgbProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/HueToRgbProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/HwndRenderTargetProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/HwndRenderTargetProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/HwndRenderTargetProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/HwndRenderTargetProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1AnalysisTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1AnalysisTransform.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1AnalysisTransform.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1AnalysisTransform.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Bitmap.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Bitmap.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Bitmap1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Bitmap1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1BitmapBrush.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BitmapBrush.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1BitmapBrush.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BitmapBrush.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1BitmapBrush1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BitmapBrush1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1BitmapBrush1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BitmapBrush1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1BitmapRenderTarget.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BitmapRenderTarget.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1BitmapRenderTarget.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BitmapRenderTarget.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1BlendTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BlendTransform.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1BlendTransform.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BlendTransform.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1BorderTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BorderTransform.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1BorderTransform.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BorderTransform.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1BoundsAdjustmentTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BoundsAdjustmentTransform.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1BoundsAdjustmentTransform.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BoundsAdjustmentTransform.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Brush.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Brush.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Brush.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Brush.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1ColorContext.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ColorContext.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1ColorContext.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ColorContext.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1ColorContext1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ColorContext1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1ColorContext1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ColorContext1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1CommandList.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandList.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1CommandList.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandList.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1CommandSink.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1CommandSink.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1CommandSink1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1CommandSink1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1CommandSink2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1CommandSink2.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink2.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1CommandSink3.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink3.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1CommandSink3.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink3.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1CommandSink4.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink4.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1CommandSink4.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink4.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1CommandSink5.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink5.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1CommandSink5.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink5.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1ComputeInfo.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeInfo.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1ComputeInfo.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeInfo.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1ComputeTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeTransform.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1ComputeTransform.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeTransform.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1ConcreteTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ConcreteTransform.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1ConcreteTransform.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ConcreteTransform.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1DCRenderTarget.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DCRenderTarget.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1DCRenderTarget.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DCRenderTarget.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Device.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Device.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Device1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Device1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Device2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Device2.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device2.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Device3.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device3.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Device3.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device3.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Device4.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device4.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Device4.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device4.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Device5.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device5.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Device5.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device5.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Device6.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device6.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Device6.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Device6.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext2.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext2.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext3.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext3.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext3.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext3.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext4.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext4.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext4.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext4.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext5.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext5.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext5.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext5.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext6.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext6.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1DeviceContext6.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext6.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1DrawInfo.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawInfo.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1DrawInfo.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawInfo.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1DrawTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawTransform.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1DrawTransform.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawTransform.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1DrawingStateBlock.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawingStateBlock.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1DrawingStateBlock.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawingStateBlock.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1DrawingStateBlock1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawingStateBlock1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1DrawingStateBlock1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawingStateBlock1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Effect.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Effect.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Effect.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Effect.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1EffectContext.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1EffectContext.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1EffectContext1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1EffectContext1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1EffectContext2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1EffectContext2.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext2.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1EffectImpl.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectImpl.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1EffectImpl.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectImpl.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1EllipseGeometry.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EllipseGeometry.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1EllipseGeometry.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EllipseGeometry.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Factory.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Factory.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Factory1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Factory1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Factory2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Factory2.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory2.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Factory3.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory3.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Factory3.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory3.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Factory4.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory4.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Factory4.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory4.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Factory5.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory5.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Factory5.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory5.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Factory6.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory6.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Factory6.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory6.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Factory7.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory7.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Factory7.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory7.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1GdiInteropRenderTarget.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiInteropRenderTarget.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1GdiInteropRenderTarget.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiInteropRenderTarget.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1GdiMetafile.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1GdiMetafile.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1GdiMetafile1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1GdiMetafile1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1GdiMetafileSink.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafileSink.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1GdiMetafileSink.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafileSink.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1GdiMetafileSink1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafileSink1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1GdiMetafileSink1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafileSink1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Geometry.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Geometry.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Geometry.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Geometry.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1GeometryGroup.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GeometryGroup.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1GeometryGroup.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GeometryGroup.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1GeometryRealization.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GeometryRealization.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1GeometryRealization.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GeometryRealization.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1GeometrySink.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GeometrySink.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1GeometrySink.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GeometrySink.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1GradientMesh.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GradientMesh.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1GradientMesh.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GradientMesh.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1GradientStopCollection.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GradientStopCollection.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1GradientStopCollection.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GradientStopCollection.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1GradientStopCollection1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GradientStopCollection1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1GradientStopCollection1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GradientStopCollection1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1HwndRenderTarget.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1HwndRenderTarget.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1HwndRenderTarget.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1HwndRenderTarget.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Image.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Image.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Image.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Image.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1ImageBrush.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageBrush.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1ImageBrush.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageBrush.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1ImageSource.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageSource.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1ImageSource.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageSource.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1ImageSourceFromWic.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageSourceFromWic.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1ImageSourceFromWic.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageSourceFromWic.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Ink.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Ink.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Ink.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Ink.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1InkStyle.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1InkStyle.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1InkStyle.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1InkStyle.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Layer.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Layer.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Layer.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Layer.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1LinearGradientBrush.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1LinearGradientBrush.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1LinearGradientBrush.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1LinearGradientBrush.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1LookupTable3D.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1LookupTable3D.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1LookupTable3D.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1LookupTable3D.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Mesh.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Mesh.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Mesh.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Mesh.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Multithread.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Multithread.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Multithread.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Multithread.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1OffsetTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1OffsetTransform.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1OffsetTransform.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1OffsetTransform.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1PathGeometry.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1PathGeometry.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1PathGeometry1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1PathGeometry1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1PrintControl.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PrintControl.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1PrintControl.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PrintControl.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Properties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Properties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Properties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Properties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1RadialGradientBrush.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RadialGradientBrush.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1RadialGradientBrush.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RadialGradientBrush.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1RectangleGeometry.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RectangleGeometry.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1RectangleGeometry.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RectangleGeometry.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1RenderInfo.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderInfo.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1RenderInfo.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderInfo.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1RenderTarget.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderTarget.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1RenderTarget.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderTarget.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Resource.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Resource.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Resource.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Resource.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1ResourceTexture.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ResourceTexture.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1ResourceTexture.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ResourceTexture.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1RoundedRectangleGeometry.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RoundedRectangleGeometry.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1RoundedRectangleGeometry.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RoundedRectangleGeometry.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1SolidColorBrush.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SolidColorBrush.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1SolidColorBrush.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SolidColorBrush.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1SourceTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SourceTransform.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1SourceTransform.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SourceTransform.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1SpriteBatch.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SpriteBatch.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1SpriteBatch.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SpriteBatch.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1StrokeStyle.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1StrokeStyle.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1StrokeStyle.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1StrokeStyle.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1StrokeStyle1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1StrokeStyle1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1StrokeStyle1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1StrokeStyle1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1SvgAttribute.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgAttribute.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1SvgAttribute.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgAttribute.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1SvgDocument.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgDocument.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1SvgDocument.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgDocument.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1SvgElement.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgElement.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1SvgElement.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgElement.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1SvgGlyphStyle.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgGlyphStyle.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1SvgGlyphStyle.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgGlyphStyle.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1SvgPaint.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgPaint.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1SvgPaint.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgPaint.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1SvgPathData.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgPathData.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1SvgPathData.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgPathData.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1SvgPointCollection.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgPointCollection.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1SvgPointCollection.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgPointCollection.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1SvgStrokeDashArray.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgStrokeDashArray.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1SvgStrokeDashArray.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SvgStrokeDashArray.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1TessellationSink.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TessellationSink.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1TessellationSink.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TessellationSink.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1Transform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Transform.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1Transform.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Transform.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1TransformGraph.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TransformGraph.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1TransformGraph.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TransformGraph.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1TransformNode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TransformNode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1TransformNode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TransformNode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1TransformedGeometry.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TransformedGeometry.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1TransformedGeometry.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TransformedGeometry.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1TransformedImageSource.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TransformedImageSource.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1TransformedImageSource.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TransformedImageSource.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ID2D1VertexBuffer.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1VertexBuffer.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ID2D1VertexBuffer.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1VertexBuffer.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/IWICImageEncoder.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImageEncoder.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/IWICImageEncoder.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImageEncoder.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/IWICImagingFactory2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/IWICImagingFactory2.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ImageBrushProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ImageBrushProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ImageBrushProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ImageBrushProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ImageSourceFromDxgiOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ImageSourceFromDxgiOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ImageSourceFromDxgiOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ImageSourceFromDxgiOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ImageSourceLoadingOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ImageSourceLoadingOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ImageSourceLoadingOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ImageSourceLoadingOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/InkBezierSegment.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/InkBezierSegment.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/InkBezierSegment.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/InkBezierSegment.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/InkNibShape.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/InkNibShape.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/InkNibShape.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/InkNibShape.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/InkPoint.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/InkPoint.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/InkPoint.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/InkPoint.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/InkStyleProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/InkStyleProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/InkStyleProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/InkStyleProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/InputDescription.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/InputDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/InputDescription.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/InputDescription.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/InputElementDescription.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/InputElementDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/InputElementDescription.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/InputElementDescription.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/InterpolationMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/InterpolationMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/InterpolationMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/InterpolationMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/InterpolationModeDefinition.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/InterpolationModeDefinition.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/InterpolationModeDefinition.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/InterpolationModeDefinition.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/LayerOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/LayerOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/LayerOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/LayerOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/LayerOptions1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/LayerOptions1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/LayerOptions1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/LayerOptions1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/LayerParameters.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/LayerParameters.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/LayerParameters.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/LayerParameters.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/LayerParameters1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/LayerParameters1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/LayerParameters1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/LayerParameters1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/LineJoin.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/LineJoin.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/LineJoin.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/LineJoin.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/LinearGradientBrushProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/LinearGradientBrushProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/LinearGradientBrushProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/LinearGradientBrushProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/LinearTransferProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/LinearTransferProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/LinearTransferProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/LinearTransferProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/LookupTable3DProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/LookupTable3DProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/LookupTable3DProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/LookupTable3DProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/MapOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/MapOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/MapOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/MapOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/MappedRect.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/MappedRect.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/MappedRect.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/MappedRect.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/MorphologyMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/MorphologyMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/MorphologyMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/MorphologyMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/MorphologyProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/MorphologyProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/MorphologyProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/MorphologyProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/OpacityMaskContent.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/OpacityMaskContent.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/OpacityMaskContent.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/OpacityMaskContent.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/OpacityMetadataProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/OpacityMetadataProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/OpacityMetadataProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/OpacityMetadataProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/OpacityProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/OpacityProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/OpacityProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/OpacityProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/Orientation.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Orientation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/Orientation.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/Orientation.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PatchEdgeMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PatchEdgeMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PatchEdgeMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PatchEdgeMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PerspectiveTransform3DInteroplationMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PerspectiveTransform3DInteroplationMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PerspectiveTransform3DInteroplationMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PerspectiveTransform3DInteroplationMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PerspectiveTransform3DProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PerspectiveTransform3DProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PerspectiveTransform3DProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PerspectiveTransform3DProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PixelOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PixelOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PixelOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PixelOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PointDescription.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PointDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PointDescription.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PointDescription.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PointDiffuseProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PointDiffuseProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PointDiffuseProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PointDiffuseProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PointDiffuseScaleMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PointDiffuseScaleMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PointDiffuseScaleMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PointDiffuseScaleMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PointSpecularProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PointSpecularProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PointSpecularProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PointSpecularProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PointSpecularScaleMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PointSpecularScaleMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PointSpecularScaleMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PointSpecularScaleMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PosterizeProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PosterizeProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PosterizeProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PosterizeProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PresentOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PresentOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PresentOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PresentOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PrimitiveBlend.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PrimitiveBlend.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PrimitiveBlend.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PrimitiveBlend.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PrintControlProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PrintControlProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PrintControlProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PrintControlProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PrintFontSubsetMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PrintFontSubsetMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PrintFontSubsetMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PrintFontSubsetMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/Property.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Property.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/Property.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/Property.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PropertyBinding.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PropertyBinding.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PropertyBinding.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PropertyBinding.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/PropertyType.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/PropertyType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/PropertyType.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/PropertyType.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/QuadraticBezierSegment.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/QuadraticBezierSegment.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/QuadraticBezierSegment.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/QuadraticBezierSegment.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/RadialGradientBrushProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/RadialGradientBrushProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/RadialGradientBrushProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/RadialGradientBrushProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/RenderTargetProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/RenderTargetProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/RenderTargetProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/RenderTargetProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/RenderTargetType.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/RenderTargetType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/RenderTargetType.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/RenderTargetType.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/RenderTargetUsage.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/RenderTargetUsage.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/RenderTargetUsage.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/RenderTargetUsage.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/RenderingControls.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/RenderingControls.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/RenderingControls.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/RenderingControls.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/RenderingPriority.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/RenderingPriority.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/RenderingPriority.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/RenderingPriority.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ResourceTextureProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ResourceTextureProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ResourceTextureProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ResourceTextureProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/RgbToHueOutputColorSpace.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/RgbToHueOutputColorSpace.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/RgbToHueOutputColorSpace.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/RgbToHueOutputColorSpace.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/RgbToHueProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/RgbToHueProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/RgbToHueProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/RgbToHueProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/RoundedRect.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/RoundedRect.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/RoundedRect.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/RoundedRect.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SaturationProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SaturationProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SaturationProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SaturationProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ScaleInterpolationMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ScaleInterpolationMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ScaleInterpolationMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ScaleInterpolationMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ScaleProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ScaleProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ScaleProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ScaleProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SepiaProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SepiaProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SepiaProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SepiaProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ShadowOptimization.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ShadowOptimization.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ShadowOptimization.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ShadowOptimization.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ShadowProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ShadowProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ShadowProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ShadowProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SharpenProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SharpenProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SharpenProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SharpenProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SimpleColorProfile.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SimpleColorProfile.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SimpleColorProfile.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SimpleColorProfile.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SpotDiffuseProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SpotDiffuseProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SpotDiffuseProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SpotDiffuseProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SpotDiffuseScaleMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SpotDiffuseScaleMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SpotDiffuseScaleMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SpotDiffuseScaleMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SpotSpecularProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SpotSpecularProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SpotSpecularProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SpotSpecularProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SpotSpecularScaleMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SpotSpecularScaleMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SpotSpecularScaleMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SpotSpecularScaleMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SpriteOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SpriteOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SpriteOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SpriteOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/StraightenProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/StraightenProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/StraightenProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/StraightenProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/StraightenScaleMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/StraightenScaleMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/StraightenScaleMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/StraightenScaleMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/StrokeStyleProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/StrokeStyleProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/StrokeStyleProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/StrokeStyleProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/StrokeStyleProperties1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/StrokeStyleProperties1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/StrokeStyleProperties1.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/StrokeStyleProperties1.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/StrokeTransformType.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/StrokeTransformType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/StrokeTransformType.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/StrokeTransformType.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SubProperty.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SubProperty.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SubProperty.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SubProperty.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgAspectAlign.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgAspectAlign.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgAspectAlign.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgAspectAlign.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgAspectScaling.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgAspectScaling.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgAspectScaling.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgAspectScaling.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgAttributePodType.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgAttributePodType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgAttributePodType.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgAttributePodType.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgAttributeStringType.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgAttributeStringType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgAttributeStringType.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgAttributeStringType.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgDisplay.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgDisplay.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgDisplay.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgDisplay.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgLength.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgLength.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgLength.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgLength.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgLengthUnits.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgLengthUnits.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgLengthUnits.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgLengthUnits.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgLineCap.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgLineCap.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgLineCap.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgLineCap.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgLineJoin.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgLineJoin.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgLineJoin.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgLineJoin.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgOverflow.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgOverflow.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgOverflow.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgOverflow.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgPaintType.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgPaintType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgPaintType.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgPaintType.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgPathCommand.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgPathCommand.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgPathCommand.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgPathCommand.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgPreserveAspectRatio.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgPreserveAspectRatio.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgPreserveAspectRatio.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgPreserveAspectRatio.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgUnitType.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgUnitType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgUnitType.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgUnitType.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgViewbox.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgViewbox.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgViewbox.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgViewbox.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SvgVisibility.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SvgVisibility.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SvgVisibility.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SvgVisibility.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/SweepDirection.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/SweepDirection.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/SweepDirection.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/SweepDirection.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/TableTransferProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/TableTransferProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/TableTransferProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/TableTransferProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/TemperatureandtintProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/TemperatureandtintProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/TemperatureandtintProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/TemperatureandtintProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/TextAntialiasMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/TextAntialiasMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/TextAntialiasMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/TextAntialiasMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/ThreadingMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ThreadingMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/ThreadingMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/ThreadingMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/TileProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/TileProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/TileProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/TileProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/TintProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/TintProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/TintProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/TintProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/Transform3DInterpolationMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Transform3DInterpolationMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/Transform3DInterpolationMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/Transform3DInterpolationMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/Transform3DProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Transform3DProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/Transform3DProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/Transform3DProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/TransformedImageSourceOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/TransformedImageSourceOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/TransformedImageSourceOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/TransformedImageSourceOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/TransformedImageSourceProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/TransformedImageSourceProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/TransformedImageSourceProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/TransformedImageSourceProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/Triangle.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Triangle.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/Triangle.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/Triangle.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/TurbulenceProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/TurbulenceProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/TurbulenceProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/TurbulenceProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/UnitMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/UnitMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/UnitMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/UnitMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/VertexBufferProperties.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/VertexBufferProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/VertexBufferProperties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/VertexBufferProperties.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/VertexOptions.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/VertexOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/VertexOptions.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/VertexOptions.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/VertexRange.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/VertexRange.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/VertexRange.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/VertexRange.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/VertexUsage.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/VertexUsage.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/VertexUsage.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/VertexUsage.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/VignetteProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/VignetteProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/VignetteProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/VignetteProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/WhiteLevelAdjustmentProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/WhiteLevelAdjustmentProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/WhiteLevelAdjustmentProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/WhiteLevelAdjustmentProp.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/WindowState.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/WindowState.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/WindowState.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/WindowState.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/YcbcrChromaSubsampling.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/YcbcrChromaSubsampling.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/YcbcrChromaSubsampling.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/YcbcrChromaSubsampling.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/YcbcrInterpolationMode.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/YcbcrInterpolationMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/YcbcrInterpolationMode.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/YcbcrInterpolationMode.cs
diff --git a/src/Vortice.Win32.Direct2D/Generated/YcbcrProp.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/YcbcrProp.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Generated/YcbcrProp.cs
rename to src/Vortice.Win32.Graphics.Direct2D/Generated/YcbcrProp.cs
diff --git a/src/Vortice.Win32.Direct2D/ID2D1DeviceContext.cs b/src/Vortice.Win32.Graphics.Direct2D/ID2D1DeviceContext.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/ID2D1DeviceContext.cs
rename to src/Vortice.Win32.Graphics.Direct2D/ID2D1DeviceContext.cs
diff --git a/src/Vortice.Win32.Direct2D/ID2D1Effect.cs b/src/Vortice.Win32.Graphics.Direct2D/ID2D1Effect.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/ID2D1Effect.cs
rename to src/Vortice.Win32.Graphics.Direct2D/ID2D1Effect.cs
diff --git a/src/Vortice.Win32.Direct2D/ID2D1EffectContext.cs b/src/Vortice.Win32.Graphics.Direct2D/ID2D1EffectContext.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/ID2D1EffectContext.cs
rename to src/Vortice.Win32.Graphics.Direct2D/ID2D1EffectContext.cs
diff --git a/src/Vortice.Win32.Direct2D/ID2D1Properties.cs b/src/Vortice.Win32.Graphics.Direct2D/ID2D1Properties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/ID2D1Properties.cs
rename to src/Vortice.Win32.Graphics.Direct2D/ID2D1Properties.cs
diff --git a/src/Vortice.Win32.Direct2D/ID2D1RenderTarget.cs b/src/Vortice.Win32.Graphics.Direct2D/ID2D1RenderTarget.cs
similarity index 100%
rename from src/Vortice.Win32.Direct2D/ID2D1RenderTarget.cs
rename to src/Vortice.Win32.Graphics.Direct2D/ID2D1RenderTarget.cs
diff --git a/src/Vortice.Win32.Direct2D/Vortice.Win32.Direct2D.csproj b/src/Vortice.Win32.Graphics.Direct2D/Vortice.Win32.Graphics.Direct2D.csproj
similarity index 100%
rename from src/Vortice.Win32.Direct2D/Vortice.Win32.Direct2D.csproj
rename to src/Vortice.Win32.Graphics.Direct2D/Vortice.Win32.Graphics.Direct2D.csproj
diff --git a/src/Vortice.Win32.Dxc/Apis.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Apis.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Apis.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Apis.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/Apis.Functions.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/Apis.Functions.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/Apis.Functions.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/Apis.Functions.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/Apis.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/Apis.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/Apis.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/Apis.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/DxcArgPair.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcArgPair.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/DxcArgPair.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcArgPair.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/DxcBuffer.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcBuffer.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/DxcBuffer.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcBuffer.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/DxcCp.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcCp.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/DxcCp.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcCp.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/DxcDefine.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcDefine.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/DxcDefine.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcDefine.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/DxcHashFlags.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcHashFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/DxcHashFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcHashFlags.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/DxcOutKind.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcOutKind.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/DxcOutKind.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcOutKind.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/DxcShaderHash.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcShaderHash.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/DxcShaderHash.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcShaderHash.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/DxcValidatorFlags.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcValidatorFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/DxcValidatorFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcValidatorFlags.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/DxcVersionInfoFlags.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcVersionInfoFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/DxcVersionInfoFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/DxcVersionInfoFlags.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcAssembler.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcAssembler.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcAssembler.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcAssembler.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcBlob.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcBlob.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcBlob.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcBlob.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcBlobEncoding.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcBlobEncoding.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcBlobEncoding.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcBlobEncoding.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcBlobUtf16.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcBlobUtf16.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcBlobUtf16.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcBlobUtf16.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcBlobUtf8.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcBlobUtf8.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcBlobUtf8.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcBlobUtf8.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcCompiler.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcCompiler.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcCompiler2.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler2.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcCompiler2.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler2.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcCompiler3.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler3.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcCompiler3.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompiler3.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcCompilerArgs.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompilerArgs.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcCompilerArgs.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcCompilerArgs.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcContainerBuilder.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcContainerBuilder.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcContainerBuilder.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcContainerBuilder.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcContainerReflection.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcContainerReflection.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcContainerReflection.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcContainerReflection.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcExtraOutputs.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcExtraOutputs.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcExtraOutputs.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcExtraOutputs.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcIncludeHandler.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcIncludeHandler.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcIncludeHandler.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcIncludeHandler.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcLibrary.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcLibrary.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcLibrary.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcLibrary.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcLinker.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcLinker.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcLinker.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcLinker.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcOperationResult.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOperationResult.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcOperationResult.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOperationResult.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcOptimizer.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOptimizer.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcOptimizer.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOptimizer.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcOptimizerPass.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOptimizerPass.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcOptimizerPass.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcOptimizerPass.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcPdbUtils.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcPdbUtils.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcPdbUtils.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcPdbUtils.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcResult.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcResult.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcResult.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcResult.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcUtils.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcUtils.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcUtils.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcUtils.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcValidator.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcValidator.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcValidator.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcValidator.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcValidator2.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcValidator2.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcValidator2.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcValidator2.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcVersionInfo.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcVersionInfo.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcVersionInfo.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcVersionInfo.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcVersionInfo2.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcVersionInfo2.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcVersionInfo2.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcVersionInfo2.cs
diff --git a/src/Vortice.Win32.Dxc/Generated/IDxcVersionInfo3.cs b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcVersionInfo3.cs
similarity index 100%
rename from src/Vortice.Win32.Dxc/Generated/IDxcVersionInfo3.cs
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Generated/IDxcVersionInfo3.cs
diff --git a/src/Vortice.Win32.Dxc/Vortice.Win32.Dxc.csproj b/src/Vortice.Win32.Graphics.Direct3D.Dxc/Vortice.Win32.Graphics.Direct3D.Dxc.csproj
similarity index 100%
rename from src/Vortice.Win32.Dxc/Vortice.Win32.Dxc.csproj
rename to src/Vortice.Win32.Graphics.Direct3D.Dxc/Vortice.Win32.Graphics.Direct3D.Dxc.csproj
diff --git a/src/Vortice.Win32.Direct3D11/Apis.Fxc.cs b/src/Vortice.Win32.Graphics.Direct3D11/Apis.Fxc.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Apis.Fxc.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Apis.Fxc.cs
diff --git a/src/Vortice.Win32.Direct3D11/Apis.cs b/src/Vortice.Win32.Graphics.Direct3D11/Apis.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Apis.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Apis.cs
diff --git a/src/Vortice.Win32.Direct3D11/BlendDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/BlendDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/BlendDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/BlendDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/BlendDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/BlendDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/BlendDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/BlendDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/BufferDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/BufferDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/BufferDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/BufferDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/DepthStencilDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/DepthStencilDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/DepthStencilDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/DepthStencilDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/DepthStencilOperationDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/DepthStencilOperationDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/DepthStencilOperationDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/DepthStencilOperationDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/DepthStencilViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/DepthStencilViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/DepthStencilViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/DepthStencilViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Direct3D11.Manual.cs b/src/Vortice.Win32.Graphics.Direct3D11/Direct3D11.Manual.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Direct3D11.Manual.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Direct3D11.Manual.cs
diff --git a/src/Vortice.Win32.Direct3D11/Direct3D11.xml b/src/Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml
similarity index 99%
rename from src/Vortice.Win32.Direct3D11/Direct3D11.xml
rename to src/Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml
index f736dc9..aacbce9 100644
--- a/src/Vortice.Win32.Direct3D11/Direct3D11.xml
+++ b/src/Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml
@@ -9898,7 +9898,7 @@ An empty box results in a no-op. A box is empty if the top value is greater than
   </member>
   <member name="ID3D11ShaderTrace::GetInitialRegisterContents">
     <summary>
-      <para name="pRegister">Retrieves the initial contents of the specified input register.</para>
+      <param name="pRegister">Retrieves the initial contents of the specified input register.</param>
       <para>Microsoft Docs: <see href="https://docs.microsoft.com/windows/win32/api//d3d11shadertracing/nf-d3d11shadertracing-id3d11shadertrace-getinitialregistercontents" /></para>
       <param name="pValue">A pointer to a  <a href="https://docs.microsoft.com/windows/desktop/api/d3d11shadertracing/ns-d3d11shadertracing-d3d11_trace_value">D3D11_TRACE_VALUE</a> structure. <b>GetInitialRegisterContents</b> fills the members of this structure with information about the initial contents.</param>
     </summary>
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AesCtrIv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AesCtrIv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AesCtrIv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AesCtrIv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Apis.Functions.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Apis.Functions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Apis.Functions.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Apis.Functions.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Apis.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Apis.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Apis.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Apis.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AsyncGetDataFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AsyncGetDataFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AsyncGetDataFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AsyncGetDataFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedChannelType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedChannelType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedChannelType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedChannelType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureAccessibleEncryptionInput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureAccessibleEncryptionInput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureAccessibleEncryptionInput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureAccessibleEncryptionInput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureCryptoSessionInput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureCryptoSessionInput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureCryptoSessionInput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureCryptoSessionInput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureInitializeInput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureInitializeInput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureInitializeInput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureInitializeInput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureInput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureInput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureInput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureInput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureProtectionInput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureProtectionInput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureProtectionInput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureProtectionInput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureSharedResourceInput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureSharedResourceInput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedConfigureSharedResourceInput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedConfigureSharedResourceInput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedProcessIdentifierType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedProcessIdentifierType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedProcessIdentifierType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedProcessIdentifierType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedProtectionFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedProtectionFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedProtectionFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedProtectionFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryAccessibilityEncryptionGuidCountOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryAccessibilityEncryptionGuidCountOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryAccessibilityEncryptionGuidCountOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryAccessibilityEncryptionGuidCountOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryAccessibilityEncryptionGuidInput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryAccessibilityEncryptionGuidInput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryAccessibilityEncryptionGuidInput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryAccessibilityEncryptionGuidInput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryAccessibilityEncryptionGuidOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryAccessibilityEncryptionGuidOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryAccessibilityEncryptionGuidOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryAccessibilityEncryptionGuidOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryAccessibilityOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryAccessibilityOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryAccessibilityOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryAccessibilityOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryChannelTypeOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryChannelTypeOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryChannelTypeOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryChannelTypeOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryCryptoSessionInput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryCryptoSessionInput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryCryptoSessionInput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryCryptoSessionInput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryCryptoSessionOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryCryptoSessionOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryCryptoSessionOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryCryptoSessionOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryCurrentAccessibilityEncryptionOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryCurrentAccessibilityEncryptionOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryCurrentAccessibilityEncryptionOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryCurrentAccessibilityEncryptionOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryDeviceHandleOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryDeviceHandleOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryDeviceHandleOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryDeviceHandleOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryInput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryInput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryInput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryInput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryOutputIdCountInput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryOutputIdCountInput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryOutputIdCountInput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryOutputIdCountInput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryOutputIdCountOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryOutputIdCountOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryOutputIdCountOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryOutputIdCountOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryOutputIdInput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryOutputIdInput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryOutputIdInput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryOutputIdInput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryOutputIdOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryOutputIdOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryOutputIdOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryOutputIdOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryProtectionOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryProtectionOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryProtectionOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryProtectionOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryRestrictedSharedResourceProcessCountOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryRestrictedSharedResourceProcessCountOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryRestrictedSharedResourceProcessCountOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryRestrictedSharedResourceProcessCountOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryRestrictedSharedResourceProcessInput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryRestrictedSharedResourceProcessInput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryRestrictedSharedResourceProcessInput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryRestrictedSharedResourceProcessInput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryRestrictedSharedResourceProcessOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryRestrictedSharedResourceProcessOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryRestrictedSharedResourceProcessOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryRestrictedSharedResourceProcessOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryUnrestrictedProtectedSharedResourceCountOutput.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryUnrestrictedProtectedSharedResourceCountOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/AuthenticatedQueryUnrestrictedProtectedSharedResourceCountOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/AuthenticatedQueryUnrestrictedProtectedSharedResourceCountOutput.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/BindFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/BindFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/BindFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/BindFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Blend.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Blend.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Blend.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Blend.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/BlendDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/BlendDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/BlendDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/BlendDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/BlendDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/BlendDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/BlendDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/BlendDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/BlendOperation.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/BlendOperation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/BlendOperation.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/BlendOperation.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Box.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Box.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Box.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Box.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/BufferDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/BufferDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/BufferExtendedSrv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferExtendedSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/BufferExtendedSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferExtendedSrv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/BufferExtendedSrvFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferExtendedSrvFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/BufferExtendedSrvFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferExtendedSrvFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/BufferRtv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/BufferRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferRtv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/BufferSrv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/BufferSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferSrv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/BufferUav.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferUav.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/BufferUav.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferUav.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/BufferUavFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferUavFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/BufferUavFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/BufferUavFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/BusType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/BusType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/BusType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/BusType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/CheckMultisampleQualityLevelsFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/CheckMultisampleQualityLevelsFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/CheckMultisampleQualityLevelsFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/CheckMultisampleQualityLevelsFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ClassInstanceDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ClassInstanceDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ClassInstanceDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ClassInstanceDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ClearFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ClearFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ClearFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ClearFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ColorWriteEnable.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ColorWriteEnable.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ColorWriteEnable.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ColorWriteEnable.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ComparisonFunction.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ComparisonFunction.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ComparisonFunction.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ComparisonFunction.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ComputeShaderTraceDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ComputeShaderTraceDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ComputeShaderTraceDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ComputeShaderTraceDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ConservativeRasterizationMode.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ConservativeRasterizationMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ConservativeRasterizationMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ConservativeRasterizationMode.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ConservativeRasterizationTier.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ConservativeRasterizationTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ConservativeRasterizationTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ConservativeRasterizationTier.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ContentProtectionCaps.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ContentProtectionCaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ContentProtectionCaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ContentProtectionCaps.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ContextType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ContextType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ContextType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ContextType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/CopyFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/CopyFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/CopyFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/CopyFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Counter.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Counter.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Counter.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Counter.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/CounterDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/CounterDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/CounterDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/CounterDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/CounterInfo.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/CounterInfo.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/CounterInfo.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/CounterInfo.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/CounterType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/CounterType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/CounterType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/CounterType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/CpuAccessFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/CpuAccessFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/CpuAccessFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/CpuAccessFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/CreateDeviceContextStateFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/CreateDeviceContextStateFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/CreateDeviceContextStateFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/CreateDeviceContextStateFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/CreateDeviceFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/CreateDeviceFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/CreateDeviceFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/CreateDeviceFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/CryptoSessionKeyExchangeFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/CryptoSessionKeyExchangeFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/CryptoSessionKeyExchangeFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/CryptoSessionKeyExchangeFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/CryptoSessionStatus.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/CryptoSessionStatus.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/CryptoSessionStatus.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/CryptoSessionStatus.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/CullMode.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/CullMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/CullMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/CullMode.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/DepthStencilDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/DepthStencilDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/DepthStencilDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/DepthStencilDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/DepthStencilOperationDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/DepthStencilOperationDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/DepthStencilOperationDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/DepthStencilOperationDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/DepthStencilViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/DepthStencilViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/DepthStencilViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/DepthStencilViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/DepthWriteMask.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/DepthWriteMask.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/DepthWriteMask.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/DepthWriteMask.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/DeviceContextType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/DeviceContextType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/DeviceContextType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/DeviceContextType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/DomainShaderTraceDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/DomainShaderTraceDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/DomainShaderTraceDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/DomainShaderTraceDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/DrawIndexedInstancedIndirectArgs.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/DrawIndexedInstancedIndirectArgs.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/DrawIndexedInstancedIndirectArgs.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/DrawIndexedInstancedIndirectArgs.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/DrawInstancedIndirectArgs.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/DrawInstancedIndirectArgs.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/DrawInstancedIndirectArgs.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/DrawInstancedIndirectArgs.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/DsvDimension.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/DsvDimension.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/DsvDimension.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/DsvDimension.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/DsvFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/DsvFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/DsvFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/DsvFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/EncryptedBlockInfo.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/EncryptedBlockInfo.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/EncryptedBlockInfo.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/EncryptedBlockInfo.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Feature.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Feature.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Feature.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Feature.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataArchitectureInfo.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataArchitectureInfo.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataArchitectureInfo.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataArchitectureInfo.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D10XHardwareOptions.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D10XHardwareOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D10XHardwareOptions.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D10XHardwareOptions.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D11Options.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D11Options.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D11Options.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D11Options.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D11Options1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D11Options1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D11Options1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D11Options1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D11Options2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D11Options2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D11Options2.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D11Options2.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D11Options3.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D11Options3.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D11Options3.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D11Options3.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D11Options4.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D11Options4.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D11Options4.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D11Options4.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D11Options5.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D11Options5.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3D11Options5.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3D11Options5.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3d9Options.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3d9Options.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3d9Options.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3d9Options.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3d9Options1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3d9Options1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3d9Options1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3d9Options1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3d9ShadowSupport.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3d9ShadowSupport.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3d9ShadowSupport.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3d9ShadowSupport.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3d9SimpleInstancingSupport.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3d9SimpleInstancingSupport.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataD3d9SimpleInstancingSupport.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataD3d9SimpleInstancingSupport.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataDisplayable.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataDisplayable.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataDisplayable.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataDisplayable.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataDoubles.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataDoubles.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataDoubles.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataDoubles.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataFormatSupport.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataFormatSupport.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataFormatSupport.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataFormatSupport.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataFormatSupport2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataFormatSupport2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataFormatSupport2.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataFormatSupport2.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataGpuVirtualAddressSupport.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataGpuVirtualAddressSupport.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataGpuVirtualAddressSupport.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataGpuVirtualAddressSupport.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataMarkerSupport.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataMarkerSupport.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataMarkerSupport.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataMarkerSupport.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataShaderCache.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataShaderCache.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataShaderCache.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataShaderCache.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataShaderMinPrecisionSupport.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataShaderMinPrecisionSupport.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataShaderMinPrecisionSupport.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataShaderMinPrecisionSupport.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataThreading.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataThreading.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataThreading.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataThreading.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureDataVideoDecoderHistogram.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataVideoDecoderHistogram.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureDataVideoDecoderHistogram.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureDataVideoDecoderHistogram.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FeatureVideo.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureVideo.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FeatureVideo.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FeatureVideo.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FenceFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FenceFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FenceFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FenceFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FillMode.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FillMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FillMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FillMode.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Filter.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Filter.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Filter.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Filter.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FilterReductionType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FilterReductionType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FilterReductionType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FilterReductionType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FilterType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FilterType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FilterType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FilterType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FormatSupport.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FormatSupport.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FormatSupport.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FormatSupport.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FormatSupport2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FormatSupport2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FormatSupport2.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FormatSupport2.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/FunctionDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/FunctionDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/FunctionDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/FunctionDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/GeometryShaderTraceDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/GeometryShaderTraceDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/GeometryShaderTraceDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/GeometryShaderTraceDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/HullShaderTraceDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/HullShaderTraceDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/HullShaderTraceDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/HullShaderTraceDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Asynchronous.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Asynchronous.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Asynchronous.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Asynchronous.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11AuthenticatedChannel.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11AuthenticatedChannel.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11AuthenticatedChannel.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11AuthenticatedChannel.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11BlendState.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11BlendState.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11BlendState.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11BlendState.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11BlendState1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11BlendState1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11BlendState1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11BlendState1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Buffer.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Buffer.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Buffer.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Buffer.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11ClassInstance.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ClassInstance.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11ClassInstance.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ClassInstance.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11ClassLinkage.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ClassLinkage.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11ClassLinkage.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ClassLinkage.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11CommandList.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11CommandList.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11CommandList.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11CommandList.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11ComputeShader.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ComputeShader.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11ComputeShader.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ComputeShader.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Counter.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Counter.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Counter.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Counter.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11CryptoSession.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11CryptoSession.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11CryptoSession.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11CryptoSession.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Debug.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Debug.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Debug.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Debug.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11DepthStencilState.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DepthStencilState.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11DepthStencilState.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DepthStencilState.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11DepthStencilView.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DepthStencilView.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11DepthStencilView.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DepthStencilView.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Device.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Device.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Device1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Device1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Device2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Device2.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device2.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Device3.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device3.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Device3.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device3.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Device4.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device4.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Device4.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device4.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Device5.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device5.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Device5.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Device5.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11DeviceChild.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceChild.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11DeviceChild.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceChild.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11DeviceContext.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11DeviceContext.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11DeviceContext1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11DeviceContext1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11DeviceContext2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11DeviceContext2.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11DeviceContext3.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11DeviceContext3.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11DeviceContext4.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11DeviceContext4.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11DomainShader.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DomainShader.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11DomainShader.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DomainShader.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Fence.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Fence.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Fence.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Fence.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11FunctionLinkingGraph.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11FunctionLinkingGraph.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11FunctionLinkingGraph.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11FunctionLinkingGraph.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11FunctionParameterReflection.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11FunctionParameterReflection.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11FunctionParameterReflection.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11FunctionParameterReflection.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11FunctionReflection.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11FunctionReflection.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11FunctionReflection.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11FunctionReflection.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11GeometryShader.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11GeometryShader.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11GeometryShader.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11GeometryShader.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11HullShader.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11HullShader.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11HullShader.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11HullShader.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11InfoQueue.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11InfoQueue.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11InfoQueue.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11InfoQueue.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11InputLayout.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11InputLayout.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11InputLayout.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11InputLayout.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11LibraryReflection.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11LibraryReflection.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11LibraryReflection.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11LibraryReflection.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Linker.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Linker.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Linker.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Linker.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11LinkingNode.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11LinkingNode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11LinkingNode.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11LinkingNode.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Module.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Module.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Module.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Module.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11ModuleInstance.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ModuleInstance.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11ModuleInstance.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ModuleInstance.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Multithread.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Multithread.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Multithread.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Multithread.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11PixelShader.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11PixelShader.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11PixelShader.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11PixelShader.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Predicate.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Predicate.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Predicate.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Predicate.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Query.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Query.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Query.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Query.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Query1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Query1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Query1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Query1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11RasterizerState.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RasterizerState.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11RasterizerState.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RasterizerState.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11RasterizerState1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RasterizerState1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11RasterizerState1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RasterizerState1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11RasterizerState2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RasterizerState2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11RasterizerState2.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RasterizerState2.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11RefDefaultTrackingOptions.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RefDefaultTrackingOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11RefDefaultTrackingOptions.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RefDefaultTrackingOptions.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11RefTrackingOptions.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RefTrackingOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11RefTrackingOptions.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RefTrackingOptions.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11RenderTargetView.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RenderTargetView.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11RenderTargetView.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RenderTargetView.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11RenderTargetView1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RenderTargetView1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11RenderTargetView1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11RenderTargetView1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Resource.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Resource.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Resource.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Resource.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11SamplerState.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11SamplerState.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11SamplerState.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11SamplerState.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderReflection.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderReflection.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderReflection.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderReflection.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderReflectionConstantBuffer.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderReflectionConstantBuffer.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderReflectionConstantBuffer.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderReflectionConstantBuffer.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderReflectionType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderReflectionType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderReflectionType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderReflectionType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderReflectionVariable.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderReflectionVariable.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderReflectionVariable.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderReflectionVariable.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderResourceView.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderResourceView.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderResourceView.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderResourceView.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderResourceView1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderResourceView1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderResourceView1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderResourceView1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderTrace.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderTrace.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderTrace.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderTrace.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderTraceFactory.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderTraceFactory.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11ShaderTraceFactory.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11ShaderTraceFactory.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11SwitchToRef.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11SwitchToRef.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11SwitchToRef.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11SwitchToRef.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Texture1D.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Texture1D.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Texture1D.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Texture1D.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Texture2D.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Texture2D.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Texture2D.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Texture2D.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Texture2D1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Texture2D1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Texture2D1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Texture2D1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Texture3D.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Texture3D.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Texture3D.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Texture3D.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11Texture3D1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Texture3D1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11Texture3D1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11Texture3D1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11TracingDevice.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11TracingDevice.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11TracingDevice.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11TracingDevice.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11UnorderedAccessView.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11UnorderedAccessView.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11UnorderedAccessView.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11UnorderedAccessView.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11UnorderedAccessView1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11UnorderedAccessView1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11UnorderedAccessView1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11UnorderedAccessView1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VertexShader.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VertexShader.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VertexShader.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VertexShader.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoContext.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoContext.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoContext1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoContext1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoContext2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoContext2.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext2.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoContext3.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext3.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoContext3.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext3.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoDecoder.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoDecoder.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoDecoder.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoDecoder.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoDecoderOutputView.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoDecoderOutputView.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoDecoderOutputView.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoDecoderOutputView.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoDevice.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoDevice.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoDevice.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoDevice.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoDevice1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoDevice1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoDevice1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoDevice1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoDevice2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoDevice2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoDevice2.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoDevice2.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoProcessor.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoProcessor.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoProcessor.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoProcessor.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoProcessorEnumerator.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoProcessorEnumerator.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoProcessorEnumerator.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoProcessorEnumerator.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoProcessorEnumerator1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoProcessorEnumerator1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoProcessorEnumerator1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoProcessorEnumerator1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoProcessorInputView.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoProcessorInputView.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoProcessorInputView.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoProcessorInputView.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoProcessorOutputView.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoProcessorOutputView.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11VideoProcessorOutputView.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoProcessorOutputView.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3D11View.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11View.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3D11View.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11View.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3DDeviceContextState.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3DDeviceContextState.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3DDeviceContextState.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3DDeviceContextState.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ID3DUserDefinedAnnotation.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3DUserDefinedAnnotation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ID3DUserDefinedAnnotation.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3DUserDefinedAnnotation.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/InfoQueueFilter.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/InfoQueueFilter.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/InfoQueueFilter.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/InfoQueueFilter.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/InfoQueueFilterDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/InfoQueueFilterDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/InfoQueueFilterDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/InfoQueueFilterDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/InputClassification.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/InputClassification.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/InputClassification.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/InputClassification.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/InputElementDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/InputElementDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/InputElementDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/InputElementDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/KeyExchangeHWProtectionData.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/KeyExchangeHWProtectionData.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/KeyExchangeHWProtectionData.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/KeyExchangeHWProtectionData.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/KeyExchangeHWProtectionInputData.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/KeyExchangeHWProtectionInputData.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/KeyExchangeHWProtectionInputData.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/KeyExchangeHWProtectionInputData.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/KeyExchangeHWProtectionOutputData.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/KeyExchangeHWProtectionOutputData.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/KeyExchangeHWProtectionOutputData.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/KeyExchangeHWProtectionOutputData.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/LibraryDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/LibraryDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/LibraryDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/LibraryDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/LogicOperation.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/LogicOperation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/LogicOperation.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/LogicOperation.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/MapFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/MapFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/MapFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/MapFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/MapMode.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/MapMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/MapMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/MapMode.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/MappedSubresource.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/MappedSubresource.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/MappedSubresource.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/MappedSubresource.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Message.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Message.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Message.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Message.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/MessageCategory.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/MessageCategory.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/MessageCategory.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/MessageCategory.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/MessageId.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/MessageId.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/MessageId.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/MessageId.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/MessageSeverity.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/MessageSeverity.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/MessageSeverity.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/MessageSeverity.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Omac.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Omac.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Omac.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Omac.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/PackedMipDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/PackedMipDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/PackedMipDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/PackedMipDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ParameterDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ParameterDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ParameterDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ParameterDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/PixelShaderTraceDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/PixelShaderTraceDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/PixelShaderTraceDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/PixelShaderTraceDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/QueryDataPipelineStatistics.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryDataPipelineStatistics.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/QueryDataPipelineStatistics.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryDataPipelineStatistics.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/QueryDataSOStatistics.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryDataSOStatistics.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/QueryDataSOStatistics.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryDataSOStatistics.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/QueryDataTimestampDisjoint.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryDataTimestampDisjoint.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/QueryDataTimestampDisjoint.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryDataTimestampDisjoint.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/QueryDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/QueryDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/QueryDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/QueryDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/QueryMiscFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryMiscFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/QueryMiscFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryMiscFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/QueryType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/QueryType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/QueryType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/RaiseFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/RaiseFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/RaiseFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/RaiseFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/RasterizerDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/RasterizerDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/RasterizerDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/RasterizerDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/RasterizerDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/RasterizerDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/RasterizerDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/RasterizerDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/RasterizerDescription2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/RasterizerDescription2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/RasterizerDescription2.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/RasterizerDescription2.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/RenderTargetBlendDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/RenderTargetBlendDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/RenderTargetBlendDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/RenderTargetBlendDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/RenderTargetBlendDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/RenderTargetBlendDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/RenderTargetBlendDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/RenderTargetBlendDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/RenderTargetViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/RenderTargetViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/RenderTargetViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/RenderTargetViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/RenderTargetViewDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/RenderTargetViewDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/RenderTargetViewDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/RenderTargetViewDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ReportLiveDeviceObjectFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ReportLiveDeviceObjectFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ReportLiveDeviceObjectFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ReportLiveDeviceObjectFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ResourceDimension.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ResourceDimension.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ResourceDimension.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ResourceDimension.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ResourceMiscFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ResourceMiscFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ResourceMiscFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ResourceMiscFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/RtvDimension.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/RtvDimension.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/RtvDimension.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/RtvDimension.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/SODeclarationEntry.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/SODeclarationEntry.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/SODeclarationEntry.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/SODeclarationEntry.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/SamplerDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/SamplerDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/SamplerDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/SamplerDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderBufferDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderBufferDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderBufferDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderBufferDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderCacheSupportFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderCacheSupportFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderCacheSupportFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderCacheSupportFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderInputBindDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderInputBindDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderInputBindDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderInputBindDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderMinPrecisionSupport.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderMinPrecisionSupport.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderMinPrecisionSupport.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderMinPrecisionSupport.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderResourceViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderResourceViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderResourceViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderResourceViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderResourceViewDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderResourceViewDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderResourceViewDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderResourceViewDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderTraceDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderTraceDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderTraceDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderTraceDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderTrackingOptions.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderTrackingOptions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderTrackingOptions.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderTrackingOptions.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderTrackingResourceType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderTrackingResourceType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderTrackingResourceType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderTrackingResourceType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderTypeDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderTypeDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderTypeDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderTypeDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderVariableDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderVariableDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderVariableDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderVariableDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/ShaderVersionType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderVersionType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/ShaderVersionType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/ShaderVersionType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/SharedResourceTier.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/SharedResourceTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/SharedResourceTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/SharedResourceTier.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/SignatureParameterDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/SignatureParameterDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/SignatureParameterDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/SignatureParameterDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/StandardMultisampleQualityLevels.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/StandardMultisampleQualityLevels.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/StandardMultisampleQualityLevels.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/StandardMultisampleQualityLevels.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/StencilOperation.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/StencilOperation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/StencilOperation.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/StencilOperation.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/SubresourceData.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/SubresourceData.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/SubresourceData.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/SubresourceData.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/SubresourceTiling.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/SubresourceTiling.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/SubresourceTiling.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/SubresourceTiling.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture1DArrayDsv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DArrayDsv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture1DArrayDsv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DArrayDsv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture1DArrayRtv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DArrayRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture1DArrayRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DArrayRtv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture1DArraySrv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DArraySrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture1DArraySrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DArraySrv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture1DArrayUav.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DArrayUav.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture1DArrayUav.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DArrayUav.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture1DDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture1DDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture1DDsv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DDsv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture1DDsv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DDsv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture1DRtv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture1DRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DRtv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture1DSrv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture1DSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DSrv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture1DUav.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DUav.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture1DUav.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture1DUav.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DArrayDsv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArrayDsv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DArrayDsv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArrayDsv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DArrayRtv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArrayRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DArrayRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArrayRtv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DArrayRtv1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArrayRtv1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DArrayRtv1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArrayRtv1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DArraySrv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArraySrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DArraySrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArraySrv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DArraySrv1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArraySrv1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DArraySrv1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArraySrv1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DArrayUav.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArrayUav.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DArrayUav.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArrayUav.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DArrayUav1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArrayUav1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DArrayUav1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArrayUav1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DArrayVpov.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArrayVpov.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DArrayVpov.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DArrayVpov.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DDsv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DDsv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DDsv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DDsv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DMsArrayDsv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DMsArrayDsv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DMsArrayDsv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DMsArrayDsv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DMsArrayRtv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DMsArrayRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DMsArrayRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DMsArrayRtv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DMsArraySrv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DMsArraySrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DMsArraySrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DMsArraySrv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DMsDsv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DMsDsv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DMsDsv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DMsDsv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DMsRtv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DMsRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DMsRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DMsRtv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DMsSrv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DMsSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DMsSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DMsSrv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DRtv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DRtv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DRtv1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DRtv1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DRtv1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DRtv1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DSrv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DSrv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DSrv1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DSrv1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DSrv1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DSrv1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DUav.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DUav.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DUav.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DUav.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DUav1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DUav1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DUav1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DUav1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DVdov.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DVdov.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DVdov.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DVdov.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DVpiv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DVpiv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DVpiv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DVpiv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture2DVpov.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DVpov.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture2DVpov.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture2DVpov.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture3DDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture3DDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture3DDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture3DDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture3DDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture3DDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture3DDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture3DDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture3DRtv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture3DRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture3DRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture3DRtv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture3DSrv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture3DSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture3DSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture3DSrv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Texture3DUav.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture3DUav.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Texture3DUav.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Texture3DUav.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TextureAddressMode.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TextureAddressMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TextureAddressMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TextureAddressMode.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TextureCubeFace.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TextureCubeFace.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TextureCubeFace.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TextureCubeFace.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TextureLayout.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TextureLayout.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TextureLayout.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TextureLayout.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TexureCubeArraySrv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TexureCubeArraySrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TexureCubeArraySrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TexureCubeArraySrv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TexureCubeSrv.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TexureCubeSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TexureCubeSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TexureCubeSrv.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TileCopyFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TileCopyFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TileCopyFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TileCopyFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TileMappingFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TileMappingFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TileMappingFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TileMappingFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TileRangeFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TileRangeFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TileRangeFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TileRangeFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TileRegionSize.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TileRegionSize.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TileRegionSize.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TileRegionSize.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TileShape.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TileShape.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TileShape.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TileShape.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TiledResourceCoordinate.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TiledResourceCoordinate.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TiledResourceCoordinate.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TiledResourceCoordinate.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TiledResourcesTier.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TiledResourcesTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TiledResourcesTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TiledResourcesTier.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TraceGSInputPrimitive.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TraceGSInputPrimitive.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TraceGSInputPrimitive.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TraceGSInputPrimitive.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TraceRegister.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TraceRegister.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TraceRegister.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TraceRegister.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TraceRegisterType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TraceRegisterType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TraceRegisterType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TraceRegisterType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TraceStats.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TraceStats.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TraceStats.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TraceStats.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TraceStep.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TraceStep.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TraceStep.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TraceStep.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/TraceValue.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/TraceValue.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/TraceValue.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/TraceValue.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/UavDimension.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/UavDimension.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/UavDimension.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/UavDimension.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/UnorderedAccessViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/UnorderedAccessViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/UnorderedAccessViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/UnorderedAccessViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/UnorderedAccessViewDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/UnorderedAccessViewDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/UnorderedAccessViewDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/UnorderedAccessViewDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/Usage.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Usage.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/Usage.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/Usage.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VdovDimension.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VdovDimension.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VdovDimension.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VdovDimension.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VertexShaderTraceDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VertexShaderTraceDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VertexShaderTraceDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VertexShaderTraceDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoColor.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoColor.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoColor.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoColor.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoColorRgba.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoColorRgba.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoColorRgba.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoColorRgba.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoColorYcbcra.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoColorYcbcra.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoColorYcbcra.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoColorYcbcra.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoContentProtectionCaps.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoContentProtectionCaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoContentProtectionCaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoContentProtectionCaps.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoDecoderBeginFrameCryptoSession.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderBeginFrameCryptoSession.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoDecoderBeginFrameCryptoSession.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderBeginFrameCryptoSession.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoDecoderBufferDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderBufferDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoDecoderBufferDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderBufferDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoDecoderBufferDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderBufferDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoDecoderBufferDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderBufferDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoDecoderBufferDescription2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderBufferDescription2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoDecoderBufferDescription2.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderBufferDescription2.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoDecoderBufferType.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderBufferType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoDecoderBufferType.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderBufferType.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoDecoderCaps.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderCaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoDecoderCaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderCaps.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoDecoderConfig.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderConfig.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoDecoderConfig.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderConfig.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoDecoderDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoDecoderDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoDecoderExtension.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderExtension.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoDecoderExtension.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderExtension.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoDecoderHistogramComponent.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderHistogramComponent.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoDecoderHistogramComponent.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderHistogramComponent.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoDecoderHistogramComponentFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderHistogramComponentFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoDecoderHistogramComponentFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderHistogramComponentFlags.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoDecoderOutputViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderOutputViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoDecoderOutputViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderOutputViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoDecoderSubSampleMappingBlock.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderSubSampleMappingBlock.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoDecoderSubSampleMappingBlock.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoDecoderSubSampleMappingBlock.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoFrameFormat.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoFrameFormat.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoFrameFormat.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoFrameFormat.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorAlphaFillMode.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorAlphaFillMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorAlphaFillMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorAlphaFillMode.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorAutoStreamCaps.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorAutoStreamCaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorAutoStreamCaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorAutoStreamCaps.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorBehaviorHints.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorBehaviorHints.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorBehaviorHints.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorBehaviorHints.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorCaps.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorCaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorCaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorCaps.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorColorSpace.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorColorSpace.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorColorSpace.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorColorSpace.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorContentDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorContentDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorContentDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorContentDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorCustomRate.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorCustomRate.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorCustomRate.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorCustomRate.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorDeviceCaps.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorDeviceCaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorDeviceCaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorDeviceCaps.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorFeatureCaps.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorFeatureCaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorFeatureCaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorFeatureCaps.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorFilter.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorFilter.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorFilter.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorFilter.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorFilterCaps.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorFilterCaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorFilterCaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorFilterCaps.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorFilterRange.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorFilterRange.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorFilterRange.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorFilterRange.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorFormatCaps.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorFormatCaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorFormatCaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorFormatCaps.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorFormatSupport.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorFormatSupport.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorFormatSupport.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorFormatSupport.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorInputViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorInputViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorInputViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorInputViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorItelecineCaps.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorItelecineCaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorItelecineCaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorItelecineCaps.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorNominalRange.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorNominalRange.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorNominalRange.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorNominalRange.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorOutputRate.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorOutputRate.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorOutputRate.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorOutputRate.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorOutputViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorOutputViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorOutputViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorOutputViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorProcessorCaps.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorProcessorCaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorProcessorCaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorProcessorCaps.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorRateConversionCaps.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorRateConversionCaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorRateConversionCaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorRateConversionCaps.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorRotation.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorRotation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorRotation.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorRotation.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorStereoCaps.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorStereoCaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorStereoCaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorStereoCaps.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorStereoFlipMode.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorStereoFlipMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorStereoFlipMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorStereoFlipMode.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorStereoFormat.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorStereoFormat.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorStereoFormat.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorStereoFormat.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorStream.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorStream.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorStream.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorStream.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoProcessorStreamBehaviorHint.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorStreamBehaviorHint.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoProcessorStreamBehaviorHint.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoProcessorStreamBehaviorHint.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoSampleDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoSampleDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoSampleDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoSampleDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VideoUsage.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoUsage.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VideoUsage.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VideoUsage.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VpivDimension.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VpivDimension.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VpivDimension.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VpivDimension.cs
diff --git a/src/Vortice.Win32.Direct3D11/Generated/VpovDimension.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/VpovDimension.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Generated/VpovDimension.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Generated/VpovDimension.cs
diff --git a/src/Vortice.Win32.Direct3D11/ID3D11Device.cs b/src/Vortice.Win32.Graphics.Direct3D11/ID3D11Device.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/ID3D11Device.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/ID3D11Device.cs
diff --git a/src/Vortice.Win32.Direct3D11/ID3D11DeviceChild.cs b/src/Vortice.Win32.Graphics.Direct3D11/ID3D11DeviceChild.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/ID3D11DeviceChild.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/ID3D11DeviceChild.cs
diff --git a/src/Vortice.Win32.Direct3D11/ID3D11DeviceContext.cs b/src/Vortice.Win32.Graphics.Direct3D11/ID3D11DeviceContext.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/ID3D11DeviceContext.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/ID3D11DeviceContext.cs
diff --git a/src/Vortice.Win32.Direct3D11/ID3D11Texture1D.cs b/src/Vortice.Win32.Graphics.Direct3D11/ID3D11Texture1D.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/ID3D11Texture1D.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/ID3D11Texture1D.cs
diff --git a/src/Vortice.Win32.Direct3D11/ID3D11Texture2D.cs b/src/Vortice.Win32.Graphics.Direct3D11/ID3D11Texture2D.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/ID3D11Texture2D.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/ID3D11Texture2D.cs
diff --git a/src/Vortice.Win32.Direct3D11/ID3D11Texture3D.cs b/src/Vortice.Win32.Graphics.Direct3D11/ID3D11Texture3D.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/ID3D11Texture3D.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/ID3D11Texture3D.cs
diff --git a/src/Vortice.Win32.Direct3D11/MappedSubresource.cs b/src/Vortice.Win32.Graphics.Direct3D11/MappedSubresource.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/MappedSubresource.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/MappedSubresource.cs
diff --git a/src/Vortice.Win32.Direct3D11/QueryDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/QueryDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/QueryDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/QueryDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/QueryDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/QueryDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/QueryDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/QueryDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/RasterizerDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/RasterizerDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/RasterizerDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/RasterizerDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/RasterizerDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/RasterizerDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/RasterizerDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/RasterizerDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/RasterizerDescription2.cs b/src/Vortice.Win32.Graphics.Direct3D11/RasterizerDescription2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/RasterizerDescription2.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/RasterizerDescription2.cs
diff --git a/src/Vortice.Win32.Direct3D11/RenderTargetViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/RenderTargetViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/RenderTargetViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/RenderTargetViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/SamplerDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/SamplerDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/SamplerDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/SamplerDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/ShaderResourceViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/ShaderResourceViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/ShaderResourceViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/ShaderResourceViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Texture1DDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Texture1DDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Texture1DDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Texture1DDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Texture2DDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Texture2DDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Texture2DDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Texture2DDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Texture2DDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Texture2DDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Texture2DDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Texture2DDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/Texture3DDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/Texture3DDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Texture3DDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Texture3DDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Texture3DDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Texture3DDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Texture3DDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/Texture3DDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D11/UnorderedAccessViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D11/UnorderedAccessViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/UnorderedAccessViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D11/UnorderedAccessViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D11/Vortice.Win32.Direct3D11.csproj b/src/Vortice.Win32.Graphics.Direct3D11/Vortice.Win32.Graphics.Direct3D11.csproj
similarity index 100%
rename from src/Vortice.Win32.Direct3D11/Vortice.Win32.Direct3D11.csproj
rename to src/Vortice.Win32.Graphics.Direct3D11/Vortice.Win32.Graphics.Direct3D11.csproj
diff --git a/src/Vortice.Win32.Direct3D11on12/Apis.cs b/src/Vortice.Win32.Graphics.Direct3D11on12/Apis.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11on12/Apis.cs
rename to src/Vortice.Win32.Graphics.Direct3D11on12/Apis.cs
diff --git a/src/Vortice.Win32.Direct3D11on12/Generated/Apis.Functions.cs b/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/Apis.Functions.cs
similarity index 87%
rename from src/Vortice.Win32.Direct3D11on12/Generated/Apis.Functions.cs
rename to src/Vortice.Win32.Graphics.Direct3D11on12/Generated/Apis.Functions.cs
index bba283c..b698b5e 100644
--- a/src/Vortice.Win32.Direct3D11on12/Generated/Apis.Functions.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/Apis.Functions.cs
@@ -11,7 +11,7 @@ namespace Win32.Graphics.Direct3D11on12;
 
 public static unsafe partial class Apis
 {
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11On12CreateDevice"]/*' />
+	/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11On12CreateDevice"]/*' />
 	[DllImport("d3d11.dll", ExactSpelling = true)]
 	public static extern HResult D3D11On12CreateDevice(IUnknown* pDevice, Graphics.Direct3D11.CreateDeviceFlags Flags, Graphics.Direct3D.FeatureLevel* pFeatureLevels, uint FeatureLevels, IUnknown** ppCommandQueues, uint NumQueues, uint NodeMask, Graphics.Direct3D11.ID3D11Device** ppDevice, Graphics.Direct3D11.ID3D11DeviceContext** ppImmediateContext, Graphics.Direct3D.FeatureLevel* pChosenFeatureLevel);
 }
diff --git a/src/Vortice.Win32.Direct3D11on12/Generated/Apis.cs b/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/Apis.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D11on12/Generated/Apis.cs
rename to src/Vortice.Win32.Graphics.Direct3D11on12/Generated/Apis.cs
diff --git a/src/Vortice.Win32.Direct3D11on12/Generated/ID3D11On12Device.cs b/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/ID3D11On12Device.cs
similarity index 86%
rename from src/Vortice.Win32.Direct3D11on12/Generated/ID3D11On12Device.cs
rename to src/Vortice.Win32.Graphics.Direct3D11on12/Generated/ID3D11On12Device.cs
index 300f94c..f173f3d 100644
--- a/src/Vortice.Win32.Direct3D11on12/Generated/ID3D11On12Device.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/ID3D11On12Device.cs
@@ -9,7 +9,7 @@
 
 namespace Win32.Graphics.Direct3D11on12;
 
-/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device"]/*' />
+/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device"]/*' />
 /// <unmanaged>ID3D11On12Device</unmanaged>
 [Guid("85611e73-70a9-490e-9614-a9e302777904")]
 [NativeTypeName("struct ID3D11On12Device : IUnknown")]
@@ -74,7 +74,7 @@ public unsafe partial struct ID3D11On12Device : INativeGuid
 		return ((delegate* unmanaged[Stdcall]<IUnknown*, uint>)(lpVtbl[2]))((IUnknown*)Unsafe.AsPointer(ref this));
 	}
 
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device::CreateWrappedResource"]/*' />
+	/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device::CreateWrappedResource"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
 	public HResult CreateWrappedResource(IUnknown* pResource12, ResourceFlags* pFlags11, Graphics.Direct3D12.ResourceStates InState, Graphics.Direct3D12.ResourceStates OutState, Guid* riid, void** ppResource11)
@@ -82,7 +82,7 @@ public unsafe partial struct ID3D11On12Device : INativeGuid
 		return ((delegate* unmanaged[Stdcall]<ID3D11On12Device*, IUnknown*, ResourceFlags*, Graphics.Direct3D12.ResourceStates, Graphics.Direct3D12.ResourceStates, Guid*, void**, int>)(lpVtbl[3]))((ID3D11On12Device*)Unsafe.AsPointer(ref this), pResource12, pFlags11, InState, OutState, riid, ppResource11);
 	}
 
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device::ReleaseWrappedResources"]/*' />
+	/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device::ReleaseWrappedResources"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
 	public void ReleaseWrappedResources(Graphics.Direct3D11.ID3D11Resource** ppResources, uint NumResources)
@@ -90,7 +90,7 @@ public unsafe partial struct ID3D11On12Device : INativeGuid
 		((delegate* unmanaged[Stdcall]<ID3D11On12Device*, Graphics.Direct3D11.ID3D11Resource**, uint, void>)(lpVtbl[4]))((ID3D11On12Device*)Unsafe.AsPointer(ref this), ppResources, NumResources);
 	}
 
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device::AcquireWrappedResources"]/*' />
+	/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device::AcquireWrappedResources"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
 	public void AcquireWrappedResources(Graphics.Direct3D11.ID3D11Resource** ppResources, uint NumResources)
diff --git a/src/Vortice.Win32.Direct3D11on12/Generated/ID3D11On12Device1.cs b/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/ID3D11On12Device1.cs
similarity index 93%
rename from src/Vortice.Win32.Direct3D11on12/Generated/ID3D11On12Device1.cs
rename to src/Vortice.Win32.Graphics.Direct3D11on12/Generated/ID3D11On12Device1.cs
index bef4272..76f3655 100644
--- a/src/Vortice.Win32.Direct3D11on12/Generated/ID3D11On12Device1.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/ID3D11On12Device1.cs
@@ -9,7 +9,7 @@
 
 namespace Win32.Graphics.Direct3D11on12;
 
-/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device1"]/*' />
+/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device1"]/*' />
 /// <unmanaged>ID3D11On12Device1</unmanaged>
 [Guid("bdb64df4-ea2f-4c70-b861-aaab1258bb5d")]
 [NativeTypeName("struct ID3D11On12Device1 : ID3D11On12Device")]
@@ -98,7 +98,7 @@ public unsafe partial struct ID3D11On12Device1 : INativeGuid
 		((delegate* unmanaged[Stdcall]<ID3D11On12Device1*, Graphics.Direct3D11.ID3D11Resource**, uint, void>)(lpVtbl[5]))((ID3D11On12Device1*)Unsafe.AsPointer(ref this), ppResources, NumResources);
 	}
 
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device1::GetD3D12Device"]/*' />
+	/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device1::GetD3D12Device"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(6)]
 	public HResult GetD3D12Device(Guid* riid, void** ppvDevice)
diff --git a/src/Vortice.Win32.Direct3D11on12/Generated/ID3D11On12Device2.cs b/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/ID3D11On12Device2.cs
similarity index 92%
rename from src/Vortice.Win32.Direct3D11on12/Generated/ID3D11On12Device2.cs
rename to src/Vortice.Win32.Graphics.Direct3D11on12/Generated/ID3D11On12Device2.cs
index ae20308..820b79d 100644
--- a/src/Vortice.Win32.Direct3D11on12/Generated/ID3D11On12Device2.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/ID3D11On12Device2.cs
@@ -9,7 +9,7 @@
 
 namespace Win32.Graphics.Direct3D11on12;
 
-/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device2"]/*' />
+/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device2"]/*' />
 /// <unmanaged>ID3D11On12Device2</unmanaged>
 [Guid("dc90f331-4740-43fa-866e-67f12cb58223")]
 [NativeTypeName("struct ID3D11On12Device2 : ID3D11On12Device1")]
@@ -106,7 +106,7 @@ public unsafe partial struct ID3D11On12Device2 : INativeGuid
 		return ((delegate* unmanaged[Stdcall]<ID3D11On12Device2*, Guid*, void**, int>)(lpVtbl[6]))((ID3D11On12Device2*)Unsafe.AsPointer(ref this), riid, ppvDevice);
 	}
 
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device2::UnwrapUnderlyingResource"]/*' />
+	/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device2::UnwrapUnderlyingResource"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(7)]
 	public HResult UnwrapUnderlyingResource(Graphics.Direct3D11.ID3D11Resource* pResource11, Graphics.Direct3D12.ID3D12CommandQueue* pCommandQueue, Guid* riid, void** ppvResource12)
@@ -114,7 +114,7 @@ public unsafe partial struct ID3D11On12Device2 : INativeGuid
 		return ((delegate* unmanaged[Stdcall]<ID3D11On12Device2*, Graphics.Direct3D11.ID3D11Resource*, Graphics.Direct3D12.ID3D12CommandQueue*, Guid*, void**, int>)(lpVtbl[7]))((ID3D11On12Device2*)Unsafe.AsPointer(ref this), pResource11, pCommandQueue, riid, ppvResource12);
 	}
 
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device2::ReturnUnderlyingResource"]/*' />
+	/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="ID3D11On12Device2::ReturnUnderlyingResource"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(8)]
 	public HResult ReturnUnderlyingResource(Graphics.Direct3D11.ID3D11Resource* pResource11, uint NumSync, ulong* pSignalValues, Graphics.Direct3D12.ID3D12Fence** ppFences)
diff --git a/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/ResourceFlags.cs b/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/ResourceFlags.cs
new file mode 100644
index 0000000..917eb57
--- /dev/null
+++ b/src/Vortice.Win32.Graphics.Direct3D11on12/Generated/ResourceFlags.cs
@@ -0,0 +1,27 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+// ------------------------------------------------------------------------------
+
+namespace Win32.Graphics.Direct3D11on12;
+
+/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS"]/*' />
+/// <unmanaged>D3D11_RESOURCE_FLAGS</unmanaged>
+public partial struct ResourceFlags
+{
+	/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS::BindFlags"]/*' />
+	public Graphics.Direct3D11.BindFlags BindFlags;
+
+	/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS::MiscFlags"]/*' />
+	public Graphics.Direct3D11.ResourceMiscFlags MiscFlags;
+
+	/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS::CPUAccessFlags"]/*' />
+	public Graphics.Direct3D11.CpuAccessFlags CPUAccessFlags;
+
+	/// <include file='../../Vortice.Win32.Graphics.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS::StructureByteStride"]/*' />
+	public uint StructureByteStride;
+}
diff --git a/src/Vortice.Win32.Direct3D11on12/Vortice.Win32.Direct3D11on12.csproj b/src/Vortice.Win32.Graphics.Direct3D11on12/Vortice.Win32.Graphics.Direct3D11on12.csproj
similarity index 75%
rename from src/Vortice.Win32.Direct3D11on12/Vortice.Win32.Direct3D11on12.csproj
rename to src/Vortice.Win32.Graphics.Direct3D11on12/Vortice.Win32.Graphics.Direct3D11on12.csproj
index bdff859..a2acfa0 100644
--- a/src/Vortice.Win32.Direct3D11on12/Vortice.Win32.Direct3D11on12.csproj
+++ b/src/Vortice.Win32.Graphics.Direct3D11on12/Vortice.Win32.Graphics.Direct3D11on12.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Vortice.Win32.Direct3D11\Vortice.Win32.Direct3D11.csproj" />
-    <ProjectReference Include="..\Vortice.Win32.Direct3D12\Vortice.Win32.Direct3D12.csproj" />
+    <ProjectReference Include="..\Vortice.Win32.Graphics.Direct3D11\Vortice.Win32.Graphics.Direct3D11.csproj" />
+    <ProjectReference Include="..\Vortice.Win32.Graphics.Direct3D12\Vortice.Win32.Graphics.Direct3D12.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Vortice.Win32.Direct3D12/Apis.cs b/src/Vortice.Win32.Graphics.Direct3D12/Apis.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Apis.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Apis.cs
diff --git a/src/Vortice.Win32.Direct3D12/BlendDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/BlendDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/BlendDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/BlendDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Box.cs b/src/Vortice.Win32.Graphics.Direct3D12/Box.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Box.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Box.cs
diff --git a/src/Vortice.Win32.Direct3D12/ClearValue.cs b/src/Vortice.Win32.Graphics.Direct3D12/ClearValue.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/ClearValue.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/ClearValue.cs
diff --git a/src/Vortice.Win32.Direct3D12/CpuDescriptorHandle.cs b/src/Vortice.Win32.Graphics.Direct3D12/CpuDescriptorHandle.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/CpuDescriptorHandle.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/CpuDescriptorHandle.cs
diff --git a/src/Vortice.Win32.Direct3D12/DepthStencilDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/DepthStencilDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/DepthStencilDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/DepthStencilDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/DepthStencilDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/DepthStencilDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D12/DepthStencilOperationDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilOperationDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/DepthStencilOperationDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/DepthStencilOperationDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/DepthStencilValue.cs b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilValue.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/DepthStencilValue.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/DepthStencilValue.cs
diff --git a/src/Vortice.Win32.Direct3D12/DepthStencilViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/DepthStencilViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/DepthStencilViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/DepthStencilViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Direct3D12.xml b/src/Vortice.Win32.Graphics.Direct3D12/Direct3D12.xml
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Direct3D12.xml
rename to src/Vortice.Win32.Graphics.Direct3D12/Direct3D12.xml
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Apis.Functions.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Apis.Functions.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Apis.Functions.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Apis.Functions.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Apis.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Apis.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Apis.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Apis.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/AutoBreadcrumbNode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/AutoBreadcrumbNode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/AutoBreadcrumbNode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/AutoBreadcrumbNode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/AutoBreadcrumbNode1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/AutoBreadcrumbNode1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/AutoBreadcrumbNode1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/AutoBreadcrumbNode1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/AutoBreadcrumbOperation.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/AutoBreadcrumbOperation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/AutoBreadcrumbOperation.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/AutoBreadcrumbOperation.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/AxisShadingRate.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/AxisShadingRate.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/AxisShadingRate.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/AxisShadingRate.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/BackgroundProcessingMode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/BackgroundProcessingMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/BackgroundProcessingMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/BackgroundProcessingMode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Blend.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Blend.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Blend.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Blend.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/BlendDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/BlendDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/BlendDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/BlendDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/BlendOperation.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/BlendOperation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/BlendOperation.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/BlendOperation.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Box.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Box.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Box.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Box.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/BufferRtv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/BufferRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/BufferRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/BufferRtv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/BufferSrv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/BufferSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/BufferSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/BufferSrv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/BufferSrvFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/BufferSrvFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/BufferSrvFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/BufferSrvFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/BufferUav.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/BufferUav.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/BufferUav.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/BufferUav.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/BufferUavFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/BufferUavFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/BufferUavFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/BufferUavFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/BuildRaytracingAccelerationStructureDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/BuildRaytracingAccelerationStructureDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/BuildRaytracingAccelerationStructureDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/BuildRaytracingAccelerationStructureDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/BuildRaytracingAccelerationStructureInputs.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/BuildRaytracingAccelerationStructureInputs.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/BuildRaytracingAccelerationStructureInputs.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/BuildRaytracingAccelerationStructureInputs.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/BuildRaytracingAccelerationStructureToolsVisualizationHeader.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/BuildRaytracingAccelerationStructureToolsVisualizationHeader.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/BuildRaytracingAccelerationStructureToolsVisualizationHeader.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/BuildRaytracingAccelerationStructureToolsVisualizationHeader.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CachedPipelineState.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CachedPipelineState.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CachedPipelineState.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CachedPipelineState.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ClearFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ClearFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ClearFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ClearFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ClearValue.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ClearValue.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ClearValue.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ClearValue.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ColorWriteEnable.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ColorWriteEnable.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ColorWriteEnable.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ColorWriteEnable.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CommandListFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandListFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CommandListFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandListFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CommandListSupportFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandListSupportFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CommandListSupportFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandListSupportFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CommandListType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandListType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CommandListType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandListType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CommandPoolFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandPoolFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CommandPoolFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandPoolFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CommandQueueDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandQueueDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CommandQueueDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandQueueDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CommandQueueFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandQueueFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CommandQueueFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandQueueFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CommandQueuePriority.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandQueuePriority.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CommandQueuePriority.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandQueuePriority.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CommandRecorderFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandRecorderFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CommandRecorderFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandRecorderFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CommandSignatureDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandSignatureDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CommandSignatureDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CommandSignatureDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ComparisonFunction.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ComparisonFunction.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ComparisonFunction.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ComparisonFunction.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ComputePipelineStateDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ComputePipelineStateDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ComputePipelineStateDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ComputePipelineStateDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ConservativeRasterizationMode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ConservativeRasterizationMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ConservativeRasterizationMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ConservativeRasterizationMode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ConservativeRasterizationTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ConservativeRasterizationTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ConservativeRasterizationTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ConservativeRasterizationTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ConstantBufferViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ConstantBufferViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ConstantBufferViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ConstantBufferViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CpuDescriptorHandle.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CpuDescriptorHandle.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CpuDescriptorHandle.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CpuDescriptorHandle.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CpuPageProperty.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CpuPageProperty.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CpuPageProperty.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CpuPageProperty.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CrossNodeSharingTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CrossNodeSharingTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CrossNodeSharingTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CrossNodeSharingTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/CullMode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/CullMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/CullMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/CullMode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DebugCommandListGpuBasedValidationSettings.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DebugCommandListGpuBasedValidationSettings.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DebugCommandListGpuBasedValidationSettings.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DebugCommandListGpuBasedValidationSettings.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DebugCommandListParameterType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DebugCommandListParameterType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DebugCommandListParameterType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DebugCommandListParameterType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DebugDeviceGpuBasedValidationSettings.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DebugDeviceGpuBasedValidationSettings.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DebugDeviceGpuBasedValidationSettings.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DebugDeviceGpuBasedValidationSettings.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DebugDeviceGpuSlowdownPerformanceFactor.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DebugDeviceGpuSlowdownPerformanceFactor.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DebugDeviceGpuSlowdownPerformanceFactor.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DebugDeviceGpuSlowdownPerformanceFactor.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DebugDeviceParameterType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DebugDeviceParameterType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DebugDeviceParameterType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DebugDeviceParameterType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DebugFeature.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DebugFeature.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DebugFeature.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DebugFeature.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DepthStencilDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DepthStencilDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DepthStencilDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DepthStencilDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DepthStencilDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DepthStencilDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DepthStencilDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DepthStencilDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DepthStencilOperationDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DepthStencilOperationDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DepthStencilOperationDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DepthStencilOperationDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DepthStencilValue.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DepthStencilValue.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DepthStencilValue.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DepthStencilValue.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DepthStencilViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DepthStencilViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DepthStencilViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DepthStencilViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DepthWriteMask.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DepthWriteMask.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DepthWriteMask.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DepthWriteMask.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DescriptorHeapDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorHeapDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DescriptorHeapDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorHeapDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DescriptorHeapFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorHeapFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DescriptorHeapFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorHeapFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DescriptorHeapType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorHeapType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DescriptorHeapType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorHeapType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DescriptorRange.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorRange.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DescriptorRange.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorRange.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DescriptorRange1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorRange1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DescriptorRange1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorRange1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DescriptorRangeFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorRangeFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DescriptorRangeFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorRangeFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DescriptorRangeType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorRangeType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DescriptorRangeType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DescriptorRangeType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DeviceRemovedExtendedData.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DeviceRemovedExtendedData.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DeviceRemovedExtendedData.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DeviceRemovedExtendedData.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DeviceRemovedExtendedData1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DeviceRemovedExtendedData1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DeviceRemovedExtendedData1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DeviceRemovedExtendedData1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DeviceRemovedExtendedData2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DeviceRemovedExtendedData2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DeviceRemovedExtendedData2.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DeviceRemovedExtendedData2.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DeviceRemovedExtendedData3.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DeviceRemovedExtendedData3.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DeviceRemovedExtendedData3.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DeviceRemovedExtendedData3.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DiscardRegion.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DiscardRegion.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DiscardRegion.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DiscardRegion.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DispatchArguments.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DispatchArguments.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DispatchArguments.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DispatchArguments.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DispatchMeshArguments.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DispatchMeshArguments.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DispatchMeshArguments.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DispatchMeshArguments.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DispatchRaysDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DispatchRaysDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DispatchRaysDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DispatchRaysDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DrawArguments.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DrawArguments.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DrawArguments.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DrawArguments.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DrawIndexedArguments.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DrawIndexedArguments.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DrawIndexedArguments.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DrawIndexedArguments.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredAllocationNode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredAllocationNode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredAllocationNode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredAllocationNode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredAllocationNode1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredAllocationNode1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredAllocationNode1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredAllocationNode1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredAllocationType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredAllocationType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredAllocationType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredAllocationType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredAutoBreadcrumbsOutput.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredAutoBreadcrumbsOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredAutoBreadcrumbsOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredAutoBreadcrumbsOutput.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredAutoBreadcrumbsOutput1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredAutoBreadcrumbsOutput1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredAutoBreadcrumbsOutput1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredAutoBreadcrumbsOutput1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredBreadcrumbContext.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredBreadcrumbContext.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredBreadcrumbContext.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredBreadcrumbContext.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredDeviceState.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredDeviceState.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredDeviceState.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredDeviceState.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredEnablement.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredEnablement.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredEnablement.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredEnablement.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredPageFaultFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredPageFaultFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredPageFaultFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredPageFaultFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredPageFaultOutput.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredPageFaultOutput.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredPageFaultOutput.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredPageFaultOutput.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredPageFaultOutput1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredPageFaultOutput1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredPageFaultOutput1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredPageFaultOutput1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredPageFaultOutput2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredPageFaultOutput2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredPageFaultOutput2.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredPageFaultOutput2.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DredVersion.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DredVersion.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DredVersion.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DredVersion.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DriverMatchingIdentifierStatus.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DriverMatchingIdentifierStatus.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DriverMatchingIdentifierStatus.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DriverMatchingIdentifierStatus.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DsvDimension.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DsvDimension.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DsvDimension.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DsvDimension.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DsvFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DsvFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DsvFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DsvFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DxilLibraryDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DxilLibraryDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DxilLibraryDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DxilLibraryDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/DxilSubObjectToExportsAssociation.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/DxilSubObjectToExportsAssociation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/DxilSubObjectToExportsAssociation.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/DxilSubObjectToExportsAssociation.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ElementsLayout.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ElementsLayout.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ElementsLayout.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ElementsLayout.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ExistingCollectionDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ExistingCollectionDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ExistingCollectionDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ExistingCollectionDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ExportDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ExportDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ExportDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ExportDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ExportFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ExportFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ExportFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ExportFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Feature.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Feature.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Feature.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Feature.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataArchitecture.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataArchitecture.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataArchitecture.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataArchitecture.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataArchitecture1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataArchitecture1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataArchitecture1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataArchitecture1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataCommandQueuePriority.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataCommandQueuePriority.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataCommandQueuePriority.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataCommandQueuePriority.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataCrossNode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataCrossNode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataCrossNode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataCrossNode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options10.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options10.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options10.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options10.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options11.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options11.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options11.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options11.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options2.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options2.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options3.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options3.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options3.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options3.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options4.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options4.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options4.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options4.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options5.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options5.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options5.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options5.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options6.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options6.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options6.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options6.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options7.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options7.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options7.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options7.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options8.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options8.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options8.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options8.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options9.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options9.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataD3D12Options9.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataD3D12Options9.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataDisplayable.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataDisplayable.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataDisplayable.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataDisplayable.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataExistingHeaps.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataExistingHeaps.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataExistingHeaps.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataExistingHeaps.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataFeatureLevels.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataFeatureLevels.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataFeatureLevels.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataFeatureLevels.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataFormatInfo.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataFormatInfo.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataFormatInfo.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataFormatInfo.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataFormatSupport.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataFormatSupport.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataFormatSupport.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataFormatSupport.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataGpuVirtualAddressSupport.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataGpuVirtualAddressSupport.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataGpuVirtualAddressSupport.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataGpuVirtualAddressSupport.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataMultisampleQualityLevels.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataMultisampleQualityLevels.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataMultisampleQualityLevels.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataMultisampleQualityLevels.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataProtectedResourceSessionSupport.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataProtectedResourceSessionSupport.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataProtectedResourceSessionSupport.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataProtectedResourceSessionSupport.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataProtectedResourceSessionTypeCount.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataProtectedResourceSessionTypeCount.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataProtectedResourceSessionTypeCount.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataProtectedResourceSessionTypeCount.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataProtectedResourceSessionTypes.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataProtectedResourceSessionTypes.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataProtectedResourceSessionTypes.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataProtectedResourceSessionTypes.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataQueryMetaCommand.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataQueryMetaCommand.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataQueryMetaCommand.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataQueryMetaCommand.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataRootSignature.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataRootSignature.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataRootSignature.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataRootSignature.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataSerialization.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataSerialization.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataSerialization.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataSerialization.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataShaderCache.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataShaderCache.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataShaderCache.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataShaderCache.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FeatureDataShaderModel.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataShaderModel.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FeatureDataShaderModel.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FeatureDataShaderModel.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FenceFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FenceFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FenceFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FenceFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FillMode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FillMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FillMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FillMode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Filter.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Filter.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Filter.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Filter.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FilterReductionType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FilterReductionType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FilterReductionType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FilterReductionType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FilterType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FilterType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FilterType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FilterType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FormatSupport1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FormatSupport1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FormatSupport1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FormatSupport1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FormatSupport2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FormatSupport2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FormatSupport2.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FormatSupport2.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/FunctionDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/FunctionDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/FunctionDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/FunctionDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/GlobalRootSignature.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/GlobalRootSignature.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/GlobalRootSignature.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/GlobalRootSignature.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/GpuBasedValidationFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuBasedValidationFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/GpuBasedValidationFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuBasedValidationFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/GpuBasedValidationPipelineStateCreateFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuBasedValidationPipelineStateCreateFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/GpuBasedValidationPipelineStateCreateFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuBasedValidationPipelineStateCreateFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/GpuBasedValidationShaderPatchMode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuBasedValidationShaderPatchMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/GpuBasedValidationShaderPatchMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuBasedValidationShaderPatchMode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/GpuDescriptorHandle.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuDescriptorHandle.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/GpuDescriptorHandle.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuDescriptorHandle.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/GpuVirtualAddressAndStride.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuVirtualAddressAndStride.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/GpuVirtualAddressAndStride.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuVirtualAddressAndStride.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/GpuVirtualAddressRange.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuVirtualAddressRange.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/GpuVirtualAddressRange.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuVirtualAddressRange.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/GpuVirtualAddressRangeAndStride.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuVirtualAddressRangeAndStride.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/GpuVirtualAddressRangeAndStride.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/GpuVirtualAddressRangeAndStride.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/GraphicsPipelineStateDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/GraphicsPipelineStateDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/GraphicsPipelineStateDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/GraphicsPipelineStateDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/GraphicsStates.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/GraphicsStates.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/GraphicsStates.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/GraphicsStates.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/HeapDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/HeapDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/HeapDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/HeapDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/HeapFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/HeapFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/HeapFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/HeapFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/HeapProperties.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/HeapProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/HeapProperties.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/HeapProperties.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/HeapSerializationTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/HeapSerializationTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/HeapSerializationTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/HeapSerializationTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/HeapType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/HeapType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/HeapType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/HeapType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/HitGroupDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/HitGroupDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/HitGroupDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/HitGroupDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/HitGroupType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/HitGroupType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/HitGroupType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/HitGroupType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/HitKind.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/HitKind.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/HitKind.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/HitKind.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12CommandAllocator.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandAllocator.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12CommandAllocator.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandAllocator.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12CommandList.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandList.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12CommandList.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandList.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12CommandQueue.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandQueue.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12CommandQueue.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandQueue.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12CommandSignature.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandSignature.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12CommandSignature.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12CommandSignature.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Debug.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Debug.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Debug.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Debug.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Debug1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Debug1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Debug1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Debug1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Debug2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Debug2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Debug2.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Debug2.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Debug3.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Debug3.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Debug3.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Debug3.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Debug4.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Debug4.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Debug4.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Debug4.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Debug5.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Debug5.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Debug5.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Debug5.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugCommandList.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugCommandList.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugCommandList.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugCommandList.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugCommandList1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugCommandList1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugCommandList1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugCommandList1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugCommandList2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugCommandList2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugCommandList2.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugCommandList2.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugCommandQueue.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugCommandQueue.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugCommandQueue.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugCommandQueue.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugDevice.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugDevice.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugDevice.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugDevice.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugDevice1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugDevice1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugDevice1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugDevice1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugDevice2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugDevice2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DebugDevice2.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DebugDevice2.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DescriptorHeap.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DescriptorHeap.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DescriptorHeap.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DescriptorHeap.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Device.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Device.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Device1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Device1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Device2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Device2.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device2.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Device3.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device3.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Device3.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device3.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Device4.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device4.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Device4.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device4.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Device5.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device5.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Device5.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device5.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Device6.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device6.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Device6.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device6.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Device7.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device7.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Device7.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device7.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Device8.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device8.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Device8.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device8.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Device9.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device9.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Device9.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device9.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DeviceChild.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceChild.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DeviceChild.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceChild.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DeviceRemovedExtendedData.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceRemovedExtendedData.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DeviceRemovedExtendedData.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceRemovedExtendedData.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DeviceRemovedExtendedData1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceRemovedExtendedData1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DeviceRemovedExtendedData1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceRemovedExtendedData1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DeviceRemovedExtendedData2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceRemovedExtendedData2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DeviceRemovedExtendedData2.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceRemovedExtendedData2.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DeviceRemovedExtendedDataSettings.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceRemovedExtendedDataSettings.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DeviceRemovedExtendedDataSettings.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceRemovedExtendedDataSettings.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12DeviceRemovedExtendedDataSettings1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceRemovedExtendedDataSettings1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12DeviceRemovedExtendedDataSettings1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12DeviceRemovedExtendedDataSettings1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Fence.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Fence.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Fence.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Fence.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Fence1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Fence1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Fence1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Fence1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12FunctionParameterReflection.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12FunctionParameterReflection.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12FunctionParameterReflection.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12FunctionParameterReflection.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12FunctionReflection.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12FunctionReflection.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12FunctionReflection.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12FunctionReflection.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Heap.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Heap.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Heap.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Heap.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Heap1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Heap1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Heap1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Heap1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12InfoQueue.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12InfoQueue.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12InfoQueue.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12InfoQueue.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12InfoQueue1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12InfoQueue1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12InfoQueue1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12InfoQueue1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12LibraryReflection.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12LibraryReflection.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12LibraryReflection.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12LibraryReflection.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12LifetimeOwner.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12LifetimeOwner.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12LifetimeOwner.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12LifetimeOwner.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12LifetimeTracker.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12LifetimeTracker.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12LifetimeTracker.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12LifetimeTracker.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12MetaCommand.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12MetaCommand.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12MetaCommand.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12MetaCommand.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Object.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Object.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Object.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Object.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Pageable.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Pageable.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Pageable.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Pageable.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12PipelineLibrary.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineLibrary.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12PipelineLibrary.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineLibrary.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12PipelineLibrary1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineLibrary1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12PipelineLibrary1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineLibrary1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12PipelineState.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineState.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12PipelineState.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12PipelineState.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12ProtectedResourceSession.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedResourceSession.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12ProtectedResourceSession.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedResourceSession.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12ProtectedResourceSession1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedResourceSession1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12ProtectedResourceSession1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedResourceSession1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12ProtectedSession.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedSession.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12ProtectedSession.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ProtectedSession.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12QueryHeap.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12QueryHeap.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12QueryHeap.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12QueryHeap.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Resource.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Resource.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Resource1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Resource1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Resource2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource2.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Resource2.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Resource2.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12RootSignature.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12RootSignature.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12RootSignature.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12RootSignature.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12RootSignatureDeserializer.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12RootSignatureDeserializer.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12RootSignatureDeserializer.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12RootSignatureDeserializer.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12SDKConfiguration.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12SDKConfiguration.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12SDKConfiguration.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12SDKConfiguration.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12ShaderCacheSession.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderCacheSession.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12ShaderCacheSession.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderCacheSession.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12ShaderReflection.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderReflection.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12ShaderReflection.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderReflection.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12ShaderReflectionConstantBuffer.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderReflectionConstantBuffer.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12ShaderReflectionConstantBuffer.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderReflectionConstantBuffer.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12ShaderReflectionType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderReflectionType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12ShaderReflectionType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderReflectionType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12ShaderReflectionVariable.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderReflectionVariable.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12ShaderReflectionVariable.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12ShaderReflectionVariable.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12SharingContract.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12SharingContract.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12SharingContract.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12SharingContract.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12StateObject.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObject.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12StateObject.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObject.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12StateObjectProperties.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObjectProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12StateObjectProperties.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12StateObjectProperties.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12SwapChainAssistant.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12SwapChainAssistant.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12SwapChainAssistant.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12SwapChainAssistant.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12Tools.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Tools.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12Tools.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Tools.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ID3D12VersionedRootSignatureDeserializer.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12VersionedRootSignatureDeserializer.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ID3D12VersionedRootSignatureDeserializer.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12VersionedRootSignatureDeserializer.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/IndexBufferStripCutValue.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/IndexBufferStripCutValue.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/IndexBufferStripCutValue.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/IndexBufferStripCutValue.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/IndexBufferView.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/IndexBufferView.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/IndexBufferView.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/IndexBufferView.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/IndirectArgumentDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/IndirectArgumentDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/IndirectArgumentDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/IndirectArgumentDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/IndirectArgumentType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/IndirectArgumentType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/IndirectArgumentType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/IndirectArgumentType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/InfoQueueFilter.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/InfoQueueFilter.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/InfoQueueFilter.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/InfoQueueFilter.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/InfoQueueFilterDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/InfoQueueFilterDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/InfoQueueFilterDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/InfoQueueFilterDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/InputClassification.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/InputClassification.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/InputClassification.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/InputClassification.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/InputElementDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/InputElementDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/InputElementDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/InputElementDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/InputLayoutDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/InputLayoutDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/InputLayoutDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/InputLayoutDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/LibraryDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/LibraryDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/LibraryDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/LibraryDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/LifetimeState.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/LifetimeState.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/LifetimeState.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/LifetimeState.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/LocalRootSignature.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/LocalRootSignature.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/LocalRootSignature.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/LocalRootSignature.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/LogicOperation.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/LogicOperation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/LogicOperation.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/LogicOperation.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MeasurementsAction.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MeasurementsAction.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MeasurementsAction.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MeasurementsAction.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MemcpyDest.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MemcpyDest.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MemcpyDest.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MemcpyDest.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MemoryPool.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MemoryPool.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MemoryPool.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MemoryPool.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MeshShaderTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MeshShaderTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MeshShaderTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MeshShaderTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Message.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Message.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Message.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Message.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MessageCallbackFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MessageCallbackFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MessageCallbackFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MessageCallbackFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MessageCategory.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MessageCategory.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MessageCategory.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MessageCategory.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MessageId.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MessageId.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MessageId.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MessageId.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MessageSeverity.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MessageSeverity.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MessageSeverity.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MessageSeverity.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MetaCommandDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MetaCommandDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MetaCommandDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MetaCommandDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MetaCommandParameterDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MetaCommandParameterDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MetaCommandParameterDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MetaCommandParameterDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MetaCommandParameterFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MetaCommandParameterFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MetaCommandParameterFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MetaCommandParameterFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MetaCommandParameterStage.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MetaCommandParameterStage.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MetaCommandParameterStage.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MetaCommandParameterStage.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MetaCommandParameterType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MetaCommandParameterType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MetaCommandParameterType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MetaCommandParameterType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MipRegion.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MipRegion.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MipRegion.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MipRegion.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MultipleFenceWaitFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MultipleFenceWaitFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MultipleFenceWaitFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MultipleFenceWaitFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/MultisampleQualityLevelFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/MultisampleQualityLevelFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/MultisampleQualityLevelFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/MultisampleQualityLevelFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/NodeMask.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/NodeMask.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/NodeMask.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/NodeMask.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/PackedMipInfo.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/PackedMipInfo.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/PackedMipInfo.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/PackedMipInfo.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ParameterDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ParameterDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ParameterDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ParameterDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/PipelineStateFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/PipelineStateFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/PipelineStateFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/PipelineStateFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/PipelineStateStreamDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/PipelineStateStreamDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/PipelineStateStreamDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/PipelineStateStreamDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/PipelineStateSubObjectType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/PipelineStateSubObjectType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/PipelineStateSubObjectType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/PipelineStateSubObjectType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/PlacedSubresourceFootprint.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/PlacedSubresourceFootprint.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/PlacedSubresourceFootprint.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/PlacedSubresourceFootprint.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/PredicationOperation.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/PredicationOperation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/PredicationOperation.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/PredicationOperation.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/PrimitiveTopologyType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/PrimitiveTopologyType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/PrimitiveTopologyType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/PrimitiveTopologyType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ProgrammableSamplePositionsTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ProgrammableSamplePositionsTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ProgrammableSamplePositionsTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ProgrammableSamplePositionsTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ProtectedResourceSessionDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ProtectedResourceSessionDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ProtectedResourceSessionDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ProtectedResourceSessionDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ProtectedResourceSessionDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ProtectedResourceSessionDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ProtectedResourceSessionDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ProtectedResourceSessionDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ProtectedResourceSessionFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ProtectedResourceSessionFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ProtectedResourceSessionFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ProtectedResourceSessionFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ProtectedResourceSessionSupportFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ProtectedResourceSessionSupportFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ProtectedResourceSessionSupportFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ProtectedResourceSessionSupportFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ProtectedSessionStatus.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ProtectedSessionStatus.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ProtectedSessionStatus.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ProtectedSessionStatus.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/QueryDataPipelineStatistics.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/QueryDataPipelineStatistics.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/QueryDataPipelineStatistics.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/QueryDataPipelineStatistics.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/QueryDataPipelineStatistics1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/QueryDataPipelineStatistics1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/QueryDataPipelineStatistics1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/QueryDataPipelineStatistics1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/QueryDataSOStatistics.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/QueryDataSOStatistics.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/QueryDataSOStatistics.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/QueryDataSOStatistics.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/QueryHeapDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/QueryHeapDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/QueryHeapDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/QueryHeapDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/QueryHeapType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/QueryHeapType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/QueryHeapType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/QueryHeapType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/QueryType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/QueryType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/QueryType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/QueryType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Range.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Range.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Range.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Range.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RangeUInt64.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RangeUInt64.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RangeUInt64.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RangeUInt64.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RasterizerDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RasterizerDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RasterizerDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RasterizerDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RayFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RayFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RayFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RayFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingAabb.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAabb.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingAabb.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAabb.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructureBuildFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructureBuildFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructureBuildFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructureBuildFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructureCopyMode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructureCopyMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructureCopyMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructureCopyMode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoCompactedSizeDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoCompactedSizeDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoCompactedSizeDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoCompactedSizeDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoCurrentSizeDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoCurrentSizeDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoCurrentSizeDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoCurrentSizeDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoSerializationDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoSerializationDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoSerializationDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoSerializationDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoToolsVisualizationDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoToolsVisualizationDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoToolsVisualizationDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoToolsVisualizationDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePostbuildInfoType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePrebuildInfo.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePrebuildInfo.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructurePrebuildInfo.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructurePrebuildInfo.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructureSrv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructureSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructureSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructureSrv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructureType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructureType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingAccelerationStructureType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingAccelerationStructureType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingGeometryAabbsDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingGeometryAabbsDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingGeometryAabbsDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingGeometryAabbsDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingGeometryDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingGeometryDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingGeometryDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingGeometryDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingGeometryFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingGeometryFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingGeometryFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingGeometryFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingGeometryTrianglesDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingGeometryTrianglesDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingGeometryTrianglesDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingGeometryTrianglesDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingGeometryType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingGeometryType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingGeometryType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingGeometryType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingInstanceDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingInstanceDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingInstanceDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingInstanceDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingInstanceFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingInstanceFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingInstanceFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingInstanceFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingPipelineConfig.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingPipelineConfig.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingPipelineConfig.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingPipelineConfig.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingPipelineConfig1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingPipelineConfig1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingPipelineConfig1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingPipelineConfig1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingPipelineFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingPipelineFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingPipelineFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingPipelineFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingShaderConfig.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingShaderConfig.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingShaderConfig.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingShaderConfig.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RaytracingTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RaytracingTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RaytracingTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RenderPassBeginningAccess.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassBeginningAccess.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RenderPassBeginningAccess.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassBeginningAccess.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RenderPassBeginningAccessClearParameters.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassBeginningAccessClearParameters.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RenderPassBeginningAccessClearParameters.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassBeginningAccessClearParameters.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RenderPassBeginningAccessType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassBeginningAccessType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RenderPassBeginningAccessType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassBeginningAccessType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RenderPassDepthStencilDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassDepthStencilDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RenderPassDepthStencilDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassDepthStencilDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RenderPassEndingAccess.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassEndingAccess.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RenderPassEndingAccess.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassEndingAccess.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RenderPassEndingAccessResolveParameters.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassEndingAccessResolveParameters.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RenderPassEndingAccessResolveParameters.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassEndingAccessResolveParameters.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RenderPassEndingAccessResolveSubresourceParameters.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassEndingAccessResolveSubresourceParameters.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RenderPassEndingAccessResolveSubresourceParameters.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassEndingAccessResolveSubresourceParameters.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RenderPassEndingAccessType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassEndingAccessType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RenderPassEndingAccessType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassEndingAccessType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RenderPassFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RenderPassFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RenderPassRenderTargetDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassRenderTargetDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RenderPassRenderTargetDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassRenderTargetDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RenderPassTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RenderPassTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderPassTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RenderTargetBlendDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderTargetBlendDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RenderTargetBlendDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderTargetBlendDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RenderTargetViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderTargetViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RenderTargetViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RenderTargetViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ReportLiveDeviceObjectFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ReportLiveDeviceObjectFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ReportLiveDeviceObjectFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ReportLiveDeviceObjectFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResidencyFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResidencyFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResidencyFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResidencyFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResidencyPriority.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResidencyPriority.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResidencyPriority.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResidencyPriority.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResolveMode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResolveMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResolveMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResolveMode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceAliasingBarrier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceAliasingBarrier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceAliasingBarrier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceAliasingBarrier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceAllocationInfo.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceAllocationInfo.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceAllocationInfo.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceAllocationInfo.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceAllocationInfo1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceAllocationInfo1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceAllocationInfo1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceAllocationInfo1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceBarrier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceBarrier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceBarrier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceBarrier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceBarrierFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceBarrierFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceBarrierFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceBarrierFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceBarrierType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceBarrierType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceBarrierType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceBarrierType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceBindingTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceBindingTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceBindingTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceBindingTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceDimension.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceDimension.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceDimension.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceDimension.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceHeapTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceHeapTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceHeapTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceHeapTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceStates.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceStates.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceStates.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceStates.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceTransitionBarrier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceTransitionBarrier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceTransitionBarrier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceTransitionBarrier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ResourceUavBarrier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceUavBarrier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ResourceUavBarrier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ResourceUavBarrier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RootConstants.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RootConstants.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RootConstants.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RootConstants.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RootDescriptor.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RootDescriptor.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RootDescriptor.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RootDescriptor.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RootDescriptor1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RootDescriptor1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RootDescriptor1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RootDescriptor1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RootDescriptorFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RootDescriptorFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RootDescriptorFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RootDescriptorFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RootDescriptorTable.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RootDescriptorTable.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RootDescriptorTable.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RootDescriptorTable.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RootDescriptorTable1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RootDescriptorTable1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RootDescriptorTable1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RootDescriptorTable1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RootParameter.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RootParameter.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RootParameter.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RootParameter.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RootParameter1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RootParameter1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RootParameter1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RootParameter1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RootParameterType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RootParameterType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RootParameterType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RootParameterType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RootSignatureDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RootSignatureDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RootSignatureDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RootSignatureDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RootSignatureDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RootSignatureDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RootSignatureDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RootSignatureDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RootSignatureFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RootSignatureFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RootSignatureFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RootSignatureFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RootSignatureVersion.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RootSignatureVersion.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RootSignatureVersion.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RootSignatureVersion.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RtFormatArray.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RtFormatArray.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RtFormatArray.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RtFormatArray.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/RtvDimension.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/RtvDimension.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/RtvDimension.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/RtvDimension.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SODeclarationEntry.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SODeclarationEntry.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SODeclarationEntry.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SODeclarationEntry.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SamplePosition.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SamplePosition.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SamplePosition.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SamplePosition.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SamplerDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SamplerDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SamplerDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SamplerDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SamplerFeedbackTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SamplerFeedbackTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SamplerFeedbackTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SamplerFeedbackTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SerializedDataDriverMatchingIdentifier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SerializedDataDriverMatchingIdentifier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SerializedDataDriverMatchingIdentifier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SerializedDataDriverMatchingIdentifier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SerializedDataType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SerializedDataType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SerializedDataType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SerializedDataType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SerializedRaytracingAccelerationStructureHeader.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SerializedRaytracingAccelerationStructureHeader.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SerializedRaytracingAccelerationStructureHeader.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SerializedRaytracingAccelerationStructureHeader.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderBufferDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderBufferDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderBufferDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderBufferDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderBytecode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderBytecode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderBytecode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderBytecode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderCacheControlFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderCacheControlFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderCacheControlFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderCacheControlFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderCacheFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderCacheFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderCacheFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderCacheFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderCacheKindFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderCacheKindFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderCacheKindFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderCacheKindFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderCacheMode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderCacheMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderCacheMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderCacheMode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderCacheSessionDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderCacheSessionDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderCacheSessionDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderCacheSessionDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderCacheSupportFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderCacheSupportFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderCacheSupportFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderCacheSupportFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderComponentMapping.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderComponentMapping.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderComponentMapping.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderComponentMapping.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderInputBindDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderInputBindDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderInputBindDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderInputBindDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderMinPrecisionSupport.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderMinPrecisionSupport.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderMinPrecisionSupport.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderMinPrecisionSupport.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderModel.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderModel.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderModel.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderModel.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderResourceViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderResourceViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderResourceViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderResourceViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderTypeDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderTypeDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderTypeDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderTypeDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderVariableDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderVariableDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderVariableDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderVariableDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderVersionType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderVersionType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderVersionType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderVersionType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShaderVisibility.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderVisibility.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShaderVisibility.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShaderVisibility.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShadingRate.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShadingRate.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShadingRate.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShadingRate.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ShadingRateCombiner.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ShadingRateCombiner.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ShadingRateCombiner.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ShadingRateCombiner.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SharedResourceCompatibilityTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SharedResourceCompatibilityTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SharedResourceCompatibilityTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SharedResourceCompatibilityTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SignatureParameterDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SignatureParameterDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SignatureParameterDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SignatureParameterDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SrvDimension.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SrvDimension.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SrvDimension.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SrvDimension.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/StateObjectConfig.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/StateObjectConfig.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/StateObjectConfig.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/StateObjectConfig.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/StateObjectDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/StateObjectDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/StateObjectDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/StateObjectDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/StateObjectFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/StateObjectFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/StateObjectFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/StateObjectFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/StateObjectType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/StateObjectType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/StateObjectType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/StateObjectType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/StateSubObject.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/StateSubObject.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/StateSubObject.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/StateSubObject.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/StateSubObjectType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/StateSubObjectType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/StateSubObjectType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/StateSubObjectType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/StaticBorderColor.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/StaticBorderColor.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/StaticBorderColor.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/StaticBorderColor.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/StaticSamplerDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/StaticSamplerDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/StaticSamplerDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/StaticSamplerDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/StencilOperation.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/StencilOperation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/StencilOperation.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/StencilOperation.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/StreamOutputBufferView.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/StreamOutputBufferView.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/StreamOutputBufferView.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/StreamOutputBufferView.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/StreamOutputDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/StreamOutputDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/StreamOutputDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/StreamOutputDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SubObjectToExportsAssociation.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SubObjectToExportsAssociation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SubObjectToExportsAssociation.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SubObjectToExportsAssociation.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SubresourceData.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SubresourceData.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SubresourceData.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SubresourceData.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SubresourceFootprint.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SubresourceFootprint.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SubresourceFootprint.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SubresourceFootprint.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SubresourceInfo.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SubresourceInfo.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SubresourceInfo.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SubresourceInfo.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SubresourceRangeUInt64.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SubresourceRangeUInt64.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SubresourceRangeUInt64.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SubresourceRangeUInt64.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/SubresourceTiling.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/SubresourceTiling.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/SubresourceTiling.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/SubresourceTiling.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture1DArrayDsv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DArrayDsv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture1DArrayDsv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DArrayDsv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture1DArrayRtv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DArrayRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture1DArrayRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DArrayRtv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture1DArraySrv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DArraySrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture1DArraySrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DArraySrv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture1DArrayUav.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DArrayUav.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture1DArrayUav.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DArrayUav.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture1DDsv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DDsv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture1DDsv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DDsv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture1DRtv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture1DRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DRtv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture1DSrv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture1DSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DSrv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture1DUav.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DUav.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture1DUav.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture1DUav.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DArrayDsv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DArrayDsv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DArrayDsv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DArrayDsv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DArrayRtv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DArrayRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DArrayRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DArrayRtv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DArraySrv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DArraySrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DArraySrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DArraySrv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DArrayUav.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DArrayUav.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DArrayUav.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DArrayUav.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DDsv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DDsv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DDsv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DDsv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DMsArrayDsv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DMsArrayDsv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DMsArrayDsv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DMsArrayDsv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DMsArrayRtv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DMsArrayRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DMsArrayRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DMsArrayRtv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DMsArraySrv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DMsArraySrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DMsArraySrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DMsArraySrv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DMsDsv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DMsDsv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DMsDsv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DMsDsv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DMsRtv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DMsRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DMsRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DMsRtv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DMsSrv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DMsSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DMsSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DMsSrv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DRtv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DRtv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DSrv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DSrv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture2DUav.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DUav.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture2DUav.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture2DUav.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture3DRtv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture3DRtv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture3DRtv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture3DRtv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture3DSrv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture3DSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture3DSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture3DSrv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/Texture3DUav.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture3DUav.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/Texture3DUav.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/Texture3DUav.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/TextureAddressMode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/TextureAddressMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/TextureAddressMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/TextureAddressMode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/TextureCopyLocation.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/TextureCopyLocation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/TextureCopyLocation.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/TextureCopyLocation.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/TextureCopyType.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/TextureCopyType.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/TextureCopyType.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/TextureCopyType.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/TextureLayout.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/TextureLayout.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/TextureLayout.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/TextureLayout.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/TexureCubeArraySrv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/TexureCubeArraySrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/TexureCubeArraySrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/TexureCubeArraySrv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/TexureCubeSrv.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/TexureCubeSrv.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/TexureCubeSrv.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/TexureCubeSrv.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/TileCopyFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/TileCopyFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/TileCopyFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/TileCopyFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/TileMappingFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/TileMappingFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/TileMappingFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/TileMappingFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/TileRangeFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/TileRangeFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/TileRangeFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/TileRangeFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/TileRegionSize.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/TileRegionSize.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/TileRegionSize.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/TileRegionSize.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/TileShape.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/TileShape.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/TileShape.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/TileShape.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/TiledResourceCoordinate.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/TiledResourceCoordinate.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/TiledResourceCoordinate.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/TiledResourceCoordinate.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/TiledResourcesTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/TiledResourcesTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/TiledResourcesTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/TiledResourcesTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/UavDimension.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/UavDimension.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/UavDimension.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/UavDimension.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/UnorderedAccessViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/UnorderedAccessViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/UnorderedAccessViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/UnorderedAccessViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/VariableShadingRateTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/VariableShadingRateTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/VariableShadingRateTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/VariableShadingRateTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/VersionedDeviceRemovedExtendedData.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/VersionedDeviceRemovedExtendedData.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/VersionedDeviceRemovedExtendedData.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/VersionedDeviceRemovedExtendedData.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/VersionedRootSignatureDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/VersionedRootSignatureDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/VersionedRootSignatureDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/VersionedRootSignatureDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/VertexBufferView.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/VertexBufferView.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/VertexBufferView.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/VertexBufferView.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ViewInstanceLocation.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ViewInstanceLocation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ViewInstanceLocation.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ViewInstanceLocation.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ViewInstancingDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ViewInstancingDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ViewInstancingDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ViewInstancingDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ViewInstancingFlags.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ViewInstancingFlags.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ViewInstancingFlags.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ViewInstancingFlags.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/ViewInstancingTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ViewInstancingTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/ViewInstancingTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/ViewInstancingTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/WaveMmaTier.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/WaveMmaTier.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/WaveMmaTier.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/WaveMmaTier.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/WriteBufferImmediateMode.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/WriteBufferImmediateMode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/WriteBufferImmediateMode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/WriteBufferImmediateMode.cs
diff --git a/src/Vortice.Win32.Direct3D12/Generated/WriteBufferImmediateParameter.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/WriteBufferImmediateParameter.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Generated/WriteBufferImmediateParameter.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Generated/WriteBufferImmediateParameter.cs
diff --git a/src/Vortice.Win32.Direct3D12/GpuDescriptorHandle.cs b/src/Vortice.Win32.Graphics.Direct3D12/GpuDescriptorHandle.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/GpuDescriptorHandle.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/GpuDescriptorHandle.cs
diff --git a/src/Vortice.Win32.Direct3D12/HeapDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/HeapDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/HeapDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/HeapDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/HeapProperties.cs b/src/Vortice.Win32.Graphics.Direct3D12/HeapProperties.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/HeapProperties.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/HeapProperties.cs
diff --git a/src/Vortice.Win32.Direct3D12/ID3D12Device.cs b/src/Vortice.Win32.Graphics.Direct3D12/ID3D12Device.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/ID3D12Device.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/ID3D12Device.cs
diff --git a/src/Vortice.Win32.Direct3D12/IndexBufferView.cs b/src/Vortice.Win32.Graphics.Direct3D12/IndexBufferView.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/IndexBufferView.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/IndexBufferView.cs
diff --git a/src/Vortice.Win32.Direct3D12/MeshShaderPipelineStateDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/MeshShaderPipelineStateDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/MeshShaderPipelineStateDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/MeshShaderPipelineStateDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/MipRegion.cs b/src/Vortice.Win32.Graphics.Direct3D12/MipRegion.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/MipRegion.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/MipRegion.cs
diff --git a/src/Vortice.Win32.Direct3D12/Range.cs b/src/Vortice.Win32.Graphics.Direct3D12/Range.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Range.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/Range.cs
diff --git a/src/Vortice.Win32.Direct3D12/RasterizerDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/RasterizerDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/RasterizerDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/RasterizerDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/RenderTargetViewDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/RenderTargetViewDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/RenderTargetViewDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/RenderTargetViewDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/ResourceDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/ResourceDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/ResourceDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/ResourceDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/ResourceDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D12/ResourceDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/ResourceDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/ResourceDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D12/RootConstants.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootConstants.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/RootConstants.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/RootConstants.cs
diff --git a/src/Vortice.Win32.Direct3D12/RootDescriptor.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptor.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/RootDescriptor.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/RootDescriptor.cs
diff --git a/src/Vortice.Win32.Direct3D12/RootDescriptor1.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptor1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/RootDescriptor1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/RootDescriptor1.cs
diff --git a/src/Vortice.Win32.Direct3D12/RootDescriptorTable.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptorTable.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/RootDescriptorTable.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/RootDescriptorTable.cs
diff --git a/src/Vortice.Win32.Direct3D12/RootDescriptorTable1.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootDescriptorTable1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/RootDescriptorTable1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/RootDescriptorTable1.cs
diff --git a/src/Vortice.Win32.Direct3D12/RootParameter1.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootParameter1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/RootParameter1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/RootParameter1.cs
diff --git a/src/Vortice.Win32.Direct3D12/RootSignatureDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootSignatureDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/RootSignatureDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/RootSignatureDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/RootSignatureDescription1.cs b/src/Vortice.Win32.Graphics.Direct3D12/RootSignatureDescription1.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/RootSignatureDescription1.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/RootSignatureDescription1.cs
diff --git a/src/Vortice.Win32.Direct3D12/SamplerDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/SamplerDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/SamplerDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/SamplerDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/ShaderBytecode.cs b/src/Vortice.Win32.Graphics.Direct3D12/ShaderBytecode.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/ShaderBytecode.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/ShaderBytecode.cs
diff --git a/src/Vortice.Win32.Direct3D12/StaticSamplerDescription.cs b/src/Vortice.Win32.Graphics.Direct3D12/StaticSamplerDescription.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/StaticSamplerDescription.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/StaticSamplerDescription.cs
diff --git a/src/Vortice.Win32.Direct3D12/SubresourceFootprint.cs b/src/Vortice.Win32.Graphics.Direct3D12/SubresourceFootprint.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/SubresourceFootprint.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/SubresourceFootprint.cs
diff --git a/src/Vortice.Win32.Direct3D12/TextureCopyLocation.cs b/src/Vortice.Win32.Graphics.Direct3D12/TextureCopyLocation.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/TextureCopyLocation.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/TextureCopyLocation.cs
diff --git a/src/Vortice.Win32.Direct3D12/VertexBufferView.cs b/src/Vortice.Win32.Graphics.Direct3D12/VertexBufferView.cs
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/VertexBufferView.cs
rename to src/Vortice.Win32.Graphics.Direct3D12/VertexBufferView.cs
diff --git a/src/Vortice.Win32.Direct3D12/Vortice.Win32.Direct3D12.csproj b/src/Vortice.Win32.Graphics.Direct3D12/Vortice.Win32.Graphics.Direct3D12.csproj
similarity index 100%
rename from src/Vortice.Win32.Direct3D12/Vortice.Win32.Direct3D12.csproj
rename to src/Vortice.Win32.Graphics.Direct3D12/Vortice.Win32.Graphics.Direct3D12.csproj
diff --git a/src/Vortice.Win32.DirectWrite/Apis.cs b/src/Vortice.Win32.Graphics.DirectWrite/Apis.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Apis.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Apis.cs
diff --git a/src/Vortice.Win32.DirectWrite/DirectWrite.xml b/src/Vortice.Win32.Graphics.DirectWrite/DirectWrite.xml
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/DirectWrite.xml
rename to src/Vortice.Win32.Graphics.DirectWrite/DirectWrite.xml
diff --git a/src/Vortice.Win32.DirectWrite/Generated/Apis.Functions.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Apis.Functions.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/Apis.Functions.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/Apis.Functions.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/Apis.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Apis.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/Apis.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/Apis.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/AutomaticFontAxes.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/AutomaticFontAxes.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/AutomaticFontAxes.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/AutomaticFontAxes.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/Baseline.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Baseline.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/Baseline.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/Baseline.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/BreakCondition.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/BreakCondition.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/BreakCondition.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/BreakCondition.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/CaretMetrics.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/CaretMetrics.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/CaretMetrics.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/CaretMetrics.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/ClusterMetrics.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/ClusterMetrics.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/ClusterMetrics.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/ClusterMetrics.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/ColorGlyphRun.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/ColorGlyphRun.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/ColorGlyphRun.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/ColorGlyphRun.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/ColorGlyphRun1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/ColorGlyphRun1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/ColorGlyphRun1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/ColorGlyphRun1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/ContainerType.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/ContainerType.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/ContainerType.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/ContainerType.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FactoryType.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FactoryType.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FactoryType.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FactoryType.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FileFragment.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FileFragment.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FileFragment.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FileFragment.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FlowDirection.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FlowDirection.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FlowDirection.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FlowDirection.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontAxisAttributes.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontAxisAttributes.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontAxisAttributes.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontAxisAttributes.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontAxisRange.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontAxisRange.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontAxisRange.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontAxisRange.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontAxisTag.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontAxisTag.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontAxisTag.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontAxisTag.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontAxisValue.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontAxisValue.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontAxisValue.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontAxisValue.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontFaceType.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontFaceType.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontFaceType.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontFaceType.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontFamilyModel.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontFamilyModel.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontFamilyModel.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontFamilyModel.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontFeature.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontFeature.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontFeature.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontFeature.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontFeatureTag.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontFeatureTag.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontFeatureTag.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontFeatureTag.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontFileType.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontFileType.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontFileType.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontFileType.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontLineGapUsage.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontLineGapUsage.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontLineGapUsage.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontLineGapUsage.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontMetrics.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontMetrics.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontMetrics.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontMetrics.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontMetrics1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontMetrics1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontMetrics1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontMetrics1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontProperty.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontProperty.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontProperty.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontProperty.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontPropertyId.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontPropertyId.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontPropertyId.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontPropertyId.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontSimulations.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontSimulations.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontSimulations.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontSimulations.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontSourceType.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontSourceType.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontSourceType.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontSourceType.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontStretch.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontStretch.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontStretch.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontStretch.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontStyle.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontStyle.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontStyle.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontStyle.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/FontWeight.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/FontWeight.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/FontWeight.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/FontWeight.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/GlyphImageData.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphImageData.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/GlyphImageData.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphImageData.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/GlyphImageFormats.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphImageFormats.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/GlyphImageFormats.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphImageFormats.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/GlyphMetrics.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphMetrics.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/GlyphMetrics.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphMetrics.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/GlyphOffset.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphOffset.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/GlyphOffset.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphOffset.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/GlyphOrientationAngle.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphOrientationAngle.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/GlyphOrientationAngle.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphOrientationAngle.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/GlyphRun.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphRun.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/GlyphRun.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphRun.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/GlyphRunDescription.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphRunDescription.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/GlyphRunDescription.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/GlyphRunDescription.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/GridFitMode.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/GridFitMode.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/GridFitMode.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/GridFitMode.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/HitTestMetrics.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/HitTestMetrics.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/HitTestMetrics.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/HitTestMetrics.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteAsyncResult.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteAsyncResult.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteAsyncResult.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteAsyncResult.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteBitmapRenderTarget.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteBitmapRenderTarget.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteBitmapRenderTarget.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteBitmapRenderTarget.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteBitmapRenderTarget1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteBitmapRenderTarget1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteBitmapRenderTarget1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteBitmapRenderTarget1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteColorGlyphRunEnumerator.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteColorGlyphRunEnumerator.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteColorGlyphRunEnumerator.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteColorGlyphRunEnumerator.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteColorGlyphRunEnumerator1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteColorGlyphRunEnumerator1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteColorGlyphRunEnumerator1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteColorGlyphRunEnumerator1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory2.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory2.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory2.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory3.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory3.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory3.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory4.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory4.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory4.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory4.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory5.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory5.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory5.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory5.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory6.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory6.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory6.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory6.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory7.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory7.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFactory7.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFactory7.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFont.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFont.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFont.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFont.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFont1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFont1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFont1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFont1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFont2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFont2.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFont2.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFont2.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFont3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFont3.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFont3.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFont3.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection2.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection2.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection2.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection3.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollection3.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollection3.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollectionLoader.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollectionLoader.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontCollectionLoader.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontCollectionLoader.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontDownloadListener.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontDownloadListener.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontDownloadListener.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontDownloadListener.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontDownloadQueue.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontDownloadQueue.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontDownloadQueue.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontDownloadQueue.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace2.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace2.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace2.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace3.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace3.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace3.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace4.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace4.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace4.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace4.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace5.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace5.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace5.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace5.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace6.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace6.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFace6.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFace6.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFaceReference.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFaceReference.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFaceReference.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFaceReference.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFaceReference1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFaceReference1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFaceReference1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFaceReference1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFallback.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallback.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFallback.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallback.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFallback1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallback1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFallback1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallback1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFallbackBuilder.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallbackBuilder.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFallbackBuilder.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFallbackBuilder.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFamily.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFamily.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFamily.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFamily.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFamily1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFamily1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFamily1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFamily1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFamily2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFamily2.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFamily2.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFamily2.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFile.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFile.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFile.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFile.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFileEnumerator.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFileEnumerator.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFileEnumerator.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFileEnumerator.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFileLoader.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFileLoader.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFileLoader.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFileLoader.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFileStream.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFileStream.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontFileStream.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontFileStream.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontList.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontList.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontList.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontList.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontList1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontList1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontList1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontList1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontList2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontList2.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontList2.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontList2.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontResource.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontResource.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontResource.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontResource.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet2.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet2.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet2.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet3.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSet3.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSet3.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSetBuilder.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSetBuilder.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSetBuilder.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSetBuilder.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSetBuilder1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSetBuilder1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSetBuilder1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSetBuilder1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSetBuilder2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSetBuilder2.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteFontSetBuilder2.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteFontSetBuilder2.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteGdiInterop.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteGdiInterop.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteGdiInterop.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteGdiInterop.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteGdiInterop1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteGdiInterop1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteGdiInterop1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteGdiInterop1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteGlyphRunAnalysis.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteGlyphRunAnalysis.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteGlyphRunAnalysis.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteGlyphRunAnalysis.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteInMemoryFontFileLoader.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteInMemoryFontFileLoader.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteInMemoryFontFileLoader.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteInMemoryFontFileLoader.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteInlineObject.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteInlineObject.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteInlineObject.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteInlineObject.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteLocalFontFileLoader.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteLocalFontFileLoader.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteLocalFontFileLoader.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteLocalFontFileLoader.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteLocalizedStrings.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteLocalizedStrings.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteLocalizedStrings.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteLocalizedStrings.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteNumberSubstitution.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteNumberSubstitution.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteNumberSubstitution.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteNumberSubstitution.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWritePixelSnapping.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWritePixelSnapping.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWritePixelSnapping.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWritePixelSnapping.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteRemoteFontFileLoader.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRemoteFontFileLoader.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteRemoteFontFileLoader.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRemoteFontFileLoader.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteRemoteFontFileStream.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRemoteFontFileStream.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteRemoteFontFileStream.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRemoteFontFileStream.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRenderingParams.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRenderingParams.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRenderingParams1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRenderingParams1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRenderingParams2.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams2.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRenderingParams2.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRenderingParams3.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteRenderingParams3.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteRenderingParams3.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteStringList.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteStringList.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteStringList.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteStringList.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSink.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalysisSink.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSink.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalysisSink.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSink1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalysisSink1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSink1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalysisSink1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSource.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalysisSource.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSource.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalysisSource.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSource1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalysisSource1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalysisSource1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalysisSource1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalyzer.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalyzer.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalyzer1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalyzer1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalyzer2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer2.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextAnalyzer2.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer2.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat2.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat2.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat2.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat3.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextFormat3.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextFormat3.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout2.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout2.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout2.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout3.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout3.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout3.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout4.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout4.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextLayout4.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout4.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextRenderer.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextRenderer.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextRenderer.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextRenderer.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTextRenderer1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextRenderer1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTextRenderer1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextRenderer1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/IDWriteTypography.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTypography.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/IDWriteTypography.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTypography.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/InformationalStringId.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/InformationalStringId.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/InformationalStringId.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/InformationalStringId.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/InlineObjectMetrics.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/InlineObjectMetrics.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/InlineObjectMetrics.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/InlineObjectMetrics.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/JustificationOpportunity.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/JustificationOpportunity.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/JustificationOpportunity.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/JustificationOpportunity.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/LineBreakpoint.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/LineBreakpoint.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/LineBreakpoint.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/LineBreakpoint.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/LineMetrics.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/LineMetrics.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/LineMetrics.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/LineMetrics.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/LineMetrics1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/LineMetrics1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/LineMetrics1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/LineMetrics1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/LineSpacing.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/LineSpacing.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/LineSpacing.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/LineSpacing.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/LineSpacingMethod.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/LineSpacingMethod.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/LineSpacingMethod.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/LineSpacingMethod.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/Locality.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Locality.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/Locality.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/Locality.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/MeasuringMode.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/MeasuringMode.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/MeasuringMode.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/MeasuringMode.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/NumberSubstitutionMethod.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/NumberSubstitutionMethod.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/NumberSubstitutionMethod.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/NumberSubstitutionMethod.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/OpticalAlignment.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/OpticalAlignment.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/OpticalAlignment.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/OpticalAlignment.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/OutlineThreshold.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/OutlineThreshold.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/OutlineThreshold.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/OutlineThreshold.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/OverhangMetrics.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/OverhangMetrics.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/OverhangMetrics.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/OverhangMetrics.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/Panose.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Panose.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/Panose.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/Panose.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseArmStyle.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseArmStyle.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseArmStyle.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseArmStyle.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseAspect.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseAspect.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseAspect.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseAspect.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseAspectRatio.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseAspectRatio.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseAspectRatio.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseAspectRatio.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseCharacterRanges.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseCharacterRanges.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseCharacterRanges.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseCharacterRanges.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseContrast.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseContrast.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseContrast.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseContrast.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseDecorativeClass.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseDecorativeClass.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseDecorativeClass.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseDecorativeClass.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseDecorativeTopology.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseDecorativeTopology.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseDecorativeTopology.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseDecorativeTopology.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseFamily.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseFamily.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseFamily.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseFamily.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseFill.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseFill.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseFill.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseFill.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseFinials.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseFinials.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseFinials.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseFinials.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseLetterform.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseLetterform.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseLetterform.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseLetterform.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseLining.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseLining.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseLining.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseLining.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseMidline.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseMidline.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseMidline.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseMidline.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseProportion.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseProportion.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseProportion.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseProportion.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseScriptForm.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseScriptForm.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseScriptForm.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseScriptForm.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseScriptTopology.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseScriptTopology.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseScriptTopology.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseScriptTopology.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseSerifStyle.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseSerifStyle.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseSerifStyle.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseSerifStyle.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseSpacing.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseSpacing.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseSpacing.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseSpacing.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseStrokeVariation.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseStrokeVariation.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseStrokeVariation.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseStrokeVariation.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseSymbolAspectRatio.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseSymbolAspectRatio.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseSymbolAspectRatio.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseSymbolAspectRatio.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseSymbolKind.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseSymbolKind.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseSymbolKind.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseSymbolKind.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseToolKind.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseToolKind.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseToolKind.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseToolKind.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseWeight.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseWeight.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseWeight.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseWeight.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseXascent.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseXascent.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseXascent.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseXascent.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PanoseXheight.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseXheight.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PanoseXheight.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PanoseXheight.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/ParagraphAlignment.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/ParagraphAlignment.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/ParagraphAlignment.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/ParagraphAlignment.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/PixelGeometry.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/PixelGeometry.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/PixelGeometry.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/PixelGeometry.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/ReadingDirection.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/ReadingDirection.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/ReadingDirection.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/ReadingDirection.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/RenderingMode.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/RenderingMode.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/RenderingMode.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/RenderingMode.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/RenderingMode1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/RenderingMode1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/RenderingMode1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/RenderingMode1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/ScriptAnalysis.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/ScriptAnalysis.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/ScriptAnalysis.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/ScriptAnalysis.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/ScriptProperties.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/ScriptProperties.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/ScriptProperties.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/ScriptProperties.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/ScriptShapes.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/ScriptShapes.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/ScriptShapes.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/ScriptShapes.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/ShapingGlyphProperties.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/ShapingGlyphProperties.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/ShapingGlyphProperties.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/ShapingGlyphProperties.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/ShapingTextProperties.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/ShapingTextProperties.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/ShapingTextProperties.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/ShapingTextProperties.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/Strikethrough.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Strikethrough.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/Strikethrough.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/Strikethrough.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/TextAlignment.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/TextAlignment.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/TextAlignment.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/TextAlignment.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/TextAntialiasMode.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/TextAntialiasMode.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/TextAntialiasMode.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/TextAntialiasMode.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/TextMetrics.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/TextMetrics.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/TextMetrics.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/TextMetrics.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/TextMetrics1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/TextMetrics1.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/TextMetrics1.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/TextMetrics1.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/TextRange.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/TextRange.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/TextRange.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/TextRange.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/TextureType.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/TextureType.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/TextureType.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/TextureType.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/Trimming.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Trimming.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/Trimming.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/Trimming.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/TrimmingGranularity.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/TrimmingGranularity.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/TrimmingGranularity.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/TrimmingGranularity.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/TypographicFeatures.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/TypographicFeatures.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/TypographicFeatures.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/TypographicFeatures.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/Underline.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Underline.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/Underline.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/Underline.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/UnicodeRange.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/UnicodeRange.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/UnicodeRange.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/UnicodeRange.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/VerticalGlyphOrientation.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/VerticalGlyphOrientation.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/VerticalGlyphOrientation.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/VerticalGlyphOrientation.cs
diff --git a/src/Vortice.Win32.DirectWrite/Generated/WordWrapping.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/WordWrapping.cs
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Generated/WordWrapping.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/Generated/WordWrapping.cs
diff --git a/src/Vortice.Win32.DirectWrite/IDWriteFactory.cs b/src/Vortice.Win32.Graphics.DirectWrite/IDWriteFactory.cs
similarity index 97%
rename from src/Vortice.Win32.DirectWrite/IDWriteFactory.cs
rename to src/Vortice.Win32.Graphics.DirectWrite/IDWriteFactory.cs
index d19f0b5..7c43eb8 100644
--- a/src/Vortice.Win32.DirectWrite/IDWriteFactory.cs
+++ b/src/Vortice.Win32.Graphics.DirectWrite/IDWriteFactory.cs
@@ -1,9 +1,6 @@
 // Copyright © Amer Koleci and Contributors.
 // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.
 
-using System.Runtime.InteropServices.ComTypes;
-using Win32.Graphics.Imaging;
-
 namespace Win32.Graphics.DirectWrite;
 
 public unsafe partial struct IDWriteFactory
diff --git a/src/Vortice.Win32.DirectWrite/Vortice.Win32.DirectWrite.csproj b/src/Vortice.Win32.Graphics.DirectWrite/Vortice.Win32.Graphics.DirectWrite.csproj
similarity index 100%
rename from src/Vortice.Win32.DirectWrite/Vortice.Win32.DirectWrite.csproj
rename to src/Vortice.Win32.Graphics.DirectWrite/Vortice.Win32.Graphics.DirectWrite.csproj
diff --git a/src/Vortice.Win32/Graphics/Imaging/Apis.cs b/src/Vortice.Win32.Graphics.Imaging/Apis.cs
similarity index 100%
rename from src/Vortice.Win32/Graphics/Imaging/Apis.cs
rename to src/Vortice.Win32.Graphics.Imaging/Apis.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/Apis.Functions.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/Apis.Functions.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/Apis.Functions.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/Apis.Functions.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/Apis.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/Apis.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/Apis.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/Apis.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmap.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmap.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmap.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmap.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapClipper.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapClipper.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapClipper.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapClipper.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapCodecInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapCodecInfo.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapCodecInfo.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapCodecInfo.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapCodecProgressNotification.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapCodecProgressNotification.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapCodecProgressNotification.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapCodecProgressNotification.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapDecoder.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapDecoder.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapDecoder.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapDecoder.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapDecoderInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapDecoderInfo.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapDecoderInfo.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapDecoderInfo.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapEncoder.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapEncoder.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapEncoder.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapEncoder.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapEncoderInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapEncoderInfo.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapEncoderInfo.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapEncoderInfo.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapFlipRotator.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapFlipRotator.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapFlipRotator.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapFlipRotator.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapFrameDecode.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapFrameDecode.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapFrameDecode.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapFrameDecode.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapFrameEncode.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapFrameEncode.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapFrameEncode.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapFrameEncode.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapLock.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapLock.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapLock.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapLock.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapScaler.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapScaler.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapScaler.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapScaler.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapSource.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapSource.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapSource.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapSource.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapSourceTransform.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapSourceTransform.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICBitmapSourceTransform.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICBitmapSourceTransform.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICColorContext.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICColorContext.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICColorContext.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICColorContext.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICColorTransform.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICColorTransform.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICColorTransform.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICColorTransform.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICComponentFactory.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICComponentFactory.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICComponentFactory.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICComponentFactory.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICComponentInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICComponentInfo.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICComponentInfo.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICComponentInfo.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICDdsDecoder.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICDdsDecoder.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICDdsDecoder.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICDdsDecoder.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICDdsEncoder.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICDdsEncoder.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICDdsEncoder.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICDdsEncoder.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICDdsFrameDecode.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICDdsFrameDecode.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICDdsFrameDecode.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICDdsFrameDecode.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICDevelopRaw.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICDevelopRaw.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICDevelopRaw.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICDevelopRaw.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICDevelopRawNotificationCallback.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICDevelopRawNotificationCallback.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICDevelopRawNotificationCallback.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICDevelopRawNotificationCallback.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICEnumMetadataItem.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICEnumMetadataItem.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICEnumMetadataItem.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICEnumMetadataItem.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICFastMetadataEncoder.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICFastMetadataEncoder.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICFastMetadataEncoder.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICFastMetadataEncoder.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICFormatConverter.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICFormatConverter.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICFormatConverter.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICFormatConverter.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICFormatConverterInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICFormatConverterInfo.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICFormatConverterInfo.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICFormatConverterInfo.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICImagingFactory.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICImagingFactory.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICImagingFactory.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICImagingFactory.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICJpegFrameDecode.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICJpegFrameDecode.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICJpegFrameDecode.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICJpegFrameDecode.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICJpegFrameEncode.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICJpegFrameEncode.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICJpegFrameEncode.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICJpegFrameEncode.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataBlockReader.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataBlockReader.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataBlockReader.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataBlockReader.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataBlockWriter.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataBlockWriter.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataBlockWriter.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataBlockWriter.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataHandlerInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataHandlerInfo.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataHandlerInfo.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataHandlerInfo.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataQueryReader.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataQueryReader.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataQueryReader.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataQueryReader.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataQueryWriter.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataQueryWriter.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataQueryWriter.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataQueryWriter.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataReader.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataReader.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataReader.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataReader.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataReaderInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataReaderInfo.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataReaderInfo.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataReaderInfo.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataWriter.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataWriter.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataWriter.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataWriter.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataWriterInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataWriterInfo.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICMetadataWriterInfo.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICMetadataWriterInfo.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICPalette.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPalette.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICPalette.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICPalette.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICPersistStream.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPersistStream.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICPersistStream.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICPersistStream.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICPixelFormatInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPixelFormatInfo.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICPixelFormatInfo.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICPixelFormatInfo.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICPixelFormatInfo2.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPixelFormatInfo2.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICPixelFormatInfo2.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICPixelFormatInfo2.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICPlanarBitmapFrameEncode.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPlanarBitmapFrameEncode.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICPlanarBitmapFrameEncode.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICPlanarBitmapFrameEncode.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICPlanarBitmapSourceTransform.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPlanarBitmapSourceTransform.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICPlanarBitmapSourceTransform.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICPlanarBitmapSourceTransform.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICPlanarFormatConverter.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICPlanarFormatConverter.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICPlanarFormatConverter.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICPlanarFormatConverter.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICProgressCallback.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICProgressCallback.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICProgressCallback.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICProgressCallback.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICProgressiveLevelControl.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICProgressiveLevelControl.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICProgressiveLevelControl.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICProgressiveLevelControl.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICStream.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICStream.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICStream.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICStream.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICStreamProvider.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/IWICStreamProvider.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/IWICStreamProvider.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/IWICStreamProvider.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WIC8BIMIptcDigestProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WIC8BIMIptcDigestProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WIC8BIMIptcDigestProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WIC8BIMIptcDigestProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WIC8BIMIptcProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WIC8BIMIptcProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WIC8BIMIptcProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WIC8BIMIptcProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WIC8BIMResolutionInfoProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WIC8BIMResolutionInfoProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WIC8BIMResolutionInfoProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WIC8BIMResolutionInfoProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapAlphaChannelOption.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapAlphaChannelOption.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapAlphaChannelOption.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapAlphaChannelOption.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapCreateCacheOption.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapCreateCacheOption.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapCreateCacheOption.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapCreateCacheOption.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapDecoderCapabilities.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapDecoderCapabilities.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapDecoderCapabilities.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapDecoderCapabilities.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapDitherType.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapDitherType.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapDitherType.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapDitherType.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapEncoderCacheOption.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapEncoderCacheOption.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapEncoderCacheOption.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapEncoderCacheOption.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapInterpolationMode.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapInterpolationMode.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapInterpolationMode.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapInterpolationMode.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapLockFlags.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapLockFlags.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapLockFlags.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapLockFlags.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapPaletteType.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapPaletteType.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapPaletteType.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapPaletteType.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapPattern.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapPattern.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapPattern.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapPattern.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapPlane.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapPlane.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapPlane.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapPlane.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapPlaneDescription.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapPlaneDescription.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapPlaneDescription.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapPlaneDescription.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapTransformOptions.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapTransformOptions.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICBitmapTransformOptions.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICBitmapTransformOptions.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICColorContextType.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICColorContextType.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICColorContextType.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICColorContextType.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICComponentEnumerateOptions.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICComponentEnumerateOptions.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICComponentEnumerateOptions.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICComponentEnumerateOptions.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICComponentSigning.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICComponentSigning.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICComponentSigning.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICComponentSigning.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICComponentType.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICComponentType.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICComponentType.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICComponentType.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICDdsAlphaMode.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICDdsAlphaMode.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICDdsAlphaMode.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICDdsAlphaMode.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICDdsDimension.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICDdsDimension.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICDdsDimension.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICDdsDimension.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICDdsFormatInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICDdsFormatInfo.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICDdsFormatInfo.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICDdsFormatInfo.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICDdsParameters.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICDdsParameters.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICDdsParameters.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICDdsParameters.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICDecodeOptions.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICDecodeOptions.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICDecodeOptions.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICDecodeOptions.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICGifApplicationExtensionProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICGifApplicationExtensionProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICGifApplicationExtensionProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICGifApplicationExtensionProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICGifCommentExtensionProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICGifCommentExtensionProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICGifCommentExtensionProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICGifCommentExtensionProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICGifGraphicControlExtensionProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICGifGraphicControlExtensionProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICGifGraphicControlExtensionProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICGifGraphicControlExtensionProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICGifImageDescriptorProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICGifImageDescriptorProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICGifImageDescriptorProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICGifImageDescriptorProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICGifLogicalScreenDescriptorProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICGifLogicalScreenDescriptorProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICGifLogicalScreenDescriptorProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICGifLogicalScreenDescriptorProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICHeifHdrProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICHeifHdrProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICHeifHdrProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICHeifHdrProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICHeifProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICHeifProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICHeifProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICHeifProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICImageParameters.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICImageParameters.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICImageParameters.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICImageParameters.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegChrominanceProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegChrominanceProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegChrominanceProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegChrominanceProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegCommentProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegCommentProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegCommentProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegCommentProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegFrameHeader.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegFrameHeader.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegFrameHeader.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegFrameHeader.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegIndexingOptions.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegIndexingOptions.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegIndexingOptions.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegIndexingOptions.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegLuminanceProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegLuminanceProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegLuminanceProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegLuminanceProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegScanHeader.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegScanHeader.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegScanHeader.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegScanHeader.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegScanType.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegScanType.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegScanType.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegScanType.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegTransferMatrix.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegTransferMatrix.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegTransferMatrix.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegTransferMatrix.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegYCrCbSubsamplingOption.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegYCrCbSubsamplingOption.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICJpegYCrCbSubsamplingOption.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICJpegYCrCbSubsamplingOption.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICMetadataCreationOptions.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICMetadataCreationOptions.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICMetadataCreationOptions.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICMetadataCreationOptions.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICMetadataHeader.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICMetadataHeader.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICMetadataHeader.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICMetadataHeader.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICMetadataPattern.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICMetadataPattern.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICMetadataPattern.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICMetadataPattern.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICNamedWhitePoint.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICNamedWhitePoint.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICNamedWhitePoint.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICNamedWhitePoint.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICPersistOptions.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICPersistOptions.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICPersistOptions.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICPersistOptions.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICPixelFormatNumericRepresentation.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICPixelFormatNumericRepresentation.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICPixelFormatNumericRepresentation.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICPixelFormatNumericRepresentation.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICPlanarOptions.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICPlanarOptions.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICPlanarOptions.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICPlanarOptions.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICPngBkgdProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICPngBkgdProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICPngBkgdProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICPngBkgdProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICPngChrmProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICPngChrmProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICPngChrmProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICPngChrmProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICPngFilterOption.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICPngFilterOption.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICPngFilterOption.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICPngFilterOption.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICPngGamaProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICPngGamaProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICPngGamaProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICPngGamaProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICPngHistProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICPngHistProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICPngHistProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICPngHistProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICPngIccpProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICPngIccpProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICPngIccpProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICPngIccpProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICPngItxtProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICPngItxtProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICPngItxtProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICPngItxtProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICPngSrgbProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICPngSrgbProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICPngSrgbProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICPngSrgbProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICPngTimeProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICPngTimeProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICPngTimeProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICPngTimeProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICProgressNotification.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICProgressNotification.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICProgressNotification.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICProgressNotification.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICProgressOperation.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICProgressOperation.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICProgressOperation.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICProgressOperation.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICRawCapabilities.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICRawCapabilities.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICRawCapabilities.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICRawCapabilities.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICRawCapabilitiesInfo.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICRawCapabilitiesInfo.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICRawCapabilitiesInfo.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICRawCapabilitiesInfo.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICRawParameterSet.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICRawParameterSet.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICRawParameterSet.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICRawParameterSet.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICRawRenderMode.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICRawRenderMode.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICRawRenderMode.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICRawRenderMode.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICRawRotationCapabilities.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICRawRotationCapabilities.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICRawRotationCapabilities.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICRawRotationCapabilities.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICRawToneCurve.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICRawToneCurve.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICRawToneCurve.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICRawToneCurve.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICRawToneCurvePoint.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICRawToneCurvePoint.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICRawToneCurvePoint.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICRawToneCurvePoint.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICSectionAccessLevel.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICSectionAccessLevel.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICSectionAccessLevel.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICSectionAccessLevel.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICTiffCompressionOption.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICTiffCompressionOption.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICTiffCompressionOption.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICTiffCompressionOption.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICWebpAnimProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICWebpAnimProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICWebpAnimProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICWebpAnimProperties.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/WICWebpAnmfProperties.cs b/src/Vortice.Win32.Graphics.Imaging/Generated/WICWebpAnmfProperties.cs
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging/WICWebpAnmfProperties.cs
rename to src/Vortice.Win32.Graphics.Imaging/Generated/WICWebpAnmfProperties.cs
diff --git a/src/Vortice.Win32/Graphics/Imaging/IWICBitmapSource.cs b/src/Vortice.Win32.Graphics.Imaging/IWICBitmapSource.cs
similarity index 100%
rename from src/Vortice.Win32/Graphics/Imaging/IWICBitmapSource.cs
rename to src/Vortice.Win32.Graphics.Imaging/IWICBitmapSource.cs
diff --git a/src/Vortice.Win32/Graphics/Imaging/IWICImagingFactory.cs b/src/Vortice.Win32.Graphics.Imaging/IWICImagingFactory.cs
similarity index 100%
rename from src/Vortice.Win32/Graphics/Imaging/IWICImagingFactory.cs
rename to src/Vortice.Win32.Graphics.Imaging/IWICImagingFactory.cs
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging.xml b/src/Vortice.Win32.Graphics.Imaging/Imaging.xml
similarity index 100%
rename from src/Vortice.Win32/Generated/Graphics/Imaging.xml
rename to src/Vortice.Win32.Graphics.Imaging/Imaging.xml
diff --git a/src/Vortice.Win32.Graphics.Imaging/Vortice.Win32.Graphics.Imaging.csproj b/src/Vortice.Win32.Graphics.Imaging/Vortice.Win32.Graphics.Imaging.csproj
new file mode 100644
index 0000000..05e3b78
--- /dev/null
+++ b/src/Vortice.Win32.Graphics.Imaging/Vortice.Win32.Graphics.Imaging.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
+    <Description>DXC bindings.</Description>
+    
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>0419;$(NoWarn)</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Using Include="System.Numerics" />
+    <Using Include="System.Diagnostics" />
+    <Using Include="System.Runtime.CompilerServices" />
+    <Using Include="System.Runtime.InteropServices" />
+    <Using Include="System.Diagnostics.CodeAnalysis" />
+    <Using Include="Win32.Numerics" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Vortice.Win32\Vortice.Win32.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/AffineTransform2DInterpolationMode.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/AffineTransform2DInterpolationMode.cs
index 2762891..dc269d5 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/AffineTransform2DInterpolationMode.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/AffineTransform2DInterpolationMode.cs
@@ -9,26 +9,26 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE"]/*' />
 /// <unmanaged>D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE</unmanaged>
 public enum AffineTransform2DInterpolationMode : uint
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE::D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_NEAREST_NEIGHBOR"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE::D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_NEAREST_NEIGHBOR"]/*' />
 	/// <unmanaged>D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_NEAREST_NEIGHBOR</unmanaged>
 	NearestNeighbor = 0,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE::D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_LINEAR"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE::D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_LINEAR"]/*' />
 	/// <unmanaged>D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_LINEAR</unmanaged>
 	Linear = 1,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE::D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_CUBIC"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE::D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_CUBIC"]/*' />
 	/// <unmanaged>D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_CUBIC</unmanaged>
 	Cubic = 2,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE::D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE::D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR"]/*' />
 	/// <unmanaged>D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR</unmanaged>
 	MultiSampleLinear = 3,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE::D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_ANISOTROPIC"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE::D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_ANISOTROPIC"]/*' />
 	/// <unmanaged>D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_ANISOTROPIC</unmanaged>
 	Anisotropic = 4,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE::D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE::D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC"]/*' />
 	/// <unmanaged>D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC</unmanaged>
 	HighQualityCubic = 5,
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/AlphaMode.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/AlphaMode.cs
index 7c1cfd2..1614650 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/AlphaMode.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/AlphaMode.cs
@@ -9,20 +9,20 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_ALPHA_MODE"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_ALPHA_MODE"]/*' />
 /// <unmanaged>D2D1_ALPHA_MODE</unmanaged>
 public enum AlphaMode : uint
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_ALPHA_MODE::D2D1_ALPHA_MODE_UNKNOWN"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_ALPHA_MODE::D2D1_ALPHA_MODE_UNKNOWN"]/*' />
 	/// <unmanaged>D2D1_ALPHA_MODE_UNKNOWN</unmanaged>
 	Unknown = 0,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_ALPHA_MODE::D2D1_ALPHA_MODE_PREMULTIPLIED"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_ALPHA_MODE::D2D1_ALPHA_MODE_PREMULTIPLIED"]/*' />
 	/// <unmanaged>D2D1_ALPHA_MODE_PREMULTIPLIED</unmanaged>
 	Premultiplied = 1,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_ALPHA_MODE::D2D1_ALPHA_MODE_STRAIGHT"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_ALPHA_MODE::D2D1_ALPHA_MODE_STRAIGHT"]/*' />
 	/// <unmanaged>D2D1_ALPHA_MODE_STRAIGHT</unmanaged>
 	Straight = 2,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_ALPHA_MODE::D2D1_ALPHA_MODE_IGNORE"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_ALPHA_MODE::D2D1_ALPHA_MODE_IGNORE"]/*' />
 	/// <unmanaged>D2D1_ALPHA_MODE_IGNORE</unmanaged>
 	Ignore = 3,
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/BezierSegment.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/BezierSegment.cs
index 56b306d..e8dac9a 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/BezierSegment.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/BezierSegment.cs
@@ -9,16 +9,16 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BEZIER_SEGMENT"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BEZIER_SEGMENT"]/*' />
 /// <unmanaged>D2D1_BEZIER_SEGMENT</unmanaged>
 public partial struct BezierSegment
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BEZIER_SEGMENT::point1"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BEZIER_SEGMENT::point1"]/*' />
 	public System.Drawing.PointF point1;
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BEZIER_SEGMENT::point2"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BEZIER_SEGMENT::point2"]/*' />
 	public System.Drawing.PointF point2;
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BEZIER_SEGMENT::point3"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BEZIER_SEGMENT::point3"]/*' />
 	public System.Drawing.PointF point3;
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/BlendMode.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/BlendMode.cs
index efb52d0..af7a224 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/BlendMode.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/BlendMode.cs
@@ -9,86 +9,86 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE"]/*' />
 /// <unmanaged>D2D1_BLEND_MODE</unmanaged>
 public enum BlendMode : uint
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_MULTIPLY"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_MULTIPLY"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_MULTIPLY</unmanaged>
 	Multiply = 0,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_SCREEN"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_SCREEN"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_SCREEN</unmanaged>
 	Screen = 1,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_DARKEN"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_DARKEN"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_DARKEN</unmanaged>
 	Darken = 2,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_LIGHTEN"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_LIGHTEN"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_LIGHTEN</unmanaged>
 	Lighten = 3,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_DISSOLVE"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_DISSOLVE"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_DISSOLVE</unmanaged>
 	Dissolve = 4,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_COLOR_BURN"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_COLOR_BURN"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_COLOR_BURN</unmanaged>
 	ColorBurn = 5,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_LINEAR_BURN"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_LINEAR_BURN"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_LINEAR_BURN</unmanaged>
 	LinearBurn = 6,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_DARKER_COLOR"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_DARKER_COLOR"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_DARKER_COLOR</unmanaged>
 	DarkerColor = 7,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_LIGHTER_COLOR"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_LIGHTER_COLOR"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_LIGHTER_COLOR</unmanaged>
 	LighterColor = 8,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_COLOR_DODGE"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_COLOR_DODGE"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_COLOR_DODGE</unmanaged>
 	ColorDodge = 9,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_LINEAR_DODGE"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_LINEAR_DODGE"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_LINEAR_DODGE</unmanaged>
 	LinearDodge = 10,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_OVERLAY"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_OVERLAY"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_OVERLAY</unmanaged>
 	Overlay = 11,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_SOFT_LIGHT"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_SOFT_LIGHT"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_SOFT_LIGHT</unmanaged>
 	SoftLight = 12,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_HARD_LIGHT"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_HARD_LIGHT"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_HARD_LIGHT</unmanaged>
 	HardLight = 13,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_VIVID_LIGHT"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_VIVID_LIGHT"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_VIVID_LIGHT</unmanaged>
 	VividLight = 14,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_LINEAR_LIGHT"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_LINEAR_LIGHT"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_LINEAR_LIGHT</unmanaged>
 	LinearLight = 15,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_PIN_LIGHT"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_PIN_LIGHT"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_PIN_LIGHT</unmanaged>
 	PinLight = 16,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_HARD_MIX"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_HARD_MIX"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_HARD_MIX</unmanaged>
 	HardMix = 17,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_DIFFERENCE"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_DIFFERENCE"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_DIFFERENCE</unmanaged>
 	Difference = 18,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_EXCLUSION"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_EXCLUSION"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_EXCLUSION</unmanaged>
 	Exclusion = 19,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_HUE"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_HUE"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_HUE</unmanaged>
 	Hue = 20,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_SATURATION"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_SATURATION"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_SATURATION</unmanaged>
 	Saturation = 21,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_COLOR"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_COLOR"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_COLOR</unmanaged>
 	Color = 22,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_LUMINOSITY"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_LUMINOSITY"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_LUMINOSITY</unmanaged>
 	Luminosity = 23,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_SUBTRACT"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_SUBTRACT"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_SUBTRACT</unmanaged>
 	Subtract = 24,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_DIVISION"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BLEND_MODE::D2D1_BLEND_MODE_DIVISION"]/*' />
 	/// <unmanaged>D2D1_BLEND_MODE_DIVISION</unmanaged>
 	Division = 25,
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/BorderMode.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/BorderMode.cs
index 40c5f23..56b077e 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/BorderMode.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/BorderMode.cs
@@ -9,14 +9,14 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BORDER_MODE"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BORDER_MODE"]/*' />
 /// <unmanaged>D2D1_BORDER_MODE</unmanaged>
 public enum BorderMode : uint
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BORDER_MODE::D2D1_BORDER_MODE_SOFT"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BORDER_MODE::D2D1_BORDER_MODE_SOFT"]/*' />
 	/// <unmanaged>D2D1_BORDER_MODE_SOFT</unmanaged>
 	Soft = 0,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BORDER_MODE::D2D1_BORDER_MODE_HARD"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BORDER_MODE::D2D1_BORDER_MODE_HARD"]/*' />
 	/// <unmanaged>D2D1_BORDER_MODE_HARD</unmanaged>
 	Hard = 1,
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/ColorMatrixAlphaMode.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/ColorMatrixAlphaMode.cs
index 5457eec..a683826 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/ColorMatrixAlphaMode.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/ColorMatrixAlphaMode.cs
@@ -9,14 +9,14 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COLORMATRIX_ALPHA_MODE"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COLORMATRIX_ALPHA_MODE"]/*' />
 /// <unmanaged>D2D1_COLORMATRIX_ALPHA_MODE</unmanaged>
 public enum ColorMatrixAlphaMode : uint
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COLORMATRIX_ALPHA_MODE::D2D1_COLORMATRIX_ALPHA_MODE_PREMULTIPLIED"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COLORMATRIX_ALPHA_MODE::D2D1_COLORMATRIX_ALPHA_MODE_PREMULTIPLIED"]/*' />
 	/// <unmanaged>D2D1_COLORMATRIX_ALPHA_MODE_PREMULTIPLIED</unmanaged>
 	Premultiplied = 1,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COLORMATRIX_ALPHA_MODE::D2D1_COLORMATRIX_ALPHA_MODE_STRAIGHT"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COLORMATRIX_ALPHA_MODE::D2D1_COLORMATRIX_ALPHA_MODE_STRAIGHT"]/*' />
 	/// <unmanaged>D2D1_COLORMATRIX_ALPHA_MODE_STRAIGHT</unmanaged>
 	Straight = 2,
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/CompositeMode.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/CompositeMode.cs
index cc81461..41a92d3 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/CompositeMode.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/CompositeMode.cs
@@ -9,47 +9,47 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE"]/*' />
 /// <unmanaged>D2D1_COMPOSITE_MODE</unmanaged>
 public enum CompositeMode : uint
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_SOURCE_OVER"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_SOURCE_OVER"]/*' />
 	/// <unmanaged>D2D1_COMPOSITE_MODE_SOURCE_OVER</unmanaged>
 	SourceOver = 0,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_DESTINATION_OVER"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_DESTINATION_OVER"]/*' />
 	/// <unmanaged>D2D1_COMPOSITE_MODE_DESTINATION_OVER</unmanaged>
 	DestinationOver = 1,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_SOURCE_IN"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_SOURCE_IN"]/*' />
 	/// <unmanaged>D2D1_COMPOSITE_MODE_SOURCE_IN</unmanaged>
 	SourceIn = 2,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_DESTINATION_IN"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_DESTINATION_IN"]/*' />
 	/// <unmanaged>D2D1_COMPOSITE_MODE_DESTINATION_IN</unmanaged>
 	DestinationIn = 3,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_SOURCE_OUT"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_SOURCE_OUT"]/*' />
 	/// <unmanaged>D2D1_COMPOSITE_MODE_SOURCE_OUT</unmanaged>
 	SourceOut = 4,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_DESTINATION_OUT"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_DESTINATION_OUT"]/*' />
 	/// <unmanaged>D2D1_COMPOSITE_MODE_DESTINATION_OUT</unmanaged>
 	DestinationOut = 5,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_SOURCE_ATOP"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_SOURCE_ATOP"]/*' />
 	/// <unmanaged>D2D1_COMPOSITE_MODE_SOURCE_ATOP</unmanaged>
 	SourceAtop = 6,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_DESTINATION_ATOP"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_DESTINATION_ATOP"]/*' />
 	/// <unmanaged>D2D1_COMPOSITE_MODE_DESTINATION_ATOP</unmanaged>
 	DestinationAtop = 7,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_XOR"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_XOR"]/*' />
 	/// <unmanaged>D2D1_COMPOSITE_MODE_XOR</unmanaged>
 	Xor = 8,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_PLUS"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_PLUS"]/*' />
 	/// <unmanaged>D2D1_COMPOSITE_MODE_PLUS</unmanaged>
 	Plus = 9,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_SOURCE_COPY"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_SOURCE_COPY"]/*' />
 	/// <unmanaged>D2D1_COMPOSITE_MODE_SOURCE_COPY</unmanaged>
 	SourceCopy = 10,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_BOUNDED_SOURCE_COPY"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_BOUNDED_SOURCE_COPY"]/*' />
 	/// <unmanaged>D2D1_COMPOSITE_MODE_BOUNDED_SOURCE_COPY</unmanaged>
 	BoundedSourceCopy = 11,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_MASK_INVERT"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_COMPOSITE_MODE::D2D1_COMPOSITE_MODE_MASK_INVERT"]/*' />
 	/// <unmanaged>D2D1_COMPOSITE_MODE_MASK_INVERT</unmanaged>
 	MaskInvert = 12,
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/FigureBegin.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/FigureBegin.cs
index 9fd3b99..4ddbdcc 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/FigureBegin.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/FigureBegin.cs
@@ -9,14 +9,14 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FIGURE_BEGIN"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FIGURE_BEGIN"]/*' />
 /// <unmanaged>D2D1_FIGURE_BEGIN</unmanaged>
 public enum FigureBegin : uint
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FIGURE_BEGIN::D2D1_FIGURE_BEGIN_FILLED"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FIGURE_BEGIN::D2D1_FIGURE_BEGIN_FILLED"]/*' />
 	/// <unmanaged>D2D1_FIGURE_BEGIN_FILLED</unmanaged>
 	Filled = 0,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FIGURE_BEGIN::D2D1_FIGURE_BEGIN_HOLLOW"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FIGURE_BEGIN::D2D1_FIGURE_BEGIN_HOLLOW"]/*' />
 	/// <unmanaged>D2D1_FIGURE_BEGIN_HOLLOW</unmanaged>
 	Hollow = 1,
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/FigureEnd.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/FigureEnd.cs
index d3d167f..22e988e 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/FigureEnd.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/FigureEnd.cs
@@ -9,14 +9,14 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FIGURE_END"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FIGURE_END"]/*' />
 /// <unmanaged>D2D1_FIGURE_END</unmanaged>
 public enum FigureEnd : uint
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FIGURE_END::D2D1_FIGURE_END_OPEN"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FIGURE_END::D2D1_FIGURE_END_OPEN"]/*' />
 	/// <unmanaged>D2D1_FIGURE_END_OPEN</unmanaged>
 	Open = 0,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FIGURE_END::D2D1_FIGURE_END_CLOSED"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FIGURE_END::D2D1_FIGURE_END_CLOSED"]/*' />
 	/// <unmanaged>D2D1_FIGURE_END_CLOSED</unmanaged>
 	Closed = 1,
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/FillMode.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/FillMode.cs
index 2bb573a..a7d0f68 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/FillMode.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/FillMode.cs
@@ -9,14 +9,14 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FILL_MODE"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FILL_MODE"]/*' />
 /// <unmanaged>D2D1_FILL_MODE</unmanaged>
 public enum FillMode : uint
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FILL_MODE::D2D1_FILL_MODE_ALTERNATE"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FILL_MODE::D2D1_FILL_MODE_ALTERNATE"]/*' />
 	/// <unmanaged>D2D1_FILL_MODE_ALTERNATE</unmanaged>
 	Alternate = 0,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FILL_MODE::D2D1_FILL_MODE_WINDING"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_FILL_MODE::D2D1_FILL_MODE_WINDING"]/*' />
 	/// <unmanaged>D2D1_FILL_MODE_WINDING</unmanaged>
 	Winding = 1,
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/ID2D1SimplifiedGeometrySink.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/ID2D1SimplifiedGeometrySink.cs
index b6c3914..205f315 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/ID2D1SimplifiedGeometrySink.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/ID2D1SimplifiedGeometrySink.cs
@@ -9,7 +9,7 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink"]/*' />
 /// <unmanaged>ID2D1SimplifiedGeometrySink</unmanaged>
 [Guid("2cd9069e-12e2-11dc-9fed-001143a055f9")]
 [NativeTypeName("struct ID2D1SimplifiedGeometrySink : IUnknown")]
@@ -74,7 +74,7 @@ public unsafe partial struct ID2D1SimplifiedGeometrySink : INativeGuid
 		return ((delegate* unmanaged[Stdcall]<IUnknown*, uint>)(lpVtbl[2]))((IUnknown*)Unsafe.AsPointer(ref this));
 	}
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::SetFillMode"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::SetFillMode"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
 	public void SetFillMode(FillMode fillMode)
@@ -82,7 +82,7 @@ public unsafe partial struct ID2D1SimplifiedGeometrySink : INativeGuid
 		((delegate* unmanaged[Stdcall]<ID2D1SimplifiedGeometrySink*, FillMode, void>)(lpVtbl[3]))((ID2D1SimplifiedGeometrySink*)Unsafe.AsPointer(ref this), fillMode);
 	}
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::SetSegmentFlags"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::SetSegmentFlags"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
 	public void SetSegmentFlags(PathSegment vertexFlags)
@@ -90,7 +90,7 @@ public unsafe partial struct ID2D1SimplifiedGeometrySink : INativeGuid
 		((delegate* unmanaged[Stdcall]<ID2D1SimplifiedGeometrySink*, PathSegment, void>)(lpVtbl[4]))((ID2D1SimplifiedGeometrySink*)Unsafe.AsPointer(ref this), vertexFlags);
 	}
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::BeginFigure"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::BeginFigure"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
 	public void BeginFigure(System.Drawing.PointF startPoint, FigureBegin figureBegin)
@@ -98,7 +98,7 @@ public unsafe partial struct ID2D1SimplifiedGeometrySink : INativeGuid
 		((delegate* unmanaged[Stdcall]<ID2D1SimplifiedGeometrySink*, System.Drawing.PointF, FigureBegin, void>)(lpVtbl[5]))((ID2D1SimplifiedGeometrySink*)Unsafe.AsPointer(ref this), startPoint, figureBegin);
 	}
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::AddLines"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::AddLines"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(6)]
 	public void AddLines(System.Drawing.PointF* points, uint pointsCount)
@@ -106,7 +106,7 @@ public unsafe partial struct ID2D1SimplifiedGeometrySink : INativeGuid
 		((delegate* unmanaged[Stdcall]<ID2D1SimplifiedGeometrySink*, System.Drawing.PointF*, uint, void>)(lpVtbl[6]))((ID2D1SimplifiedGeometrySink*)Unsafe.AsPointer(ref this), points, pointsCount);
 	}
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::AddBeziers"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::AddBeziers"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(7)]
 	public void AddBeziers(BezierSegment* beziers, uint beziersCount)
@@ -114,7 +114,7 @@ public unsafe partial struct ID2D1SimplifiedGeometrySink : INativeGuid
 		((delegate* unmanaged[Stdcall]<ID2D1SimplifiedGeometrySink*, BezierSegment*, uint, void>)(lpVtbl[7]))((ID2D1SimplifiedGeometrySink*)Unsafe.AsPointer(ref this), beziers, beziersCount);
 	}
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::EndFigure"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::EndFigure"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(8)]
 	public void EndFigure(FigureEnd figureEnd)
@@ -122,7 +122,7 @@ public unsafe partial struct ID2D1SimplifiedGeometrySink : INativeGuid
 		((delegate* unmanaged[Stdcall]<ID2D1SimplifiedGeometrySink*, FigureEnd, void>)(lpVtbl[8]))((ID2D1SimplifiedGeometrySink*)Unsafe.AsPointer(ref this), figureEnd);
 	}
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::Close"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="ID2D1SimplifiedGeometrySink::Close"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
 	public HResult Close()
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/PathSegment.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/PathSegment.cs
index 8ad8c16..b29ee5b 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/PathSegment.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/PathSegment.cs
@@ -9,18 +9,18 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PATH_SEGMENT"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PATH_SEGMENT"]/*' />
 /// <unmanaged>D2D1_PATH_SEGMENT</unmanaged>
 [Flags]
 public enum PathSegment : uint
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PATH_SEGMENT::D2D1_PATH_SEGMENT_NONE"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PATH_SEGMENT::D2D1_PATH_SEGMENT_NONE"]/*' />
 	/// <unmanaged>D2D1_PATH_SEGMENT_NONE</unmanaged>
 	None = 0,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PATH_SEGMENT::D2D1_PATH_SEGMENT_FORCE_UNSTROKED"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PATH_SEGMENT::D2D1_PATH_SEGMENT_FORCE_UNSTROKED"]/*' />
 	/// <unmanaged>D2D1_PATH_SEGMENT_FORCE_UNSTROKED</unmanaged>
 	ForceUnstroked = 1,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PATH_SEGMENT::D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PATH_SEGMENT::D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN"]/*' />
 	/// <unmanaged>D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN</unmanaged>
 	ForceRoundLineJoin = 2,
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/PixelFormat.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/PixelFormat.cs
index 9196049..661b7b6 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/PixelFormat.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/PixelFormat.cs
@@ -9,13 +9,13 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PIXEL_FORMAT"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PIXEL_FORMAT"]/*' />
 /// <unmanaged>D2D1_PIXEL_FORMAT</unmanaged>
 public partial struct PixelFormat
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PIXEL_FORMAT::format"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PIXEL_FORMAT::format"]/*' />
 	public Graphics.Dxgi.Common.Format format;
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PIXEL_FORMAT::alphaMode"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_PIXEL_FORMAT::alphaMode"]/*' />
 	public AlphaMode alphaMode;
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/RectF.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/RectF.cs
index f280a4e..657c95f 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/RectF.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/RectF.cs
@@ -9,19 +9,19 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F"]/*' />
 /// <unmanaged>D2D_RECT_F</unmanaged>
 public partial struct RectF
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F::left"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F::left"]/*' />
 	public float left;
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F::top"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F::top"]/*' />
 	public float top;
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F::right"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F::right"]/*' />
 	public float right;
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F::bottom"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F::bottom"]/*' />
 	public float bottom;
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/RectU.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/RectU.cs
index e755dd7..0b8ef72 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/RectU.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/RectU.cs
@@ -9,19 +9,19 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U"]/*' />
 /// <unmanaged>D2D_RECT_U</unmanaged>
 public partial struct RectU
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U::left"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U::left"]/*' />
 	public uint left;
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U::top"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U::top"]/*' />
 	public uint top;
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U::right"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U::right"]/*' />
 	public uint right;
 
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U::bottom"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U::bottom"]/*' />
 	public uint bottom;
 }
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/TurbulenceNoise.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/TurbulenceNoise.cs
index 61e3830..2e916b5 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/TurbulenceNoise.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/TurbulenceNoise.cs
@@ -9,14 +9,14 @@
 
 namespace Win32.Graphics.Direct2D.Common;
 
-/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_TURBULENCE_NOISE"]/*' />
+/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_TURBULENCE_NOISE"]/*' />
 /// <unmanaged>D2D1_TURBULENCE_NOISE</unmanaged>
 public enum TurbulenceNoise : uint
 {
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_TURBULENCE_NOISE::D2D1_TURBULENCE_NOISE_FRACTAL_SUM"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_TURBULENCE_NOISE::D2D1_TURBULENCE_NOISE_FRACTAL_SUM"]/*' />
 	/// <unmanaged>D2D1_TURBULENCE_NOISE_FRACTAL_SUM</unmanaged>
 	FractalSum = 0,
-	/// <include file='../../../../Vortice.Win32.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_TURBULENCE_NOISE::D2D1_TURBULENCE_NOISE_TURBULENCE"]/*' />
+	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_TURBULENCE_NOISE::D2D1_TURBULENCE_NOISE_TURBULENCE"]/*' />
 	/// <unmanaged>D2D1_TURBULENCE_NOISE_TURBULENCE</unmanaged>
 	Turbulence = 1,
 }
diff --git a/src/Vortice.Win32/Properties/AssemblyInfo.cs b/src/Vortice.Win32/Properties/AssemblyInfo.cs
index 67bcffb..4647b93 100644
--- a/src/Vortice.Win32/Properties/AssemblyInfo.cs
+++ b/src/Vortice.Win32/Properties/AssemblyInfo.cs
@@ -1,8 +1,9 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Vortice.Win32.Direct3D11")]
-[assembly: InternalsVisibleTo("Vortice.Win32.Direct3D12")]
-[assembly: InternalsVisibleTo("Vortice.Win32.Direct3D11on12")]
-[assembly: InternalsVisibleTo("Vortice.Win32.Direct2D")]
-[assembly: InternalsVisibleTo("Vortice.Win32.DirectWrite")]
-[assembly: InternalsVisibleTo("Vortice.Win32.Dxc")]
+[assembly: InternalsVisibleTo("Vortice.Win32.Graphics.Direct3D11")]
+[assembly: InternalsVisibleTo("Vortice.Win32.Graphics.Direct3D12")]
+[assembly: InternalsVisibleTo("Vortice.Win32.Graphics.Direct3D11on12")]
+[assembly: InternalsVisibleTo("Vortice.Win32.Graphics.Imaging")]
+[assembly: InternalsVisibleTo("Vortice.Win32.Graphics.DirectWrite")]
+[assembly: InternalsVisibleTo("Vortice.Win32.Graphics.Direct2D")]
+[assembly: InternalsVisibleTo("Vortice.Win32.Graphics.Direct3D.Dxc")]
diff --git a/src/samples/01-ClearScreen/01-ClearScreen.csproj b/src/samples/01-ClearScreen/01-ClearScreen.csproj
index ea066e9..8ce3ec2 100644
--- a/src/samples/01-ClearScreen/01-ClearScreen.csproj
+++ b/src/samples/01-ClearScreen/01-ClearScreen.csproj
@@ -9,11 +9,11 @@
   
   <ItemGroup>
     <ProjectReference Include="..\..\Vortice.Win32.Direct2D\Vortice.Win32.Direct2D.csproj" />
-    <ProjectReference Include="..\..\Vortice.Win32.Direct3D11on12\Vortice.Win32.Direct3D11on12.csproj" />
-    <ProjectReference Include="..\..\Vortice.Win32.Direct3D11\Vortice.Win32.Direct3D11.csproj" />
-    <ProjectReference Include="..\..\Vortice.Win32.Direct3D12\Vortice.Win32.Direct3D12.csproj" />
-    <ProjectReference Include="..\..\Vortice.Win32.DirectWrite\Vortice.Win32.DirectWrite.csproj" />
     <ProjectReference Include="..\..\Vortice.Win32.Dxc\Vortice.Win32.Dxc.csproj" />
+    <ProjectReference Include="..\..\Vortice.Win32.DirectWrite\Vortice.Win32.DirectWrite.csproj" />
+    <ProjectReference Include="..\..\Vortice.Win32.Graphics.Direct3D11\Vortice.Win32.Graphics.Direct3D11.csproj" />
+    <ProjectReference Include="..\..\Vortice.Win32.Graphics.Direct3D12\Vortice.Win32.Graphics.Direct3D12.csproj" />
+    <ProjectReference Include="..\..\Vortice.Win32.Graphics.Direct3D11on12\Vortice.Win32.Graphics.Direct3D11on12.csproj" />
   </ItemGroup>
 
   <ItemGroup>