diff --git a/.gitignore b/.gitignore
index a0d5a37b3c..8c6243dfc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,6 @@ sdl
# Compiled dll
openrct2.dll
-# Compiled linux executable
-openrct2
-
# Distribution
distribution/windows/*.exe
diff --git a/openrct2.common.props b/openrct2.common.props
index 0b7793cc73..56fbfd03fb 100644
--- a/openrct2.common.props
+++ b/openrct2.common.props
@@ -95,7 +95,7 @@
- $(SolutionDir)lib\include;$(SolutionDir)lib\include\breakpad;$(SolutionDir)lib\include\libspeex;$(SolutionDir)lib\include\sdl;$(SolutionDir)lib\include\jansson;$(SolutionDir)lib\include\sdl_ttf;$(SolutionDir)lib\include\libpng;$(SolutionDir)lib\include\zlib;$(SolutionDir)lib\include\libzip;$(IncludePath)
+ $(SolutionDir)src;$(SolutionDir)lib\include;$(SolutionDir)lib\include\breakpad;$(SolutionDir)lib\include\libspeex;$(SolutionDir)lib\include\sdl;$(SolutionDir)lib\include\jansson;$(SolutionDir)lib\include\sdl_ttf;$(SolutionDir)lib\include\libpng;$(SolutionDir)lib\include\zlib;$(SolutionDir)lib\include\libzip;$(IncludePath)
$(SolutionDir)lib;$(LibraryPath)
diff --git a/openrct2.sln b/openrct2.sln
index df162fe6a2..c98f53ac32 100644
--- a/openrct2.sln
+++ b/openrct2.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2", "openrct2.vcxproj", "{D24D94F6-2A74-480C-B512-629C306CE92F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2", "src\openrct2\openrct2.vcxproj", "{D24D94F6-2A74-480C-B512-629C306CE92F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testpaint", "test\testpaint\testpaint.vcxproj", "{57E60BA1-FB76-4316-909E-C1449C142327}"
EndProject
diff --git a/openrct2.vcxproj b/openrct2.vcxproj
deleted file mode 100644
index d154444eae..0000000000
--- a/openrct2.vcxproj
+++ /dev/null
@@ -1,617 +0,0 @@
-
-
-
- .\
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- DebugTests
- Win32
-
-
- DebugTests
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
- ReleaseTests
- Win32
-
-
- ReleaseTests
- x64
-
-
-
- {D24D94F6-2A74-480C-B512-629C306CE92F}
- openrct2
- openrct2
-
-
- Application
-
-
-
- DynamicLibrary
-
-
- StaticLibrary
-
-
-
-
- USE_BREAKPAD;%(PreprocessorDefinitions)
- __NOENTRYPOINT__;%(PreprocessorDefinitions)
-
-
-
-
- $(IntDir)\%(RelativeDir)
- $(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions)
-
-
- Console
- Windows
-
-
- MachineX86
- MachineX64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/openrct2/openrct2.vcxproj b/src/openrct2/openrct2.vcxproj
new file mode 100644
index 0000000000..2cb3c080b4
--- /dev/null
+++ b/src/openrct2/openrct2.vcxproj
@@ -0,0 +1,618 @@
+
+
+
+ ..\..\
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ DebugTests
+ Win32
+
+
+ DebugTests
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+ ReleaseTests
+ Win32
+
+
+ ReleaseTests
+ x64
+
+
+
+ {D24D94F6-2A74-480C-B512-629C306CE92F}
+ openrct2
+ openrct2
+
+
+ Application
+
+
+
+ DynamicLibrary
+
+
+ StaticLibrary
+
+
+
+
+ USE_BREAKPAD;%(PreprocessorDefinitions)
+ __NOENTRYPOINT__;%(PreprocessorDefinitions)
+
+
+
+
+ $(IntDir)\%(RelativeDir)
+ $(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions)
+
+
+ Console
+ Windows
+
+
+ MachineX86
+ MachineX64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/testpaint/testpaint.vcxproj b/test/testpaint/testpaint.vcxproj
index 68d2d584af..e80f49f5aa 100644
--- a/test/testpaint/testpaint.vcxproj
+++ b/test/testpaint/testpaint.vcxproj
@@ -77,7 +77,7 @@
-
+
@@ -93,89 +93,89 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/tests/tests.vcxproj b/test/tests/tests.vcxproj
index 41cde7ef0a..d10bc48bf3 100644
--- a/test/tests/tests.vcxproj
+++ b/test/tests/tests.vcxproj
@@ -33,7 +33,7 @@
$(SolutionDir)bin\tests\
- $(GtestDir);$(GtestDir)\include;$(SolutionDir)src;$(IncludePath)
+ $(GtestDir);$(GtestDir)\include;$(SolutionDir)src\openrct2;$(IncludePath)
$(SolutionDir)bin;$(LibraryPath)