diff --git a/.gitignore b/.gitignore
index f77f33c..0e40c17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
-/*.user
 /*.sdf
 /*.suo
-/temp
 /*.opensdf
 /ipch
 /doc
+temp
+*.user
diff --git a/libatl.props b/build/libatl.props
similarity index 87%
rename from libatl.props
rename to build/libatl.props
index aaac63b..be71480 100644
--- a/libatl.props
+++ b/build/libatl.props
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
     </ClCompile>
diff --git a/libatl.vcxproj b/build/libatl.vcxproj
similarity index 79%
rename from libatl.vcxproj
rename to build/libatl.vcxproj
index bee2412..3807c91 100644
--- a/libatl.vcxproj
+++ b/build/libatl.vcxproj
@@ -45,30 +45,30 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\common.props" />
-    <Import Project="..\..\include\Win32.props" />
-    <Import Project="..\..\include\Release.props" />
+    <Import Project="..\..\..\include\common.props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
     <Import Project="libatl.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\common.props" />
-    <Import Project="..\..\include\Win32.props" />
-    <Import Project="..\..\include\Debug.props" />
+    <Import Project="..\..\..\include\common.props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
     <Import Project="libatl.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\common.props" />
-    <Import Project="..\..\include\x64.props" />
-    <Import Project="..\..\include\Release.props" />
+    <Import Project="..\..\..\include\common.props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
     <Import Project="libatl.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\common.props" />
-    <Import Project="..\..\include\x64.props" />
-    <Import Project="..\..\include\Debug.props" />
+    <Import Project="..\..\..\include\common.props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
     <Import Project="libatl.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
@@ -94,7 +94,7 @@
     <ClCompile />
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\stdafx.cpp">
+    <ClCompile Include="..\src\stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -102,15 +102,15 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\atlcrypt.h" />
-    <ClInclude Include="include\atleap.h" />
-    <ClInclude Include="include\atlex.h" />
-    <ClInclude Include="include\atlmsi.h" />
-    <ClInclude Include="include\atlsec.h" />
-    <ClInclude Include="include\atlshlwapi.h" />
-    <ClInclude Include="include\atlwin.h" />
-    <ClInclude Include="include\atlwlan.h" />
-    <ClInclude Include="include\stdafx.h" />
+    <ClInclude Include="..\include\atlcrypt.h" />
+    <ClInclude Include="..\include\atleap.h" />
+    <ClInclude Include="..\include\atlex.h" />
+    <ClInclude Include="..\include\atlmsi.h" />
+    <ClInclude Include="..\include\atlsec.h" />
+    <ClInclude Include="..\include\atlshlwapi.h" />
+    <ClInclude Include="..\include\atlwin.h" />
+    <ClInclude Include="..\include\atlwlan.h" />
+    <ClInclude Include="..\include\stdafx.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/libatl.vcxproj.filters b/build/libatl.vcxproj.filters
similarity index 69%
rename from libatl.vcxproj.filters
rename to build/libatl.vcxproj.filters
index 51b1304..5cb2b60 100644
--- a/libatl.vcxproj.filters
+++ b/build/libatl.vcxproj.filters
@@ -11,36 +11,36 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\stdafx.cpp">
+    <ClCompile Include="..\src\stdafx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\stdafx.h">
+    <ClInclude Include="..\include\stdafx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\atlwin.h">
+    <ClInclude Include="..\include\atlwin.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\atlmsi.h">
+    <ClInclude Include="..\include\atlmsi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\atlcrypt.h">
+    <ClInclude Include="..\include\atlcrypt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\atlwlan.h">
+    <ClInclude Include="..\include\atlwlan.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\atlshlwapi.h">
+    <ClInclude Include="..\include\atlshlwapi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\atlex.h">
+    <ClInclude Include="..\include\atlex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\atleap.h">
+    <ClInclude Include="..\include\atleap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\atlsec.h">
+    <ClInclude Include="..\include\atlsec.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/libatl.sln b/libatl.sln
index 751496c..95e3b8a 100644
--- a/libatl.sln
+++ b/libatl.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libatl", "libatl.vcxproj", "{5A4EADF2-3237-457A-9DA8-BB9942A91019}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libatl", "build\libatl.vcxproj", "{5A4EADF2-3237-457A-9DA8-BB9942A91019}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution