diff --git a/.gitignore b/.gitignore
index de98e839..0d22b6e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,16 +42,16 @@ perf.data*
 *~
 # Visual Studio cruft
 *.vcxproj.user
+binaries/*Debug
+binaries/*Release
 build/vs2010/ipch
-build/vs2010/*Debug
-build/vs2010/*Release
 build/vs2010/*.opensdf
 build/vs2010/*.sdf
 build/vs2010/*.suo
 build/vs2010/*.log
 build/vs2010/*.XGD
-# Do not exclude anything in contrib; this is currently one level
-# more than our current max
+# Do not exclude anything in contrib. There is no way to do this recursively
+# but the nesting below is currently one level more than our current max.
 !contrib/*
 !contrib/*/*
 !contrib/*/*/*
diff --git a/Makefile.am b/Makefile.am
index a6af9796..edb117b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,10 +5,9 @@ SUBDIRS += monsterz
 SUBDIRS += mrpigeon
 SUBDIRS += orbital
 SUBDIRS += neercs
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = $(SUBDIRS) build binaries
 
-EXTRA_DIST = bootstrap build-linux build-mingw build-mingw64 build-ps3 \
-             build-nacl32 build-nacl64 build/lol-build
+EXTRA_DIST = bootstrap TODO
 AUTOMAKE_OPTIONS = dist-bzip2
 
 bench:
diff --git a/binaries/Makefile.am b/binaries/Makefile.am
new file mode 100644
index 00000000..aa65ad58
--- /dev/null
+++ b/binaries/Makefile.am
@@ -0,0 +1,3 @@
+
+# Everything in this directory is temporary.
+
diff --git a/build/Makefile.am b/build/Makefile.am
new file mode 100644
index 00000000..7f0c94ad
--- /dev/null
+++ b/build/Makefile.am
@@ -0,0 +1,5 @@
+
+EXTRA_DIST = lol-build \
+             build-linux build-mingw build-mingw64 build-ps3 \
+             build-nacl32 build-nacl64
+
diff --git a/build/vs2010/Lol.Core.Rules.props b/build/vs2010/Lol.Core.Rules.props
index 0dd8f1d2..79a6cc6a 100644
--- a/build/vs2010/Lol.Core.Rules.props
+++ b/build/vs2010/Lol.Core.Rules.props
@@ -9,7 +9,7 @@
       <WarningLevel>Level3</WarningLevel>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(FlexIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\src;$(FlexIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/build/vs2010/Lol.Core.Vars.props b/build/vs2010/Lol.Core.Vars.props
index b658ba4b..1172d949 100644
--- a/build/vs2010/Lol.Core.Vars.props
+++ b/build/vs2010/Lol.Core.Vars.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <ContribDir>$(SolutionDir)\..\contrib</ContribDir>
+    <ContribDir>$(SolutionDir)\..\..\contrib</ContribDir>
 
     <!-- Flex & Bison -->
     <FlexDir>$(ContribDir)\flex-2.5.35</FlexDir>
@@ -89,7 +89,7 @@
     <BuildMacro Include="XboxDefines"><Value>$(XboxDefines)</Value></BuildMacro>
   </ItemGroup>
   <PropertyGroup>
-    <OutDir>$(SolutionDir)\$(Platform) $(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
+    <OutDir>$(SolutionDir)..\..\binaries\$(Platform) $(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\binaries\$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
 </Project>
diff --git a/configure.ac b/configure.ac
index 0dadcb27..24fdd50e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -385,6 +385,8 @@ AC_CONFIG_FILES(
   gfx/Makefile
   gfx/font/Makefile
   tools/Makefile
+  build/Makefile
+  binaries/Makefile
 ])
 AC_CONFIG_FILES(
  [monsterz/Makefile
diff --git a/test/benchsuite.vcxproj b/test/benchsuite.vcxproj
index fe3e5498..0847eb0c 100644
--- a/test/benchsuite.vcxproj
+++ b/test/benchsuite.vcxproj
@@ -34,7 +34,7 @@
     <ClCompile Include="benchsuite.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
+    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/test/debug/quad.vcxproj b/test/debug/quad.vcxproj
index 78f64bb9..b71cbc80 100644
--- a/test/debug/quad.vcxproj
+++ b/test/debug/quad.vcxproj
@@ -30,7 +30,7 @@
     <ClCompile Include="quad.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
+    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/test/testsuite.vcxproj b/test/testsuite.vcxproj
index 5a69eb8f..89ea4264 100644
--- a/test/testsuite.vcxproj
+++ b/test/testsuite.vcxproj
@@ -41,7 +41,7 @@
     <ClCompile Include="unit\vector.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
+    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/tutorial/01_triangle.vcxproj b/tutorial/01_triangle.vcxproj
index 7a94016a..a3b86e58 100644
--- a/tutorial/01_triangle.vcxproj
+++ b/tutorial/01_triangle.vcxproj
@@ -33,7 +33,7 @@
     <LolFxCompile Include="01_triangle.lolfx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
+    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/tutorial/02_cube.vcxproj b/tutorial/02_cube.vcxproj
index 5df1c819..aad18dc9 100644
--- a/tutorial/02_cube.vcxproj
+++ b/tutorial/02_cube.vcxproj
@@ -33,7 +33,7 @@
     <LolFxCompile Include="02_cube.lolfx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
+    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/tutorial/11_fractal.vcxproj b/tutorial/11_fractal.vcxproj
index e96187ba..4aeddfd3 100644
--- a/tutorial/11_fractal.vcxproj
+++ b/tutorial/11_fractal.vcxproj
@@ -33,7 +33,7 @@
     <LolFxCompile Include="11_fractal.lolfx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\lolcore.vcxproj">
+    <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
       <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
     </ProjectReference>
   </ItemGroup>