diff --git a/VSLinux/Amiberry.sln b/VSLinux/Amiberry.sln
index ce389562..e3678a84 100644
--- a/VSLinux/Amiberry.sln
+++ b/VSLinux/Amiberry.sln
@@ -1,20 +1,45 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.10
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry", "Amiberry.vcxproj", "{FDB65B17-494A-4248-9F05-B527D4EA15DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry", "Amiberry.vcxproj", "{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD} = {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guisan", "guisan\guisan.vcxproj", "{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|ARM = Release|ARM
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FDB65B17-494A-4248-9F05-B527D4EA15DF}.Debug|ARM.ActiveCfg = Debug|ARM
-		{FDB65B17-494A-4248-9F05-B527D4EA15DF}.Debug|ARM.Build.0 = Debug|ARM
-		{FDB65B17-494A-4248-9F05-B527D4EA15DF}.Release|ARM.ActiveCfg = Release|ARM
-		{FDB65B17-494A-4248-9F05-B527D4EA15DF}.Release|ARM.Build.0 = Release|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|ARM.ActiveCfg = Debug|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|ARM.Build.0 = Debug|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|x64.ActiveCfg = Debug|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|x86.ActiveCfg = Debug|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|ARM.ActiveCfg = Release|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|ARM.Build.0 = Release|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|x64.ActiveCfg = Release|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|x86.ActiveCfg = Release|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|ARM.ActiveCfg = Debug|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|ARM.Build.0 = Debug|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|x64.ActiveCfg = Debug|x64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|x64.Build.0 = Debug|x64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|x86.ActiveCfg = Debug|x86
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|x86.Build.0 = Debug|x86
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|ARM.ActiveCfg = Release|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|ARM.Build.0 = Release|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|x64.ActiveCfg = Release|x64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|x64.Build.0 = Release|x64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|x86.ActiveCfg = Release|x86
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/VSLinux/Amiberry.vcxproj b/VSLinux/Amiberry.vcxproj
index 6d291813..19dfe62d 100644
--- a/VSLinux/Amiberry.vcxproj
+++ b/VSLinux/Amiberry.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -9,68 +9,149 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x86">
-      <Configuration>Debug</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x86">
-      <Configuration>Release</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{fdb65b17-494a-4248-9f05-b527d4ea15df}</ProjectGuid>
+    <ProjectGuid>{7b9a67b2-3f13-4e7b-a875-aab6caae63d7}</ProjectGuid>
     <Keyword>Linux</Keyword>
     <RootNamespace>Amiberry</RootNamespace>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <ApplicationType>Linux</ApplicationType>
     <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
     <TargetLinuxPlatform>Generic</TargetLinuxPlatform>
-    <LinuxProjectType>{2238F9CD-F817-4ECC-BD14-2524D2669B35}</LinuxProjectType>
+    <LinuxProjectType>{FC1A4D80-50E9-41DA-9192-61C0DBAA00D2}</LinuxProjectType>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="Shared" />
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry; make</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make</RemoteReBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry; make clean</RemoteCleanCommandLine>
+  </PropertyGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\akiko.cpp" />
+    <Text Include="..\conf\dir.txt">
+      <DeploymentContent>true</DeploymentContent>
+    </Text>
+    <Text Include="..\kickstarts\dir.txt">
+      <DeploymentContent>true</DeploymentContent>
+    </Text>
+    <Text Include="..\savestates\dir.txt">
+      <DeploymentContent>true</DeploymentContent>
+    </Text>
+    <Text Include="..\screenshots\dir.txt">
+      <DeploymentContent>true</DeploymentContent>
+    </Text>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\data\35floppy.ico">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\chip.ico">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\cpu.ico">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\delete.png">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\drive.ico">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\expansion.ico">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\file.ico">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\joystick.bmp">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\joystick.ico">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\misc.ico">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\mouse.bmp">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\paths.ico">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\remapping.bmp">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\savestate.png">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\screen.ico">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+    <Image Include="..\data\sound.ico">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <Font Include="..\data\FreeSans.ttf">
+      <DeploymentContent>true</DeploymentContent>
+    </Font>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Makefile">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\src\filesys.asm">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\src\inputevents.def">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\src\osdep\neon_helper.s" />
+    <None Include="..\src\table68k">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\akiko.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\7z\7zAlloc.cpp" />
     <ClCompile Include="..\src\archivers\7z\7zBuf.cpp" />
     <ClCompile Include="..\src\archivers\7z\7zCrc.cpp" />
+    <ClCompile Include="..\src\archivers\7z\7zDecode.cpp" />
+    <ClCompile Include="..\src\archivers\7z\7zExtract.cpp" />
+    <ClCompile Include="..\src\archivers\7z\7zHeader.cpp" />
+    <ClCompile Include="..\src\archivers\7z\7zIn.cpp" />
+    <ClCompile Include="..\src\archivers\7z\7zItem.cpp" />
     <ClCompile Include="..\src\archivers\7z\7zStream.cpp" />
-    <ClCompile Include="..\src\archivers\7z\Archive\7z\7zAlloc.cpp" />
-    <ClCompile Include="..\src\archivers\7z\Archive\7z\7zDecode.cpp" />
-    <ClCompile Include="..\src\archivers\7z\Archive\7z\7zExtract.cpp" />
-    <ClCompile Include="..\src\archivers\7z\Archive\7z\7zHeader.cpp" />
-    <ClCompile Include="..\src\archivers\7z\Archive\7z\7zIn.cpp" />
-    <ClCompile Include="..\src\archivers\7z\Archive\7z\7zItem.cpp" />
     <ClCompile Include="..\src\archivers\7z\Bcj2.cpp" />
     <ClCompile Include="..\src\archivers\7z\Bra.cpp" />
     <ClCompile Include="..\src\archivers\7z\Bra86.cpp" />
@@ -100,57 +181,163 @@
     <ClCompile Include="..\src\archivers\lzx\unlzx.cpp" />
     <ClCompile Include="..\src\archivers\wrp\warp.cpp" />
     <ClCompile Include="..\src\archivers\zip\unzip.cpp" />
-    <ClCompile Include="..\src\aros.rom.cpp" />
-    <ClCompile Include="..\src\audio.cpp" />
-    <ClCompile Include="..\src\autoconf.cpp" />
-    <ClCompile Include="..\src\blitfunc.cpp" />
-    <ClCompile Include="..\src\blitops.cpp" />
-    <ClCompile Include="..\src\blittable.cpp" />
-    <ClCompile Include="..\src\blitter.cpp" />
-    <ClCompile Include="..\src\blkdev.cpp" />
-    <ClCompile Include="..\src\blkdev_cdimage.cpp" />
-    <ClCompile Include="..\src\bsdsocket.cpp" />
-    <ClCompile Include="..\src\build68k.cpp" />
-    <ClCompile Include="..\src\calc.cpp" />
-    <ClCompile Include="..\src\cdrom.cpp" />
-    <ClCompile Include="..\src\cfgfile.cpp" />
-    <ClCompile Include="..\src\cia.cpp" />
-    <ClCompile Include="..\src\cpudefs.cpp" />
-    <ClCompile Include="..\src\cpuemu_0.cpp" />
-    <ClCompile Include="..\src\cpuemu_11.cpp" />
-    <ClCompile Include="..\src\cpuemu_4.cpp" />
-    <ClCompile Include="..\src\cpustbl.cpp" />
-    <ClCompile Include="..\src\crc32.cpp" />
-    <ClCompile Include="..\src\custom.cpp" />
-    <ClCompile Include="..\src\disk.cpp" />
-    <ClCompile Include="..\src\diskutil.cpp" />
-    <ClCompile Include="..\src\drawing.cpp" />
-    <ClCompile Include="..\src\events.cpp" />
-    <ClCompile Include="..\src\expansion.cpp" />
-    <ClCompile Include="..\src\filesys.cpp" />
-    <ClCompile Include="..\src\filesys_bootrom.cpp" />
-    <ClCompile Include="..\src\fpp.cpp" />
-    <ClCompile Include="..\src\fsdb.cpp" />
-    <ClCompile Include="..\src\fsdb_unix.cpp" />
-    <ClCompile Include="..\src\fsusage.cpp" />
-    <ClCompile Include="..\src\genblitter.cpp" />
-    <ClCompile Include="..\src\gencpu.cpp" />
-    <ClCompile Include="..\src\gfxboard.cpp" />
-    <ClCompile Include="..\src\gfxutil.cpp" />
-    <ClCompile Include="..\src\hardfile.cpp" />
-    <ClCompile Include="..\src\inputdevice.cpp" />
+    <ClCompile Include="..\src\aros.rom.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\audio.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\autoconf.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\blitfunc.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\blitops.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\blittable.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\blitter.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\blkdev.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\blkdev_cdimage.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\bsdsocket.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\build68k.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\calc.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\cdrom.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\cfgfile.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\cia.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\cpudefs.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\cpuemu_0.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\cpuemu_11.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\cpuemu_4.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\cpustbl.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\crc32.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\custom.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\disk.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\diskutil.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\drawing.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\events.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\expansion.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\filesys.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\filesys_bootrom.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\fpp.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\fsdb.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\fsdb_unix.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\fsusage.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\genblitter.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\gencpu.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\genlinetoscr.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\gfxboard.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\gfxutil.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\hardfile.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\inputdevice.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\jit\codegen_arm.cpp" />
     <ClCompile Include="..\src\jit\compemu.cpp" />
     <ClCompile Include="..\src\jit\compemu_fpp.cpp" />
+    <ClCompile Include="..\src\jit\compemu_midfunc_arm.cpp" />
+    <ClCompile Include="..\src\jit\compemu_midfunc_arm2.cpp" />
     <ClCompile Include="..\src\jit\compemu_support.cpp" />
     <ClCompile Include="..\src\jit\compstbl.cpp" />
-    <ClCompile Include="..\src\keybuf.cpp" />
-    <ClCompile Include="..\src\linetoscr.c" />
+    <ClCompile Include="..\src\jit\gencomp_arm.cpp" />
+    <ClCompile Include="..\src\keybuf.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\linetoscr.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
     <ClCompile Include="..\src\machdep\support.cpp" />
-    <ClCompile Include="..\src\main.cpp" />
-    <ClCompile Include="..\src\memory.cpp" />
-    <ClCompile Include="..\src\native2amiga.cpp" />
-    <ClCompile Include="..\src\newcpu.cpp" />
-    <ClCompile Include="..\src\newcpu_common.cpp" />
+    <ClCompile Include="..\src\main.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\memory.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\native2amiga.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\newcpu.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\newcpu_common.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\amiberry.cpp" />
+    <ClCompile Include="..\src\osdep\amiberry_filesys.cpp" />
+    <ClCompile Include="..\src\osdep\amiberry_gfx.cpp" />
+    <ClCompile Include="..\src\osdep\amiberry_gui.cpp" />
+    <ClCompile Include="..\src\osdep\amiberry_input.cpp" />
+    <ClCompile Include="..\src\osdep\amiberry_mem.cpp" />
+    <ClCompile Include="..\src\osdep\amiberry_rp9.cpp" />
     <ClCompile Include="..\src\osdep\bsdsocket_host.cpp" />
     <ClCompile Include="..\src\osdep\cda_play.cpp" />
     <ClCompile Include="..\src\osdep\charset.cpp" />
@@ -174,7 +361,6 @@
     <ClCompile Include="..\src\osdep\gui\PanelROM.cpp" />
     <ClCompile Include="..\src\osdep\gui\PanelSavestate.cpp" />
     <ClCompile Include="..\src\osdep\gui\PanelSound.cpp" />
-    <ClCompile Include="..\src\osdep\gui\sdltruetypefont.cpp" />
     <ClCompile Include="..\src\osdep\gui\SelectFile.cpp" />
     <ClCompile Include="..\src\osdep\gui\SelectFolder.cpp" />
     <ClCompile Include="..\src\osdep\gui\SelectorEntry.cpp" />
@@ -183,39 +369,163 @@
     <ClCompile Include="..\src\osdep\gui\UaeDropDown.cpp" />
     <ClCompile Include="..\src\osdep\gui\UaeListBox.cpp" />
     <ClCompile Include="..\src\osdep\gui\UaeRadioButton.cpp" />
-    <ClCompile Include="..\src\osdep\hardfile_pandora.cpp" />
-    <ClCompile Include="..\src\osdep\keyboard.cpp" />
+    <ClCompile Include="..\src\osdep\hardfile_amiberry.cpp" />
+    <ClCompile Include="..\src\osdep\keyboard_amiberry.cpp" />
     <ClCompile Include="..\src\osdep\menu\menu_config.cpp" />
     <ClCompile Include="..\src\osdep\mp3decoder.cpp" />
-    <ClCompile Include="..\src\osdep\pandora.cpp" />
-    <ClCompile Include="..\src\osdep\pandora_filesys.cpp" />
-    <ClCompile Include="..\src\osdep\pandora_gfx.cpp" />
-    <ClCompile Include="..\src\osdep\pandora_gui.cpp" />
-    <ClCompile Include="..\src\osdep\pandora_input.cpp" />
-    <ClCompile Include="..\src\osdep\pandora_mem.cpp" />
-    <ClCompile Include="..\src\osdep\pandora_rp9.cpp" />
     <ClCompile Include="..\src\osdep\picasso96.cpp" />
     <ClCompile Include="..\src\osdep\sigsegv_handler.cpp" />
     <ClCompile Include="..\src\osdep\writelog.cpp" />
-    <ClCompile Include="..\src\p96_blit.cpp" />
-    <ClCompile Include="..\src\readcpu.cpp" />
-    <ClCompile Include="..\src\rommgr.cpp" />
-    <ClCompile Include="..\src\savestate.cpp" />
-    <ClCompile Include="..\src\sinctable.cpp" />
+    <ClCompile Include="..\src\p96_blit.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\readcpu.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\rommgr.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\savestate.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\sinctable.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\sounddep\sound.cpp" />
     <ClCompile Include="..\src\sounddep\sound_sdl_new.cpp" />
-    <ClCompile Include="..\src\statusline.cpp" />
-    <ClCompile Include="..\src\trace.c" />
-    <ClCompile Include="..\src\traps.cpp" />
-    <ClCompile Include="..\src\uaelib.cpp" />
-    <ClCompile Include="..\src\uaeresource.cpp" />
-    <ClCompile Include="..\src\zfile.cpp" />
-    <ClCompile Include="..\src\zfile_archive.cpp" />
+    <ClCompile Include="..\src\statusline.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\traps.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\uaelib.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\uaeresource.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\zfile.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
+    <ClCompile Include="..\src\zfile_archive.cpp">
+      <DeploymentContent>false</DeploymentContent>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\src\filesys.asm" />
-    <None Include="..\src\inputevents.def" />
-    <None Include="..\src\osdep\neon_helper.s" />
-    <None Include="..\src\table68k" />
+    <ClInclude Include="..\src\archivers\7z\7zAlloc.h" />
+    <ClInclude Include="..\src\archivers\7z\7zBuf.h" />
+    <ClInclude Include="..\src\archivers\7z\7zCrc.h" />
+    <ClInclude Include="..\src\archivers\7z\7zDecode.h" />
+    <ClInclude Include="..\src\archivers\7z\7zExtract.h" />
+    <ClInclude Include="..\src\archivers\7z\7zHeader.h" />
+    <ClInclude Include="..\src\archivers\7z\7zIn.h" />
+    <ClInclude Include="..\src\archivers\7z\7zItem.h" />
+    <ClInclude Include="..\src\archivers\7z\7zVersion.h" />
+    <ClInclude Include="..\src\archivers\7z\Bcj2.h" />
+    <ClInclude Include="..\src\archivers\7z\Bra.h" />
+    <ClInclude Include="..\src\archivers\7z\CpuArch.h" />
+    <ClInclude Include="..\src\archivers\7z\LzmaDec.h" />
+    <ClInclude Include="..\src\archivers\7z\Types.h" />
+    <ClInclude Include="..\src\archivers\dms\cdata.h" />
+    <ClInclude Include="..\src\archivers\dms\crc_csum.h" />
+    <ClInclude Include="..\src\archivers\dms\getbits.h" />
+    <ClInclude Include="..\src\archivers\dms\maketbl.h" />
+    <ClInclude Include="..\src\archivers\dms\pfile.h" />
+    <ClInclude Include="..\src\archivers\dms\tables.h" />
+    <ClInclude Include="..\src\archivers\dms\u_deep.h" />
+    <ClInclude Include="..\src\archivers\dms\u_heavy.h" />
+    <ClInclude Include="..\src\archivers\dms\u_init.h" />
+    <ClInclude Include="..\src\archivers\dms\u_medium.h" />
+    <ClInclude Include="..\src\archivers\dms\u_quick.h" />
+    <ClInclude Include="..\src\archivers\dms\u_rle.h" />
+    <ClInclude Include="..\src\archivers\lha\lha.h" />
+    <ClInclude Include="..\src\archivers\lha\lha_macro.h" />
+    <ClInclude Include="..\src\archivers\wrp\warp.h" />
+    <ClInclude Include="..\src\archivers\zip\unzip.h" />
+    <ClInclude Include="..\src\include\akiko.h" />
+    <ClInclude Include="..\src\include\audio.h" />
+    <ClInclude Include="..\src\include\autoconf.h" />
+    <ClInclude Include="..\src\include\blit.h" />
+    <ClInclude Include="..\src\include\blitfunc.h" />
+    <ClInclude Include="..\src\include\blitter.h" />
+    <ClInclude Include="..\src\include\blkdev.h" />
+    <ClInclude Include="..\src\include\bsdsocket.h" />
+    <ClInclude Include="..\src\include\calc.h" />
+    <ClInclude Include="..\src\include\cia.h" />
+    <ClInclude Include="..\src\include\clipboard.h" />
+    <ClInclude Include="..\src\include\commpipe.h" />
+    <ClInclude Include="..\src\include\cputbl.h" />
+    <ClInclude Include="..\src\include\cpu_prefetch.h" />
+    <ClInclude Include="..\src\include\crc32.h" />
+    <ClInclude Include="..\src\include\custom.h" />
+    <ClInclude Include="..\src\include\debug.h" />
+    <ClInclude Include="..\src\include\disk.h" />
+    <ClInclude Include="..\src\include\diskutil.h" />
+    <ClInclude Include="..\src\include\drawing.h" />
+    <ClInclude Include="..\src\include\ersatz.h" />
+    <ClInclude Include="..\src\include\events.h" />
+    <ClInclude Include="..\src\include\execio.h" />
+    <ClInclude Include="..\src\include\execlib.h" />
+    <ClInclude Include="..\src\include\filesys.h" />
+    <ClInclude Include="..\src\include\flags_arm.h" />
+    <ClInclude Include="..\src\include\fpp-ieee-be.h" />
+    <ClInclude Include="..\src\include\fpp-unknown.h" />
+    <ClInclude Include="..\src\include\fsdb.h" />
+    <ClInclude Include="..\src\include\fsusage.h" />
+    <ClInclude Include="..\src\include\genblitter.h" />
+    <ClInclude Include="..\src\include\gensound.h" />
+    <ClInclude Include="..\src\include\gfxboard.h" />
+    <ClInclude Include="..\src\include\gui.h" />
+    <ClInclude Include="..\src\include\inputdevice.h" />
+    <ClInclude Include="..\src\include\keyboard.h" />
+    <ClInclude Include="..\src\include\keybuf.h" />
+    <ClInclude Include="..\src\include\mackbd.h" />
+    <ClInclude Include="..\src\include\memory.h" />
+    <ClInclude Include="..\src\include\native2amiga.h" />
+    <ClInclude Include="..\src\include\native2amiga_api.h" />
+    <ClInclude Include="..\src\include\newcpu.h" />
+    <ClInclude Include="..\src\include\options.h" />
+    <ClInclude Include="..\src\include\osemu.h" />
+    <ClInclude Include="..\src\include\picasso96.h" />
+    <ClInclude Include="..\src\include\readcpu.h" />
+    <ClInclude Include="..\src\include\rommgr.h" />
+    <ClInclude Include="..\src\include\rtgmodes.h" />
+    <ClInclude Include="..\src\include\savestate.h" />
+    <ClInclude Include="..\src\include\scsi.h" />
+    <ClInclude Include="..\src\include\scsidev.h" />
+    <ClInclude Include="..\src\include\statusline.h" />
+    <ClInclude Include="..\src\include\sysdeps.h" />
+    <ClInclude Include="..\src\include\traps.h" />
+    <ClInclude Include="..\src\include\uae.h" />
+    <ClInclude Include="..\src\include\uaeresource.h" />
+    <ClInclude Include="..\src\include\xwin.h" />
+    <ClInclude Include="..\src\include\zarchive.h" />
+    <ClInclude Include="..\src\include\zfile.h" />
+    <ClInclude Include="..\src\jit\codegen_arm.h" />
+    <ClInclude Include="..\src\jit\compemu.h" />
+    <ClInclude Include="..\src\jit\compemu_midfunc_arm.h" />
+    <ClInclude Include="..\src\jit\compemu_midfunc_arm2.h" />
+    <ClInclude Include="..\src\jit\comptbl.h" />
+    <ClInclude Include="..\src\machdep\m68k.h" />
+    <ClInclude Include="..\src\machdep\maccess.h" />
+    <ClInclude Include="..\src\machdep\md-fpp.h" />
+    <ClInclude Include="..\src\machdep\rpt.h" />
+    <ClInclude Include="..\src\osdep\amiberry_gfx.h" />
+    <ClInclude Include="..\src\osdep\amiberry_rp9.h" />
+    <ClInclude Include="..\src\osdep\cda_play.h" />
+    <ClInclude Include="..\src\osdep\config.h" />
+    <ClInclude Include="..\src\osdep\gui\gui_handling.h" />
+    <ClInclude Include="..\src\osdep\gui\SelectorEntry.hpp" />
+    <ClInclude Include="..\src\osdep\gui\UaeCheckBox.hpp" />
+    <ClInclude Include="..\src\osdep\gui\UaeDropDown.hpp" />
+    <ClInclude Include="..\src\osdep\gui\UaeListBox.hpp" />
+    <ClInclude Include="..\src\osdep\gui\UaeRadioButton.hpp" />
+    <ClInclude Include="..\src\osdep\mp3decoder.h" />
+    <ClInclude Include="..\src\osdep\sysconfig.h" />
+    <ClInclude Include="..\src\osdep\target.h" />
+    <ClInclude Include="..\src\sounddep\sound.h" />
+    <ClInclude Include="..\src\threaddep\thread.h" />
   </ItemGroup>
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/VSLinux/Amiberry.vcxproj.filters b/VSLinux/Amiberry.vcxproj.filters
index 9720ee10..52f036d1 100644
--- a/VSLinux/Amiberry.vcxproj.filters
+++ b/VSLinux/Amiberry.vcxproj.filters
@@ -1,389 +1,954 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="osdep">
-      <UniqueIdentifier>{49228265-161c-4a81-bb34-c4b3c5dce9c1}</UniqueIdentifier>
+    <Filter Include="conf">
+      <UniqueIdentifier>{253280e9-c935-41d3-8e4e-39ebc63802f0}</UniqueIdentifier>
     </Filter>
-    <Filter Include="jit">
-      <UniqueIdentifier>{20f71c16-162f-4d26-aae7-b3f1bc9d1c9d}</UniqueIdentifier>
+    <Filter Include="data">
+      <UniqueIdentifier>{53c88284-1055-4c1c-a230-f658b82872e8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="machdep">
-      <UniqueIdentifier>{7c08ca58-13a9-43ec-9b0e-232a5ebd5f87}</UniqueIdentifier>
+    <Filter Include="kickstarts">
+      <UniqueIdentifier>{beb24d9f-04b4-4ff7-a648-2810307c1d90}</UniqueIdentifier>
     </Filter>
-    <Filter Include="sounddep">
-      <UniqueIdentifier>{526ae108-f94b-4747-9119-f77731c5880c}</UniqueIdentifier>
+    <Filter Include="savestates">
+      <UniqueIdentifier>{90bb891e-7895-46e0-9a58-4fc315cfee05}</UniqueIdentifier>
     </Filter>
-    <Filter Include="osdep\menu">
-      <UniqueIdentifier>{50ad2909-799e-4fb0-978f-579fe69ffe66}</UniqueIdentifier>
+    <Filter Include="screenshots">
+      <UniqueIdentifier>{ccc27a70-d842-434a-806a-2c82270a3626}</UniqueIdentifier>
     </Filter>
-    <Filter Include="osdep\gui">
-      <UniqueIdentifier>{f7746b1b-45f2-4042-91f9-38620ffd2c0f}</UniqueIdentifier>
+    <Filter Include="src">
+      <UniqueIdentifier>{18906c9e-7036-435e-b58b-e4e5c06bd8ae}</UniqueIdentifier>
     </Filter>
-    <Filter Include="archivers">
-      <UniqueIdentifier>{66f33547-0e09-45ff-ad9c-fc5dec3c613a}</UniqueIdentifier>
+    <Filter Include="src\archivers">
+      <UniqueIdentifier>{2199a572-d5d5-4cd2-b104-f4ba6d84b67c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="archivers\7z">
-      <UniqueIdentifier>{11f31a8d-4d98-4392-98d8-78f3d43c78e3}</UniqueIdentifier>
+    <Filter Include="src\archivers\7z">
+      <UniqueIdentifier>{2c69437c-7427-4286-911b-2ffed55d3419}</UniqueIdentifier>
     </Filter>
-    <Filter Include="archivers\dms">
-      <UniqueIdentifier>{56baa296-792f-4f0a-b0de-995c05f6ab1c}</UniqueIdentifier>
+    <Filter Include="src\archivers\dms">
+      <UniqueIdentifier>{bc0781c0-e25a-40e5-8352-91325353b9c6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="archivers\lha">
-      <UniqueIdentifier>{2aba86dc-7b9a-49aa-b8c4-23be34727118}</UniqueIdentifier>
+    <Filter Include="src\archivers\lha">
+      <UniqueIdentifier>{5aa6adea-6b4a-421f-85b7-3d991e692797}</UniqueIdentifier>
     </Filter>
-    <Filter Include="archivers\lzx">
-      <UniqueIdentifier>{54f7095b-0cae-44e1-8934-46d9687c8aa7}</UniqueIdentifier>
+    <Filter Include="src\archivers\lzx">
+      <UniqueIdentifier>{c9e8ab77-3764-441d-b860-ac4bafac403f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="archivers\wrp">
-      <UniqueIdentifier>{45071947-9292-477a-a961-aa5389141134}</UniqueIdentifier>
+    <Filter Include="src\archivers\wrp">
+      <UniqueIdentifier>{9e28e271-aba8-4259-9080-15cbb0f84c06}</UniqueIdentifier>
     </Filter>
-    <Filter Include="archivers\zip">
-      <UniqueIdentifier>{47c15abb-07dc-4489-9434-a2bc09f958fa}</UniqueIdentifier>
+    <Filter Include="src\archivers\zip">
+      <UniqueIdentifier>{9262078c-316d-4975-a594-63d1b48e0fe1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="archivers\7z\Archive">
-      <UniqueIdentifier>{c6d41834-f403-43fe-91c4-f661765ccacd}</UniqueIdentifier>
+    <Filter Include="src\include">
+      <UniqueIdentifier>{8d279526-2cc8-4ce5-a4ca-9e528419e925}</UniqueIdentifier>
     </Filter>
-    <Filter Include="archivers\7z\Archive\7z">
-      <UniqueIdentifier>{17cf9b08-84bf-46dd-b5de-a789af5c2224}</UniqueIdentifier>
+    <Filter Include="src\jit">
+      <UniqueIdentifier>{f3850bab-03d2-4fd0-9a0d-25388878f5f4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\machdep">
+      <UniqueIdentifier>{2bcd8c2b-b029-428e-b2b6-8347eadb5199}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\osdep">
+      <UniqueIdentifier>{f0713680-4f05-45d8-b1d4-ea24d1305970}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\osdep\gui">
+      <UniqueIdentifier>{b25f6ac8-afcb-45b8-a0fc-f0bc1c88fba1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\osdep\menu">
+      <UniqueIdentifier>{32996091-d9d9-437f-8338-e15198404b91}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\sounddep">
+      <UniqueIdentifier>{767f436f-8275-4c9f-abf9-a880ba80c1f2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\threaddep">
+      <UniqueIdentifier>{ef3ace82-28e8-45cc-9b49-b6b712e33cd4}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\jit\compemu.cpp">
-      <Filter>jit</Filter>
+    <Text Include="..\conf\dir.txt">
+      <Filter>conf</Filter>
+    </Text>
+    <Text Include="..\kickstarts\dir.txt">
+      <Filter>kickstarts</Filter>
+    </Text>
+    <Text Include="..\savestates\dir.txt">
+      <Filter>savestates</Filter>
+    </Text>
+    <Text Include="..\screenshots\dir.txt">
+      <Filter>screenshots</Filter>
+    </Text>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\data\35floppy.ico">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\chip.ico">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\cpu.ico">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\delete.png">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\drive.ico">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\expansion.ico">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\file.ico">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\joystick.bmp">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\joystick.ico">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\misc.ico">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\mouse.bmp">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\paths.ico">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\remapping.bmp">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\savestate.png">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\screen.ico">
+      <Filter>data</Filter>
+    </Image>
+    <Image Include="..\data\sound.ico">
+      <Filter>data</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <Font Include="..\data\FreeSans.ttf">
+      <Filter>data</Filter>
+    </Font>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Makefile" />
+    <None Include="..\src\filesys.asm">
+      <Filter>src</Filter>
+    </None>
+    <None Include="..\src\inputevents.def">
+      <Filter>src</Filter>
+    </None>
+    <None Include="..\src\table68k">
+      <Filter>src</Filter>
+    </None>
+    <None Include="..\src\osdep\neon_helper.s">
+      <Filter>src\osdep</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\akiko.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\aros.rom.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\audio.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\autoconf.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\blitfunc.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\blitops.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\blittable.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\blitter.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\blkdev.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\blkdev_cdimage.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\bsdsocket.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\build68k.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\calc.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cdrom.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cfgfile.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cia.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cpudefs.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\jit\compemu_fpp.cpp">
-      <Filter>jit</Filter>
+    <ClCompile Include="..\src\cpuemu_0.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\jit\compemu_support.cpp">
-      <Filter>jit</Filter>
+    <ClCompile Include="..\src\cpuemu_4.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\jit\compstbl.cpp">
-      <Filter>jit</Filter>
+    <ClCompile Include="..\src\cpuemu_11.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\machdep\support.cpp">
-      <Filter>machdep</Filter>
+    <ClCompile Include="..\src\cpustbl.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\sounddep\sound_sdl_new.cpp">
-      <Filter>sounddep</Filter>
+    <ClCompile Include="..\src\crc32.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\bsdsocket_host.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\custom.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\cda_play.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\disk.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\charset.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\diskutil.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\fsdb_host.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\drawing.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\hardfile_pandora.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\events.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\keyboard.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\expansion.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\mp3decoder.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\filesys.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\pandora.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\filesys_bootrom.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\pandora_filesys.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\fpp.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\pandora_gui.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\fsdb.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\pandora_input.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\fsdb_unix.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\pandora_mem.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\fsusage.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\pandora_rp9.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\genblitter.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\picasso96.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\gencpu.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\sigsegv_handler.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\genlinetoscr.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\writelog.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\gfxboard.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\menu\menu_config.cpp">
-      <Filter>osdep\menu</Filter>
+    <ClCompile Include="..\src\gfxutil.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\CreateFilesysHardfile.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\hardfile.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\EditFilesysHardfile.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\inputdevice.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\EditFilesysVirtual.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\keybuf.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\InGameMessage.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\linetoscr.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\main_window.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\main.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\Navigation.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\memory.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\PanelChipset.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\native2amiga.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\PanelConfig.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\newcpu.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\PanelCPU.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\newcpu_common.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\PanelDisplay.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\p96_blit.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\PanelFloppy.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\readcpu.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\PanelHD.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\rommgr.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\PanelInput.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\savestate.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\PanelMisc.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\sinctable.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\PanelPaths.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\statusline.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\PanelRAM.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\traps.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\PanelROM.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\uaelib.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\PanelSavestate.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\uaeresource.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\PanelSound.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\zfile.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\sdltruetypefont.cpp">
-      <Filter>osdep\gui</Filter>
+    <ClCompile Include="..\src\zfile_archive.cpp">
+      <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\SelectFile.cpp">
-      <Filter>osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\SelectFolder.cpp">
-      <Filter>osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\SelectorEntry.cpp">
-      <Filter>osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\ShowMessage.cpp">
-      <Filter>osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\UaeCheckBox.cpp">
-      <Filter>osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\UaeDropDown.cpp">
-      <Filter>osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\UaeListBox.cpp">
-      <Filter>osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\UaeRadioButton.cpp">
-      <Filter>osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\zip\unzip.cpp">
-      <Filter>archivers\zip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\wrp\warp.cpp">
-      <Filter>archivers\wrp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\lzx\unlzx.cpp">
-      <Filter>archivers\lzx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\lha\crcio.cpp">
-      <Filter>archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\lha\dhuf.cpp">
-      <Filter>archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\lha\header.cpp">
-      <Filter>archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\lha\huf.cpp">
-      <Filter>archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\lha\larc.cpp">
-      <Filter>archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\lha\lhamaketbl.cpp">
-      <Filter>archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\lha\lharc.cpp">
-      <Filter>archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\lha\shuf.cpp">
-      <Filter>archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\lha\slide.cpp">
-      <Filter>archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\lha\uae_lha.cpp">
-      <Filter>archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\lha\util.cpp">
-      <Filter>archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\dms\crc_csum.cpp">
-      <Filter>archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\dms\getbits.cpp">
-      <Filter>archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\dms\maketbl.cpp">
-      <Filter>archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\dms\pfile.cpp">
-      <Filter>archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\dms\tables.cpp">
-      <Filter>archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\dms\u_deep.cpp">
-      <Filter>archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\dms\u_heavy.cpp">
-      <Filter>archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\dms\u_init.cpp">
-      <Filter>archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\dms\u_medium.cpp">
-      <Filter>archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\dms\u_quick.cpp">
-      <Filter>archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\archivers\dms\u_rle.cpp">
-      <Filter>archivers\dms</Filter>
+    <ClCompile Include="..\src\archivers\7z\7zAlloc.cpp">
+      <Filter>src\archivers\7z</Filter>
     </ClCompile>
     <ClCompile Include="..\src\archivers\7z\7zBuf.cpp">
-      <Filter>archivers\7z</Filter>
+      <Filter>src\archivers\7z</Filter>
     </ClCompile>
     <ClCompile Include="..\src\archivers\7z\7zCrc.cpp">
-      <Filter>archivers\7z</Filter>
+      <Filter>src\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\7z\7zDecode.cpp">
+      <Filter>src\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\7z\7zExtract.cpp">
+      <Filter>src\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\7z\7zHeader.cpp">
+      <Filter>src\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\7z\7zIn.cpp">
+      <Filter>src\archivers\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\7z\7zItem.cpp">
+      <Filter>src\archivers\7z</Filter>
     </ClCompile>
     <ClCompile Include="..\src\archivers\7z\7zStream.cpp">
-      <Filter>archivers\7z</Filter>
+      <Filter>src\archivers\7z</Filter>
     </ClCompile>
     <ClCompile Include="..\src\archivers\7z\Bcj2.cpp">
-      <Filter>archivers\7z</Filter>
+      <Filter>src\archivers\7z</Filter>
     </ClCompile>
     <ClCompile Include="..\src\archivers\7z\Bra.cpp">
-      <Filter>archivers\7z</Filter>
+      <Filter>src\archivers\7z</Filter>
     </ClCompile>
     <ClCompile Include="..\src\archivers\7z\Bra86.cpp">
-      <Filter>archivers\7z</Filter>
+      <Filter>src\archivers\7z</Filter>
     </ClCompile>
     <ClCompile Include="..\src\archivers\7z\LzmaDec.cpp">
-      <Filter>archivers\7z</Filter>
+      <Filter>src\archivers\7z</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\archivers\7z\Archive\7z\7zAlloc.cpp">
-      <Filter>archivers\7z\Archive\7z</Filter>
+    <ClCompile Include="..\src\archivers\dms\crc_csum.cpp">
+      <Filter>src\archivers\dms</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\archivers\7z\Archive\7z\7zDecode.cpp">
-      <Filter>archivers\7z\Archive\7z</Filter>
+    <ClCompile Include="..\src\archivers\dms\getbits.cpp">
+      <Filter>src\archivers\dms</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\archivers\7z\Archive\7z\7zExtract.cpp">
-      <Filter>archivers\7z\Archive\7z</Filter>
+    <ClCompile Include="..\src\archivers\dms\maketbl.cpp">
+      <Filter>src\archivers\dms</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\archivers\7z\Archive\7z\7zHeader.cpp">
-      <Filter>archivers\7z\Archive\7z</Filter>
+    <ClCompile Include="..\src\archivers\dms\pfile.cpp">
+      <Filter>src\archivers\dms</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\archivers\7z\Archive\7z\7zIn.cpp">
-      <Filter>archivers\7z\Archive\7z</Filter>
+    <ClCompile Include="..\src\archivers\dms\tables.cpp">
+      <Filter>src\archivers\dms</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\archivers\7z\Archive\7z\7zItem.cpp">
-      <Filter>archivers\7z\Archive\7z</Filter>
+    <ClCompile Include="..\src\archivers\dms\u_deep.cpp">
+      <Filter>src\archivers\dms</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\akiko.cpp" />
-    <ClCompile Include="..\src\aros.rom.cpp" />
-    <ClCompile Include="..\src\audio.cpp" />
-    <ClCompile Include="..\src\autoconf.cpp" />
-    <ClCompile Include="..\src\blitfunc.cpp" />
-    <ClCompile Include="..\src\blitops.cpp" />
-    <ClCompile Include="..\src\blittable.cpp" />
-    <ClCompile Include="..\src\blitter.cpp" />
-    <ClCompile Include="..\src\blkdev.cpp" />
-    <ClCompile Include="..\src\blkdev_cdimage.cpp" />
-    <ClCompile Include="..\src\bsdsocket.cpp" />
-    <ClCompile Include="..\src\build68k.cpp" />
-    <ClCompile Include="..\src\calc.cpp" />
-    <ClCompile Include="..\src\cdrom.cpp" />
-    <ClCompile Include="..\src\cfgfile.cpp" />
-    <ClCompile Include="..\src\cia.cpp" />
-    <ClCompile Include="..\src\cpudefs.cpp" />
-    <ClCompile Include="..\src\cpuemu_0.cpp" />
-    <ClCompile Include="..\src\cpuemu_11.cpp" />
-    <ClCompile Include="..\src\cpuemu_4.cpp" />
-    <ClCompile Include="..\src\cpustbl.cpp" />
-    <ClCompile Include="..\src\crc32.cpp" />
-    <ClCompile Include="..\src\custom.cpp" />
-    <ClCompile Include="..\src\disk.cpp" />
-    <ClCompile Include="..\src\diskutil.cpp" />
-    <ClCompile Include="..\src\drawing.cpp" />
-    <ClCompile Include="..\src\events.cpp" />
-    <ClCompile Include="..\src\expansion.cpp" />
-    <ClCompile Include="..\src\filesys.cpp" />
-    <ClCompile Include="..\src\filesys_bootrom.cpp" />
-    <ClCompile Include="..\src\fpp.cpp" />
-    <ClCompile Include="..\src\fsdb.cpp" />
-    <ClCompile Include="..\src\fsdb_unix.cpp" />
-    <ClCompile Include="..\src\fsusage.cpp" />
-    <ClCompile Include="..\src\genblitter.cpp" />
-    <ClCompile Include="..\src\gencpu.cpp" />
-    <ClCompile Include="..\src\gfxboard.cpp" />
-    <ClCompile Include="..\src\gfxutil.cpp" />
-    <ClCompile Include="..\src\hardfile.cpp" />
-    <ClCompile Include="..\src\inputdevice.cpp" />
-    <ClCompile Include="..\src\keybuf.cpp" />
-    <ClCompile Include="..\src\linetoscr.c" />
-    <ClCompile Include="..\src\main.cpp" />
-    <ClCompile Include="..\src\memory.cpp" />
-    <ClCompile Include="..\src\native2amiga.cpp" />
-    <ClCompile Include="..\src\newcpu.cpp" />
-    <ClCompile Include="..\src\newcpu_common.cpp" />
-    <ClCompile Include="..\src\p96_blit.cpp" />
-    <ClCompile Include="..\src\readcpu.cpp" />
-    <ClCompile Include="..\src\rommgr.cpp" />
-    <ClCompile Include="..\src\savestate.cpp" />
-    <ClCompile Include="..\src\sinctable.cpp" />
-    <ClCompile Include="..\src\statusline.cpp" />
-    <ClCompile Include="..\src\trace.c" />
-    <ClCompile Include="..\src\traps.cpp" />
-    <ClCompile Include="..\src\uaelib.cpp" />
-    <ClCompile Include="..\src\uaeresource.cpp" />
-    <ClCompile Include="..\src\zfile.cpp" />
-    <ClCompile Include="..\src\zfile_archive.cpp" />
-    <ClCompile Include="..\src\osdep\pandora_gfx.cpp">
-      <Filter>osdep</Filter>
+    <ClCompile Include="..\src\archivers\dms\u_heavy.cpp">
+      <Filter>src\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\dms\u_init.cpp">
+      <Filter>src\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\dms\u_medium.cpp">
+      <Filter>src\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\dms\u_quick.cpp">
+      <Filter>src\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\dms\u_rle.cpp">
+      <Filter>src\archivers\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\lha\crcio.cpp">
+      <Filter>src\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\lha\dhuf.cpp">
+      <Filter>src\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\lha\header.cpp">
+      <Filter>src\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\lha\huf.cpp">
+      <Filter>src\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\lha\larc.cpp">
+      <Filter>src\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\lha\lhamaketbl.cpp">
+      <Filter>src\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\lha\lharc.cpp">
+      <Filter>src\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\lha\shuf.cpp">
+      <Filter>src\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\lha\slide.cpp">
+      <Filter>src\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\lha\uae_lha.cpp">
+      <Filter>src\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\lha\util.cpp">
+      <Filter>src\archivers\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\lzx\unlzx.cpp">
+      <Filter>src\archivers\lzx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\wrp\warp.cpp">
+      <Filter>src\archivers\wrp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\archivers\zip\unzip.cpp">
+      <Filter>src\archivers\zip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\jit\codegen_arm.cpp">
+      <Filter>src\jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\jit\compemu.cpp">
+      <Filter>src\jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\jit\compemu_fpp.cpp">
+      <Filter>src\jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\jit\compemu_midfunc_arm.cpp">
+      <Filter>src\jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\jit\compemu_midfunc_arm2.cpp">
+      <Filter>src\jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\jit\compemu_support.cpp">
+      <Filter>src\jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\jit\compstbl.cpp">
+      <Filter>src\jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\jit\gencomp_arm.cpp">
+      <Filter>src\jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\machdep\support.cpp">
+      <Filter>src\machdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\amiberry.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\amiberry_filesys.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\amiberry_gfx.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\amiberry_gui.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\amiberry_input.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\amiberry_mem.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\amiberry_rp9.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\bsdsocket_host.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\cda_play.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\charset.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\fsdb_host.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\hardfile_amiberry.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\keyboard_amiberry.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\mp3decoder.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\picasso96.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\sigsegv_handler.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\writelog.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\CreateFilesysHardfile.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\EditFilesysHardfile.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\EditFilesysVirtual.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\InGameMessage.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\main_window.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\Navigation.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelChipset.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelConfig.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelCPU.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelDisplay.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelFloppy.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelHD.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelInput.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelMisc.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelPaths.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelRAM.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelROM.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelSavestate.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelSound.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\SelectFile.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\SelectFolder.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\SelectorEntry.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\ShowMessage.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\UaeCheckBox.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\UaeDropDown.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\UaeListBox.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\UaeRadioButton.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\menu\menu_config.cpp">
+      <Filter>src\osdep\menu</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\sounddep\sound.cpp">
+      <Filter>src\sounddep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\sounddep\sound_sdl_new.cpp">
+      <Filter>src\sounddep</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\src\osdep\neon_helper.s">
-      <Filter>osdep</Filter>
-    </None>
-    <None Include="..\src\filesys.asm" />
-    <None Include="..\src\inputevents.def" />
-    <None Include="..\src\table68k" />
+    <ClInclude Include="..\src\archivers\7z\7zAlloc.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\7z\7zBuf.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\7z\7zCrc.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\7z\7zDecode.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\7z\7zExtract.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\7z\7zHeader.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\7z\7zIn.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\7z\7zItem.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\7z\7zVersion.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\7z\Bcj2.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\7z\Bra.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\7z\CpuArch.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\7z\LzmaDec.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\7z\Types.h">
+      <Filter>src\archivers\7z</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\dms\cdata.h">
+      <Filter>src\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\dms\crc_csum.h">
+      <Filter>src\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\dms\getbits.h">
+      <Filter>src\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\dms\maketbl.h">
+      <Filter>src\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\dms\pfile.h">
+      <Filter>src\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\dms\tables.h">
+      <Filter>src\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\dms\u_deep.h">
+      <Filter>src\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\dms\u_heavy.h">
+      <Filter>src\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\dms\u_init.h">
+      <Filter>src\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\dms\u_medium.h">
+      <Filter>src\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\dms\u_quick.h">
+      <Filter>src\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\dms\u_rle.h">
+      <Filter>src\archivers\dms</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\lha\lha.h">
+      <Filter>src\archivers\lha</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\lha\lha_macro.h">
+      <Filter>src\archivers\lha</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\wrp\warp.h">
+      <Filter>src\archivers\wrp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\archivers\zip\unzip.h">
+      <Filter>src\archivers\zip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\akiko.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\audio.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\autoconf.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\blit.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\blitfunc.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\blitter.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\blkdev.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\bsdsocket.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\calc.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\cia.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\clipboard.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\commpipe.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\cpu_prefetch.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\cputbl.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\crc32.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\custom.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\debug.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\disk.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\diskutil.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\drawing.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\ersatz.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\events.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\execio.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\execlib.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\filesys.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\flags_arm.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\fpp-ieee-be.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\fpp-unknown.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\fsdb.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\fsusage.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\genblitter.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\gensound.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\gfxboard.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\gui.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\inputdevice.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\keyboard.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\keybuf.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\mackbd.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\memory.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\native2amiga.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\native2amiga_api.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\newcpu.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\options.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\osemu.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\picasso96.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\readcpu.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\rommgr.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\rtgmodes.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\savestate.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\scsi.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\scsidev.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\statusline.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\sysdeps.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\traps.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\uae.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\uaeresource.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\xwin.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\zarchive.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\zfile.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\jit\codegen_arm.h">
+      <Filter>src\jit</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\jit\compemu.h">
+      <Filter>src\jit</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\jit\compemu_midfunc_arm.h">
+      <Filter>src\jit</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\jit\compemu_midfunc_arm2.h">
+      <Filter>src\jit</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\jit\comptbl.h">
+      <Filter>src\jit</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\machdep\m68k.h">
+      <Filter>src\machdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\machdep\maccess.h">
+      <Filter>src\machdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\machdep\md-fpp.h">
+      <Filter>src\machdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\machdep\rpt.h">
+      <Filter>src\machdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\osdep\amiberry_gfx.h">
+      <Filter>src\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\osdep\amiberry_rp9.h">
+      <Filter>src\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\osdep\cda_play.h">
+      <Filter>src\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\osdep\config.h">
+      <Filter>src\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\osdep\mp3decoder.h">
+      <Filter>src\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\osdep\sysconfig.h">
+      <Filter>src\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\osdep\target.h">
+      <Filter>src\osdep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\osdep\gui\gui_handling.h">
+      <Filter>src\osdep\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\osdep\gui\SelectorEntry.hpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\osdep\gui\UaeCheckBox.hpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\osdep\gui\UaeDropDown.hpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\osdep\gui\UaeListBox.hpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\osdep\gui\UaeRadioButton.hpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\sounddep\sound.h">
+      <Filter>src\sounddep</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\threaddep\thread.h">
+      <Filter>src\threaddep</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VSLinux/Amiberry.vcxproj.user b/VSLinux/Amiberry.vcxproj.user
index abe8dd89..be250787 100644
--- a/VSLinux/Amiberry.vcxproj.user
+++ b/VSLinux/Amiberry.vcxproj.user
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup />
 </Project>
\ No newline at end of file
diff --git a/VSLinux/README.md b/VSLinux/README.md
index c6b95284..515e30ed 100644
--- a/VSLinux/README.md
+++ b/VSLinux/README.md
@@ -1,5 +1,12 @@
 Visual Studio solution using VC++ for Linux.
 ===========================================
+With this solution you can use Visual Studio to edit the sources, remote debug and remote build the project running on a Pi.
+For now, no cross compilation is supported in this project but if that is added from Microsoft in the future this solution will be updated accordingly.
+
+The project is configured to be deployed on a standard Raspbian distro, under the folder ~/projects/ (it will create a subfolder named Amiberry there). The sources are copied to the destination Pi (make sure you edit the connection details so they are correct!), then built using the Remote Build commands available in the project Properties.
+
+If you want to use Intellisense, you will need to copy the include files from the Pi locally and point the project to them.
+
 You will need Visual Studio 2015 or later and VC++ for Linux installed.
 Look here for more information on VC++ for Linux: 
 https://blogs.msdn.microsoft.com/vcblog/2016/03/30/visual-c-for-linux-development/
diff --git a/VSLinux/guisan/guisan.vcxproj b/VSLinux/guisan/guisan.vcxproj
new file mode 100644
index 00000000..18b31264
--- /dev/null
+++ b/VSLinux/guisan/guisan.vcxproj
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{06b356e1-fe8b-4e50-bf9f-a9d6e419ecbd}</ProjectGuid>
+    <Keyword>Linux</Keyword>
+    <RootNamespace>guisan</RootNamespace>
+    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
+    <ApplicationType>Linux</ApplicationType>
+    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <TargetLinuxPlatform>Generic</TargetLinuxPlatform>
+    <LinuxProjectType>{FC1A4D80-50E9-41DA-9192-61C0DBAA00D2}</LinuxProjectType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+    <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="Shared" />
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry/src/guisan/; make all</RemoteBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry/src/guisan/; make clean</RemoteCleanCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/src/guisan/; make clean; make all</RemoteReBuildCommandLine>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\..\src\guisan\lib\.keep">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\src\guisan\Makefile" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\guisan\include\guisan.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\actionevent.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\actionlistener.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\basiccontainer.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\cliprectangle.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\color.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\deathlistener.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\defaultfont.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\event.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\exception.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\focushandler.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\focuslistener.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\font.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\genericinput.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\glut.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\graphics.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\gui.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\image.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\imagefont.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\imageloader.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\input.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\inputevent.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\key.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\keyevent.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\keyinput.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\keylistener.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\listmodel.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\mouseevent.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\mouseinput.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\mouselistener.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\opengl.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\opengl\openglgraphics.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\opengl\openglimage.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\opengl\openglsdlimageloader.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\platform.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\rectangle.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl\sdlgraphics.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl\sdlimage.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl\sdlimageloader.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl\sdlinput.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl\sdlpixel.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl\sdltruetypefont.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\selectionevent.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\selectionlistener.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widget.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgetlistener.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\button.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\checkbox.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\container.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\dropdown.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\icon.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\imagebutton.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\label.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\listbox.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\radiobutton.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\scrollarea.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\slider.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\tab.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\tabbedarea.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\textbox.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\textfield.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\window.hpp" />
+    <ClInclude Include="..\..\src\guisan\include\guisan\x.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\guisan\src\actionevent.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\basiccontainer.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\cliprectangle.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\color.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\defaultfont.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\event.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\exception.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\focushandler.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\font.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\genericinput.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\graphics.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\gui.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\guisan.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\image.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\imagefont.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\inputevent.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\key.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\keyevent.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\keyinput.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\mouseevent.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\mouseinput.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\opengl\opengl.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\opengl\openglgraphics.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\opengl\openglimage.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\rectangle.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\sdl\sdl.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\sdl\sdlgraphics.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\sdl\sdlimage.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\sdl\sdlimageloader.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\sdl\sdlinput.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\sdl\sdltruetypefont.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\selectionevent.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widget.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\button.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\checkbox.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\container.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\dropdown.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\icon.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\imagebutton.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\label.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\listbox.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\radiobutton.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\scrollarea.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\slider.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\tab.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\tabbedarea.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\textbox.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\textfield.cpp" />
+    <ClCompile Include="..\..\src\guisan\src\widgets\window.cpp" />
+  </ItemGroup>
+  <ItemDefinitionGroup />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>
\ No newline at end of file
diff --git a/VSLinux/guisan/guisan.vcxproj.filters b/VSLinux/guisan/guisan.vcxproj.filters
new file mode 100644
index 00000000..ba924d6c
--- /dev/null
+++ b/VSLinux/guisan/guisan.vcxproj.filters
@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="include">
+      <UniqueIdentifier>{eeccf75c-d704-4a8b-9282-f083ba4283a7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="lib">
+      <UniqueIdentifier>{7f295f07-15f7-4000-81ea-c83f4ca91ca7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src">
+      <UniqueIdentifier>{0ae8cfa1-0e8f-4a72-9ea2-f8c1fc9b8970}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\guisan">
+      <UniqueIdentifier>{27c19eef-8ca1-41c3-a0b5-ef0f16bde5a7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\guisan\opengl">
+      <UniqueIdentifier>{5fa33cfa-ffca-4f07-b5ca-3fca6db3dc91}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\guisan\sdl">
+      <UniqueIdentifier>{5227ba91-51a7-4209-9121-03505fdb08fc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\guisan\widgets">
+      <UniqueIdentifier>{6248903a-d143-48ca-b3e9-48692f78ec08}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\opengl">
+      <UniqueIdentifier>{aee8cc37-3791-4194-98db-09124b276380}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\sdl">
+      <UniqueIdentifier>{4542cfd7-c089-47ed-825c-f4c219c7f45b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\widgets">
+      <UniqueIdentifier>{52b5b3c9-6832-454a-b245-039fb824f16f}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\src\guisan\lib\.keep">
+      <Filter>lib</Filter>
+    </None>
+    <None Include="..\..\src\guisan\Makefile" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\guisan\include\guisan.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\actionevent.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\actionlistener.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\basiccontainer.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\cliprectangle.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\color.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\deathlistener.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\defaultfont.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\event.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\exception.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\focushandler.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\focuslistener.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\font.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\genericinput.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\glut.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\graphics.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\gui.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\image.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\imagefont.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\imageloader.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\input.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\inputevent.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\key.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\keyevent.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\keyinput.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\keylistener.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\listmodel.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\mouseevent.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\mouseinput.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\mouselistener.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\opengl.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\platform.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\rectangle.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\selectionevent.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\selectionlistener.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widget.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgetlistener.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\x.hpp">
+      <Filter>include\guisan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\opengl\openglgraphics.hpp">
+      <Filter>include\guisan\opengl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\opengl\openglimage.hpp">
+      <Filter>include\guisan\opengl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\opengl\openglsdlimageloader.hpp">
+      <Filter>include\guisan\opengl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl\sdlgraphics.hpp">
+      <Filter>include\guisan\sdl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl\sdlimage.hpp">
+      <Filter>include\guisan\sdl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl\sdlimageloader.hpp">
+      <Filter>include\guisan\sdl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl\sdlinput.hpp">
+      <Filter>include\guisan\sdl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl\sdlpixel.hpp">
+      <Filter>include\guisan\sdl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\sdl\sdltruetypefont.hpp">
+      <Filter>include\guisan\sdl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\button.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\checkbox.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\container.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\dropdown.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\icon.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\imagebutton.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\label.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\listbox.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\radiobutton.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\scrollarea.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\slider.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\tab.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\tabbedarea.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\textbox.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\textfield.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\guisan\include\guisan\widgets\window.hpp">
+      <Filter>include\guisan\widgets</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\guisan\src\actionevent.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\basiccontainer.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\cliprectangle.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\color.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\defaultfont.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\event.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\exception.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\focushandler.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\font.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\genericinput.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\graphics.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\gui.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\guisan.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\image.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\imagefont.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\inputevent.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\key.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\keyevent.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\keyinput.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\mouseevent.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\mouseinput.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\rectangle.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\selectionevent.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widget.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\opengl\opengl.cpp">
+      <Filter>src\opengl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\opengl\openglgraphics.cpp">
+      <Filter>src\opengl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\opengl\openglimage.cpp">
+      <Filter>src\opengl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\sdl\sdl.cpp">
+      <Filter>src\sdl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\sdl\sdlgraphics.cpp">
+      <Filter>src\sdl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\sdl\sdlimage.cpp">
+      <Filter>src\sdl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\sdl\sdlimageloader.cpp">
+      <Filter>src\sdl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\sdl\sdlinput.cpp">
+      <Filter>src\sdl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\sdl\sdltruetypefont.cpp">
+      <Filter>src\sdl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\button.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\checkbox.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\container.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\dropdown.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\icon.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\imagebutton.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\label.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\listbox.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\radiobutton.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\scrollarea.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\slider.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\tab.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\tabbedarea.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\textbox.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\textfield.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\guisan\src\widgets\window.cpp">
+      <Filter>src\widgets</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/VSLinux/guisan/guisan.vcxproj.user b/VSLinux/guisan/guisan.vcxproj.user
new file mode 100644
index 00000000..be250787
--- /dev/null
+++ b/VSLinux/guisan/guisan.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>
\ No newline at end of file