diff --git a/all.sln b/all.sln
index 03590f1a4..27ea4b261 100644
--- a/all.sln
+++ b/all.sln
@@ -1,20 +1,20 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "src\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "..\server\src\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "src\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "..\server\src\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "src\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "..\server\src\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "src\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "..\server\src\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "external\external.vcproj", "{F9AE4586-8F65-486B-9666-744839E40A54}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "..\external\external.vcproj", "{F9AE4586-8F65-486B-9666-744839E40A54}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-eressea", "eressea\eressea.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-eressea", "src\eressea.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-basic", "basic\basic.vcproj", "{4A17DAEE-2261-4E2C-96F6-BA4132A09551}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-basic", "..\example\src\example.vcproj", "{4A17DAEE-2261-4E2C-96F6-BA4132A09551}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "src\tests.vcproj", "{228B8781-480F-4608-BA14-1EB82581EADE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "..\server\src\tests.vcproj", "{228B8781-480F-4608-BA14-1EB82581EADE}"
 EndProject
 Global
 	GlobalSection(SubversionScc) = preSolution
diff --git a/eressea.sln b/eressea.sln
index 0a82cded6..860b2fa52 100644
--- a/eressea.sln
+++ b/eressea.sln
@@ -1,18 +1,18 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "..\src\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "..\server\src\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "..\src\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "..\server\src\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "..\src\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "..\server\src\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "..\src\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "..\server\src\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "..\external\external.vcproj", "{F9AE4586-8F65-486B-9666-744839E40A54}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-eressea", "eressea.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-eressea", "src\eressea.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "..\src\tests.vcproj", "{228B8781-480F-4608-BA14-1EB82581EADE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "..\server\src\tests.vcproj", "{228B8781-480F-4608-BA14-1EB82581EADE}"
 EndProject
 Global
 	GlobalSection(SubversionScc) = preSolution
diff --git a/eressea.vcproj b/src/eressea.vcproj
similarity index 87%
rename from eressea.vcproj
rename to src/eressea.vcproj
index 554b2ed58..204fe0778 100644
--- a/eressea.vcproj
+++ b/src/eressea.vcproj
@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="../src;../external"
+				AdditionalIncludeDirectories="../../server/src;../../external"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -124,7 +124,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../src;../external"
+				AdditionalIncludeDirectories="../../server/src;../../external"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -187,7 +187,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\src\spells\alp.c"
+				RelativePath=".\spells\alp.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -207,7 +207,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\bindings.c"
+				RelativePath=".\bindings.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -227,7 +227,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\spells\buildingcurse.c"
+				RelativePath=".\spells\buildingcurse.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -247,7 +247,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\spells\combatspells.c"
+				RelativePath=".\spells\combatspells.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -267,7 +267,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\curses.c"
+				RelativePath=".\curses.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -287,7 +287,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\races\dragons.c"
+				RelativePath=".\races\dragons.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -307,7 +307,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\races\illusion.c"
+				RelativePath=".\races\illusion.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -327,7 +327,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\main.c"
+				RelativePath=".\main.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -347,7 +347,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\monsters.c"
+				RelativePath=".\monsters.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -367,7 +367,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\races\races.c"
+				RelativePath=".\races\races.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -387,7 +387,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\races\races.h"
+				RelativePath=".\races\races.h"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -407,7 +407,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\spells\regioncurse.c"
+				RelativePath=".\spells\regioncurse.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -427,7 +427,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\spells\shipcurse.c"
+				RelativePath=".\spells\shipcurse.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -447,7 +447,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\spells\spells.c"
+				RelativePath=".\spells\spells.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -467,7 +467,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\spells\unitcurse.c"
+				RelativePath=".\spells\unitcurse.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -487,7 +487,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\races\zombies.c"
+				RelativePath=".\races\zombies.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -513,39 +513,39 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\src\spells\alp.h"
+				RelativePath=".\spells\alp.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\spells\buildingcurse.h"
+				RelativePath=".\spells\buildingcurse.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\spells\combatspells.h"
+				RelativePath=".\spells\combatspells.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\curses.h"
+				RelativePath=".\curses.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\spells\regioncurse.h"
+				RelativePath=".\spells\regioncurse.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\spells\shipcurse.h"
+				RelativePath=".\spells\shipcurse.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\spells\spells.h"
+				RelativePath=".\spells\spells.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\build\stdafx.h"
+				RelativePath="..\..\server\src\build\stdafx.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\spells\unitcurse.h"
+				RelativePath=".\spells\unitcurse.h"
 				>
 			</File>
 		</Filter>
@@ -553,27 +553,27 @@
 			Name="Unity Build"
 			>
 			<File
-				RelativePath="..\src\build\external.c"
+				RelativePath="..\..\server\src\build\external.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\build\gamecode.c"
+				RelativePath="..\..\server\src\build\gamecode.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\build\kernel.c"
+				RelativePath="..\..\server\src\build\kernel.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\build\lib.c"
+				RelativePath="..\..\server\src\build\lib.c"
 				>
 			</File>
 			<File
-				RelativePath=".\src\server.c"
+				RelativePath=".\server.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\build\stdafx.c"
+				RelativePath="..\..\server\src\build\stdafx.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -594,7 +594,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\build\util.c"
+				RelativePath="..\..\server\src\build\util.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -607,7 +607,7 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath=".\src\spells\Jamfile"
+			RelativePath=".\spells\Jamfile"
 			>
 		</File>
 	</Files>