diff --git a/.gitignore b/.gitignore
index ae7c5b28..b076101a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,17 @@ scratch.wren
 
 # The baseline file is machine-specific, so doesn't get checked in.
 test/benchmark/baseline.txt
+
+# Visual Studio cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
\ No newline at end of file
diff --git a/project/msvc2013/wren/wren.vcxproj b/project/msvc2013/wren/wren.vcxproj
index a264f553..b33783d3 100644
--- a/project/msvc2013/wren/wren.vcxproj
+++ b/project/msvc2013/wren/wren.vcxproj
@@ -78,25 +78,25 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\main.c" />
-    <ClCompile Include="..\..\..\src\wren_compiler.c" />
-    <ClCompile Include="..\..\..\src\wren_core.c" />
-    <ClCompile Include="..\..\..\src\wren_debug.c" />
-    <ClCompile Include="..\..\..\src\wren_io.c" />
-    <ClCompile Include="..\..\..\src\wren_utils.c" />
-    <ClCompile Include="..\..\..\src\wren_value.c" />
-    <ClCompile Include="..\..\..\src\wren_vm.c" />
+    <ClCompile Include="..\..\..\src\cli\main.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_compiler.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_core.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_debug.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_io.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_utils.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_value.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_vm.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\include\wren.h" />
-    <ClInclude Include="..\..\..\src\wren_common.h" />
-    <ClInclude Include="..\..\..\src\wren_compiler.h" />
-    <ClInclude Include="..\..\..\src\wren_core.h" />
-    <ClInclude Include="..\..\..\src\wren_debug.h" />
-    <ClInclude Include="..\..\..\src\wren_io.h" />
-    <ClInclude Include="..\..\..\src\wren_utils.h" />
-    <ClInclude Include="..\..\..\src\wren_value.h" />
-    <ClInclude Include="..\..\..\src\wren_vm.h" />
+    <ClInclude Include="..\..\..\src\include\wren.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_common.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_compiler.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_core.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_debug.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_io.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_utils.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_value.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_vm.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">