diff --git a/src/eressea.vcxproj b/src/eressea.vcxproj
index 640685a1c..6bc2b8490 100644
--- a/src/eressea.vcxproj
+++ b/src/eressea.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectName>amalgamation-eressea</ProjectName>
+    <ProjectName>eressea</ProjectName>
     <ProjectGuid>{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}</ProjectGuid>
     <RootNamespace>build</RootNamespace>
     <Keyword>Win32Proj</Keyword>
@@ -186,4 +186,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/eressea.vcxproj.filters b/src/eressea.vcxproj.filters
index f3457e733..4af32df31 100644
--- a/src/eressea.vcxproj.filters
+++ b/src/eressea.vcxproj.filters
@@ -53,35 +53,35 @@
     <ClCompile Include="spells\spells.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\server\src\tests.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="spells\unitcurse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="races\zombies.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\server\src\build\external.c">
-      <Filter>Unity Build</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\server\src\build\gamecode.c">
-      <Filter>Unity Build</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\server\src\build\kernel.c">
-      <Filter>Unity Build</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\server\src\build\lib.c">
-      <Filter>Unity Build</Filter>
-    </ClCompile>
     <ClCompile Include="server.c">
       <Filter>Unity Build</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\server\src\build\stdafx.c">
-      <Filter>Unity Build</Filter>
+    <ClCompile Include="..\..\shared\src\tests.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\server\src\build\util.c">
-      <Filter>Unity Build</Filter>
+    <ClCompile Include="..\..\shared\src\build\external.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\shared\src\build\gamecode.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\shared\src\build\kernel.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\shared\src\build\lib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\shared\src\build\stdafx.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\shared\src\build\util.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -106,15 +106,15 @@
     <ClInclude Include="spells\spells.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\server\src\build\stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\server\src\tests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="spells\unitcurse.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\shared\src\build\stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\shared\src\tests.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="spells\Jamfile" />