diff --git a/Bizware/BizHawk.Bizware.BizwareGL/Art.cs b/BizHawk.Bizware.BizwareGL/Art.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/Art.cs
rename to BizHawk.Bizware.BizwareGL/Art.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/ArtManager.cs b/BizHawk.Bizware.BizwareGL/ArtManager.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/ArtManager.cs
rename to BizHawk.Bizware.BizwareGL/ArtManager.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/AttributeInfo.cs b/BizHawk.Bizware.BizwareGL/AttributeInfo.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/AttributeInfo.cs
rename to BizHawk.Bizware.BizwareGL/AttributeInfo.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/AttributeUsage.cs b/BizHawk.Bizware.BizwareGL/AttributeUsage.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/AttributeUsage.cs
rename to BizHawk.Bizware.BizwareGL/AttributeUsage.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BitmapBuffer.cs b/BizHawk.Bizware.BizwareGL/BitmapBuffer.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/BitmapBuffer.cs
rename to BizHawk.Bizware.BizwareGL/BitmapBuffer.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BitmapLoadOptions.cs b/BizHawk.Bizware.BizwareGL/BitmapLoadOptions.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/BitmapLoadOptions.cs
rename to BizHawk.Bizware.BizwareGL/BitmapLoadOptions.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
rename to BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj.DotSettings b/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj.DotSettings
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj.DotSettings
rename to BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj.DotSettings
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFont.cs b/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFont.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFont.cs
rename to BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFont.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFontLoader.cs b/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFontLoader.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFontLoader.cs
rename to BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFontLoader.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Character.cs b/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Character.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Character.cs
rename to BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Character.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Kerning.cs b/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Kerning.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Kerning.cs
rename to BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Kerning.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Padding.cs b/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Padding.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Padding.cs
rename to BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Padding.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Page.cs b/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Page.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Page.cs
rename to BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Page.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/Borrowed/readme.txt b/BizHawk.Bizware.BizwareGL/Borrowed/readme.txt
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/Borrowed/readme.txt
rename to BizHawk.Bizware.BizwareGL/Borrowed/readme.txt
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/CGC.cs b/BizHawk.Bizware.BizwareGL/CGC.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/CGC.cs
rename to BizHawk.Bizware.BizwareGL/CGC.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/Extensions.cs b/BizHawk.Bizware.BizwareGL/Extensions.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/Extensions.cs
rename to BizHawk.Bizware.BizwareGL/Extensions.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/GDIPTextureWrapper.cs b/BizHawk.Bizware.BizwareGL/GDIPTextureWrapper.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/GDIPTextureWrapper.cs
rename to BizHawk.Bizware.BizwareGL/GDIPTextureWrapper.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/GdiPlusGuiRenderer.cs b/BizHawk.Bizware.BizwareGL/GdiPlusGuiRenderer.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/GdiPlusGuiRenderer.cs
rename to BizHawk.Bizware.BizwareGL/GdiPlusGuiRenderer.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/GuiRenderer.cs b/BizHawk.Bizware.BizwareGL/GuiRenderer.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/GuiRenderer.cs
rename to BizHawk.Bizware.BizwareGL/GuiRenderer.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/IGL.cs b/BizHawk.Bizware.BizwareGL/IGL.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/IGL.cs
rename to BizHawk.Bizware.BizwareGL/IGL.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/IGraphicsControl.cs b/BizHawk.Bizware.BizwareGL/IGraphicsControl.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/IGraphicsControl.cs
rename to BizHawk.Bizware.BizwareGL/IGraphicsControl.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/IGuiRenderer.cs b/BizHawk.Bizware.BizwareGL/IGuiRenderer.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/IGuiRenderer.cs
rename to BizHawk.Bizware.BizwareGL/IGuiRenderer.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/MatrixStack.cs b/BizHawk.Bizware.BizwareGL/MatrixStack.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/MatrixStack.cs
rename to BizHawk.Bizware.BizwareGL/MatrixStack.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/Pipeline.cs b/BizHawk.Bizware.BizwareGL/Pipeline.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/Pipeline.cs
rename to BizHawk.Bizware.BizwareGL/Pipeline.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/PipelineUniform.cs b/BizHawk.Bizware.BizwareGL/PipelineUniform.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/PipelineUniform.cs
rename to BizHawk.Bizware.BizwareGL/PipelineUniform.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/RenderStates.cs b/BizHawk.Bizware.BizwareGL/RenderStates.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/RenderStates.cs
rename to BizHawk.Bizware.BizwareGL/RenderStates.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/RenderTarget.cs b/BizHawk.Bizware.BizwareGL/RenderTarget.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/RenderTarget.cs
rename to BizHawk.Bizware.BizwareGL/RenderTarget.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/RetroShader.cs b/BizHawk.Bizware.BizwareGL/RetroShader.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/RetroShader.cs
rename to BizHawk.Bizware.BizwareGL/RetroShader.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/Shader.cs b/BizHawk.Bizware.BizwareGL/Shader.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/Shader.cs
rename to BizHawk.Bizware.BizwareGL/Shader.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/StringRenderer.cs b/BizHawk.Bizware.BizwareGL/StringRenderer.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/StringRenderer.cs
rename to BizHawk.Bizware.BizwareGL/StringRenderer.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/TexAtlas.cs b/BizHawk.Bizware.BizwareGL/TexAtlas.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/TexAtlas.cs
rename to BizHawk.Bizware.BizwareGL/TexAtlas.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/Texture2d.cs b/BizHawk.Bizware.BizwareGL/Texture2d.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/Texture2d.cs
rename to BizHawk.Bizware.BizwareGL/Texture2d.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/UniformInfo.cs b/BizHawk.Bizware.BizwareGL/UniformInfo.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/UniformInfo.cs
rename to BizHawk.Bizware.BizwareGL/UniformInfo.cs
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/VertexLayout.cs b/BizHawk.Bizware.BizwareGL/VertexLayout.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/VertexLayout.cs
rename to BizHawk.Bizware.BizwareGL/VertexLayout.cs
diff --git a/Bizware/BizHawk.Bizware.Test/BizHawk.Bizware.Test.csproj b/BizHawk.Bizware.Test/BizHawk.Bizware.Test.csproj
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/BizHawk.Bizware.Test.csproj
rename to BizHawk.Bizware.Test/BizHawk.Bizware.Test.csproj
diff --git a/Bizware/BizHawk.Bizware.sln b/BizHawk.Bizware.Test/BizHawk.Bizware.Test.sln
similarity index 100%
rename from Bizware/BizHawk.Bizware.sln
rename to BizHawk.Bizware.Test/BizHawk.Bizware.Test.sln
diff --git a/Bizware/BizHawk.Bizware.Test/Program.cs b/BizHawk.Bizware.Test/Program.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/Program.cs
rename to BizHawk.Bizware.Test/Program.cs
diff --git a/Bizware/BizHawk.Bizware.Test/TestForm.Designer.cs b/BizHawk.Bizware.Test/TestForm.Designer.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/TestForm.Designer.cs
rename to BizHawk.Bizware.Test/TestForm.Designer.cs
diff --git a/Bizware/BizHawk.Bizware.Test/TestForm.cs b/BizHawk.Bizware.Test/TestForm.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/TestForm.cs
rename to BizHawk.Bizware.Test/TestForm.cs
diff --git a/Bizware/BizHawk.Bizware.Test/TestForm.resx b/BizHawk.Bizware.Test/TestForm.resx
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/TestForm.resx
rename to BizHawk.Bizware.Test/TestForm.resx
diff --git a/Bizware/BizHawk.Bizware.Test/TestImages/4xSoft.cg b/BizHawk.Bizware.Test/TestImages/4xSoft.cg
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/TestImages/4xSoft.cg
rename to BizHawk.Bizware.Test/TestImages/4xSoft.cg
diff --git a/Bizware/BizHawk.Bizware.Test/TestImages/4xSoft.glsl b/BizHawk.Bizware.Test/TestImages/4xSoft.glsl
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/TestImages/4xSoft.glsl
rename to BizHawk.Bizware.Test/TestImages/4xSoft.glsl
diff --git a/Bizware/BizHawk.Bizware.Test/TestImages/courier16px.fnt b/BizHawk.Bizware.Test/TestImages/courier16px.fnt
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/TestImages/courier16px.fnt
rename to BizHawk.Bizware.Test/TestImages/courier16px.fnt
diff --git a/Bizware/BizHawk.Bizware.Test/TestImages/courier16px_0.png b/BizHawk.Bizware.Test/TestImages/courier16px_0.png
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/TestImages/courier16px_0.png
rename to BizHawk.Bizware.Test/TestImages/courier16px_0.png
diff --git a/Bizware/BizHawk.Bizware.Test/TestImages/flame1.jpg b/BizHawk.Bizware.Test/TestImages/flame1.jpg
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/TestImages/flame1.jpg
rename to BizHawk.Bizware.Test/TestImages/flame1.jpg
diff --git a/Bizware/BizHawk.Bizware.Test/TestImages/flame2.jpg b/BizHawk.Bizware.Test/TestImages/flame2.jpg
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/TestImages/flame2.jpg
rename to BizHawk.Bizware.Test/TestImages/flame2.jpg
diff --git a/Bizware/BizHawk.Bizware.Test/TestImages/flame3.jpg b/BizHawk.Bizware.Test/TestImages/flame3.jpg
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/TestImages/flame3.jpg
rename to BizHawk.Bizware.Test/TestImages/flame3.jpg
diff --git a/Bizware/BizHawk.Bizware.Test/TestImages/flame4.jpg b/BizHawk.Bizware.Test/TestImages/flame4.jpg
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/TestImages/flame4.jpg
rename to BizHawk.Bizware.Test/TestImages/flame4.jpg
diff --git a/Bizware/BizHawk.Bizware.Test/TestImages/flame5.jpg b/BizHawk.Bizware.Test/TestImages/flame5.jpg
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/TestImages/flame5.jpg
rename to BizHawk.Bizware.Test/TestImages/flame5.jpg
diff --git a/Bizware/BizHawk.Bizware.Test/TestImages/smile.png b/BizHawk.Bizware.Test/TestImages/smile.png
similarity index 100%
rename from Bizware/BizHawk.Bizware.Test/TestImages/smile.png
rename to BizHawk.Bizware.Test/TestImages/smile.png
diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index ac1db87a61..6dbb52c973 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -17,7 +17,7 @@
 		<PackageReference Include="SharpCompress" Version="0.24.0" PrivateAssets="All" />
 		<PackageReference Include="SharpZipLib" Version="1.1.0" PrivateAssets="All" />
 		<ProjectReference Include="$(SolutionDir)BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
-		<ProjectReference Include="$(SolutionDir)Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
+		<ProjectReference Include="$(SolutionDir)BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
 		<Compile Include="$(SolutionDir)Version/svnrev.cs" />
 		<Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
 	</ItemGroup>
diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 767011e452..63400c68fd 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -159,7 +159,7 @@
 		<ProjectReference Include="$(SolutionDir)BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj"
 			Name="BizHawk.WinForms.Controls"
 			Project="{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A}" />
-		<ProjectReference Include="$(SolutionDir)Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj"
+		<ProjectReference Include="$(SolutionDir)BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj"
 			Name="BizHawk.Bizware.BizwareGL"
 			Project="{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}" />
 	</ItemGroup>
diff --git a/BizHawk.sln b/BizHawk.sln
index 235803abbe..854801428f 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -43,9 +43,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.Cores", "
 		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bizware", "Bizware", "{0540A9A6-977E-466D-8BD3-1D8590BD5282}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Bizware.BizwareGL", "Bizware\BizHawk.Bizware.BizwareGL\BizHawk.Bizware.BizwareGL.csproj", "{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Bizware.BizwareGL", "BizHawk.Bizware.BizwareGL\BizHawk.Bizware.BizwareGL.csproj", "{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.BizInvoke", "BizHawk.BizInvoke\BizHawk.BizInvoke.csproj", "{E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}"
 EndProject
@@ -109,11 +107,10 @@ Global
 		{24A0AA3C-B25F-4197-B23D-476D6462DBA0} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{DD448B37-BA3F-4544-9754-5406E8094723} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{C4366030-6D03-424B-AE53-F4F43BB217C3} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
+		{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{F51946EA-827F-4D82-B841-1F2F6D060312} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
 		{E1A23168-B571-411C-B360-2229E7225E0E} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
-		{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} = {0540A9A6-977E-466D-8BD3-1D8590BD5282}
-		{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9B9E4316-9185-412E-B951-A63355ACA956}