diff --git a/Xamarin.Forms.ControlGallery.WinForms/App.config b/WinFormsTestApp/App.config
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WinForms/App.config
rename to WinFormsTestApp/App.config
diff --git a/Xamarin.Forms.ControlGallery.WinForms/App.cs b/WinFormsTestApp/App.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WinForms/App.cs
rename to WinFormsTestApp/App.cs
diff --git a/WinFormsTestApp/OpenTK.dll.config b/WinFormsTestApp/OpenTK.dll.config
new file mode 100644
index 0000000..7098d39
--- /dev/null
+++ b/WinFormsTestApp/OpenTK.dll.config
@@ -0,0 +1,25 @@
+<configuration>
+  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
+  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
+  <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
+  <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
+  <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
+  <dllmap os="linux" dll="libX11" target="libX11.so.6"/>
+  <dllmap os="linux" dll="libXi" target="libXi.so.6"/>
+  <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
+  <dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
+  <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
+  <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
+  <!-- XQuartz compatibility (X11 on Mac) -->
+  <dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
+  <dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
+  <dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
+  <dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
+  <dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
+  <dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
+</configuration>
diff --git a/Xamarin.Forms.ControlGallery.WinForms/Page1.xaml b/WinFormsTestApp/Page1.xaml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WinForms/Page1.xaml
rename to WinFormsTestApp/Page1.xaml
diff --git a/Xamarin.Forms.ControlGallery.WinForms/Page1.xaml.cs b/WinFormsTestApp/Page1.xaml.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WinForms/Page1.xaml.cs
rename to WinFormsTestApp/Page1.xaml.cs
diff --git a/Xamarin.Forms.ControlGallery.WinForms/Program.cs b/WinFormsTestApp/Program.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WinForms/Program.cs
rename to WinFormsTestApp/Program.cs
diff --git a/Xamarin.Forms.ControlGallery.WinForms/Properties/AssemblyInfo.cs b/WinFormsTestApp/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WinForms/Properties/AssemblyInfo.cs
rename to WinFormsTestApp/Properties/AssemblyInfo.cs
diff --git a/Xamarin.Forms.ControlGallery.WinForms/Properties/Resources.Designer.cs b/WinFormsTestApp/Properties/Resources.Designer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WinForms/Properties/Resources.Designer.cs
rename to WinFormsTestApp/Properties/Resources.Designer.cs
diff --git a/Xamarin.Forms.ControlGallery.WinForms/Properties/Resources.resx b/WinFormsTestApp/Properties/Resources.resx
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WinForms/Properties/Resources.resx
rename to WinFormsTestApp/Properties/Resources.resx
diff --git a/Xamarin.Forms.ControlGallery.WinForms/Properties/Settings.Designer.cs b/WinFormsTestApp/Properties/Settings.Designer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WinForms/Properties/Settings.Designer.cs
rename to WinFormsTestApp/Properties/Settings.Designer.cs
diff --git a/Xamarin.Forms.ControlGallery.WinForms/Properties/Settings.settings b/WinFormsTestApp/Properties/Settings.settings
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WinForms/Properties/Settings.settings
rename to WinFormsTestApp/Properties/Settings.settings
diff --git a/Xamarin.Forms.ControlGallery.WinForms/Xamarin.Forms.ControlGallery.WinForms.csproj b/WinFormsTestApp/WinFormsTestApp.csproj
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WinForms/Xamarin.Forms.ControlGallery.WinForms.csproj
rename to WinFormsTestApp/WinFormsTestApp.csproj
diff --git a/Xamarin.Forms.ControlGallery.WinForms/packages.config b/WinFormsTestApp/packages.config
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WinForms/packages.config
rename to WinFormsTestApp/packages.config
diff --git a/Xamarin.Forms.WinForms.sln b/Xamarin.Forms.WinForms.sln
index 77451fe..ed94863 100644
--- a/Xamarin.Forms.WinForms.sln
+++ b/Xamarin.Forms.WinForms.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.WinForms", "Xamarin.Forms.Platform.WinForms\Xamarin.Forms.Platform.WinForms.csproj", "{563D7C2E-14E2-47EC-95E4-4EA0BBA75C18}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.ControlGallery.WinForms", "Xamarin.Forms.ControlGallery.WinForms\Xamarin.Forms.ControlGallery.WinForms.csproj", "{63390A59-21A4-42AC-B3E0-18B65DDDD87A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsTestApp", "WinFormsTestApp\WinFormsTestApp.csproj", "{63390A59-21A4-42AC-B3E0-18B65DDDD87A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms.WinForms", "SkiaSharp.Views.Forms.WinForms\SkiaSharp.Views.Forms.WinForms.csproj", "{DC2D61AA-3749-485B-A6BB-343E738211A8}"
 EndProject