diff --git a/VisualGDB/Amiberry/Amiberry.sln b/VisualGDB/Amiberry.sln
similarity index 52%
rename from VisualGDB/Amiberry/Amiberry.sln
rename to VisualGDB/Amiberry.sln
index b6b04af7..17d6a774 100644
--- a/VisualGDB/Amiberry/Amiberry.sln
+++ b/VisualGDB/Amiberry.sln
@@ -3,65 +3,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29209.62
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry", "Amiberry.vcxproj", "{FDC6BF55-C4BC-44FB-85A9-3369784716E8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry", "Amiberry\Amiberry.vcxproj", "{FDC6BF55-C4BC-44FB-85A9-3369784716E8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6} = {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guisan", "..\guisan\guisan.vcxproj", "{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guisan", "guisan\guisan.vcxproj", "{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|VisualGDB = Debug|VisualGDB
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Debug-dispmanx|VisualGDB = Debug-dispmanx|VisualGDB
-		Debug-dispmanx|x64 = Debug-dispmanx|x64
-		Debug-dispmanx|x86 = Debug-dispmanx|x86
 		Release|VisualGDB = Release|VisualGDB
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 		Release-dispmanx|VisualGDB = Release-dispmanx|VisualGDB
-		Release-dispmanx|x64 = Release-dispmanx|x64
-		Release-dispmanx|x86 = Release-dispmanx|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|x64.ActiveCfg = Debug|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|x86.ActiveCfg = Debug|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug-dispmanx|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|VisualGDB.Build.0 = Debug-dispmanx|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|x64.ActiveCfg = Debug-dispmanx|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|x86.ActiveCfg = Debug-dispmanx|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|VisualGDB.Build.0 = Release|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|x64.ActiveCfg = Release|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|x86.ActiveCfg = Release|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|VisualGDB.ActiveCfg = Release-dispmanx|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|VisualGDB.Build.0 = Release-dispmanx|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|x64.ActiveCfg = Release-dispmanx|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|x86.ActiveCfg = Release-dispmanx|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|x64.ActiveCfg = Debug|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|x86.ActiveCfg = Debug|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x64.ActiveCfg = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x64.Build.0 = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x86.ActiveCfg = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x86.Build.0 = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|VisualGDB.Build.0 = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|x64.ActiveCfg = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|x86.ActiveCfg = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|VisualGDB.ActiveCfg = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|VisualGDB.Build.0 = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x64.ActiveCfg = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x64.Build.0 = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x86.ActiveCfg = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x86.Build.0 = Release|VisualGDB
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj
index cde5a4d3..a7b2e56d 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj
@@ -39,7 +39,7 @@
     <GNUConfigurationType>Debug</GNUConfigurationType>
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>8.3.0/8.2.1/r2</ToolchainVersion>
-    <TargetName>$(ProjectName)-sdl2</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
     <RemoteBuildHost>
     </RemoteBuildHost>
   </PropertyGroup>
@@ -47,21 +47,21 @@
     <GNUConfigurationType>Debug</GNUConfigurationType>
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>8.3.0/8.2.1/r2</ToolchainVersion>
-    <TargetName>$(ProjectName)-sdl2</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
     <RemoteBuildHost>
     </RemoteBuildHost>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>8.3.0/8.2.1/r2</ToolchainVersion>
-    <TargetName>$(ProjectName)-sdl2</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
     <RemoteBuildHost>
     </RemoteBuildHost>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-dispmanx|VisualGDB'">
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>8.3.0/8.2.1/r2</ToolchainVersion>
-    <TargetName>$(ProjectName)-sdl2</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
     <RemoteBuildHost>
     </RemoteBuildHost>
   </PropertyGroup>