diff --git a/build/vc80/bench_test.vcproj b/build/vc80/bench_test.vcproj
deleted file mode 100644
index b34fd3d..0000000
--- a/build/vc80/bench_test.vcproj
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="bench_test"
-	ProjectGUID="{2D607783-30B9-46DE-81E2-28513B31D5D2}"
-	RootNamespace="bench_test"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="debug|Win32"
-			OutputDirectory="../../out/applications/$(ProjectName)/vc80/$(ConfigurationName)"
-			IntermediateDirectory="../../out/applications/$(ProjectName)/vc80/$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../..; ../../include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="$(ProjectName)_pch.h"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/$(ProjectName).pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName)-vc80-mt-gd.exe"
-				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="release|Win32"
-			OutputDirectory="../../out/applications/$(ProjectName)/vc80/$(ConfigurationName)"
-			IntermediateDirectory="../../out/applications/$(ProjectName)/vc80/$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="../../../..; ../../include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="$(ProjectName)_pch.h"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/$(ProjectName).pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName)-vc80-mt.exe"
-				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				FixedBaseAddress="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hpp;hxx;hm;inl;inc;xsd"
-			>
-			<File
-				RelativePath="..\..\test\bench_0_class.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\bench_0_class_10_max_args.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\bench_0_class_20_max_args.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\bench_0_class_30_max_args.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\bench_30_classes_30_methods_30_args_30_max_args.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\bench_30_classes_30_methods_9_args.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\bench_30_classes_30_methods_9_args_10_max_args.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\bench_30_classes_30_methods_9_args_20_max_args.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\bench_30_classes_30_methods_9_args_30_max_args.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/vc80/errors_test.vcproj b/build/vc80/errors_test.vcproj
deleted file mode 100644
index 48166cf..0000000
--- a/build/vc80/errors_test.vcproj
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="errors_test"
-	ProjectGUID="{231E907C-7B55-4128-B9EF-AB5B8042898D}"
-	RootNamespace="errors_test"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="debug|Win32"
-			OutputDirectory="../../out/vc80/$(ConfigurationName)/tests/$(ProjectName)"
-			IntermediateDirectory="../../out/vc80/$(ConfigurationName)/tests/$(ProjectName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm172"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../..; ../../include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="$(ProjectName)_pch.h"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/$(ProjectName).pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				OutputFile="$(OutDir)/$(ProjectName).exe"
-				AdditionalLibraryDirectories="../../lib/vc80"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="cd ../../run/vc80&#x0D;&#x0A;&quot;$(TargetDir)$(TargetName).exe&quot; --result_code=no --report_level=no --log_level=warning --data_directory=../../data/tests/$(ProjectName)&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="release|Win32"
-			OutputDirectory="../../out/vc80/$(ConfigurationName)/tests/$(ProjectName)"
-			IntermediateDirectory="../../out/vc80/$(ConfigurationName)/tests/$(ProjectName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm162"
-				Optimization="2"
-				AdditionalIncludeDirectories="../../../..; ../../include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="$(ProjectName)_pch.h"
-				PrecompiledHeaderFile="$(IntDir)/$(ProjectName).pch"
-				AssemblerListingLocation="$(IntDir)/"
-				ObjectFile="$(IntDir)/"
-				ProgramDataBaseFileName="$(IntDir)/$(ProjectName).pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				OutputFile="$(OutDir)/$(ProjectName).exe"
-				AdditionalLibraryDirectories="../../lib/vc80"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="cd ../../run/vc80&#x0D;&#x0A;&quot;$(TargetDir)$(TargetName).exe&quot; --result_code=no --report_level=no --log_level=warning --data_directory=../../data/tests/$(ProjectName)&#x0D;&#x0A;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hpp;hxx;hm;inl;inc;xsd"
-			>
-			<File
-				RelativePath="..\..\test\fail_ambiguous_mock_method.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\fail_constraint_functor_not_compatible.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\fail_constraint_value_not_comparable.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\fail_constraint_value_of_wrong_type_in_builtin_constraint.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\fail_mismatch_type_in_returns_int_action.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\fail_mismatch_type_in_returns_string_action.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\fail_mismatch_type_in_returns_void_action.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\fail_non_existing_base_class_method_in_mock_method.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\fail_number_of_arguments_greater_than_max_constant.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\fail_template_argument_without_tpl_macro.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\fail_too_many_arguments_in_mock_method.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\fail_wrong_number_of_arguments_in_with.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/vc80/turtle.sln b/build/vc80/turtle.sln
index 7905ec4..cb445ec 100644
--- a/build/vc80/turtle.sln
+++ b/build/vc80/turtle.sln
@@ -4,10 +4,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "turtle", "turtle.vcproj", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "turtle_test", "turtle_test.vcproj", "{74810A2A-33D8-47D6-9A50-71261F1683F5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_test", "bench_test.vcproj", "{2D607783-30B9-46DE-81E2-28513B31D5D2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "errors_test", "errors_test.vcproj", "{231E907C-7B55-4128-B9EF-AB5B8042898D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		debug|Win32 = debug|Win32
@@ -22,14 +18,6 @@ Global
 		{74810A2A-33D8-47D6-9A50-71261F1683F5}.debug|Win32.Build.0 = debug|Win32
 		{74810A2A-33D8-47D6-9A50-71261F1683F5}.release|Win32.ActiveCfg = release|Win32
 		{74810A2A-33D8-47D6-9A50-71261F1683F5}.release|Win32.Build.0 = release|Win32
-		{2D607783-30B9-46DE-81E2-28513B31D5D2}.debug|Win32.ActiveCfg = debug|Win32
-		{2D607783-30B9-46DE-81E2-28513B31D5D2}.debug|Win32.Build.0 = debug|Win32
-		{2D607783-30B9-46DE-81E2-28513B31D5D2}.release|Win32.ActiveCfg = release|Win32
-		{2D607783-30B9-46DE-81E2-28513B31D5D2}.release|Win32.Build.0 = release|Win32
-		{231E907C-7B55-4128-B9EF-AB5B8042898D}.debug|Win32.ActiveCfg = debug|Win32
-		{231E907C-7B55-4128-B9EF-AB5B8042898D}.debug|Win32.Build.0 = debug|Win32
-		{231E907C-7B55-4128-B9EF-AB5B8042898D}.release|Win32.ActiveCfg = release|Win32
-		{231E907C-7B55-4128-B9EF-AB5B8042898D}.release|Win32.Build.0 = release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/build/vc80/turtle.vcproj b/build/vc80/turtle.vcproj
index 336d337..86c69b1 100644
--- a/build/vc80/turtle.vcproj
+++ b/build/vc80/turtle.vcproj
@@ -153,30 +153,6 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File
-				RelativePath="..\..\turtle\action.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\turtle\args.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\turtle\boost_test_error.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\turtle\check.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\turtle\child.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\turtle\cleanup.hpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\turtle\config.hpp"
 				>
@@ -189,40 +165,12 @@
 				RelativePath="..\..\turtle\constraints.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\turtle\context.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\turtle\default_error.hpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\turtle\error.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\turtle\expectation.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\turtle\function.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\turtle\group.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\turtle\invocation.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\turtle\is_functor.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\turtle\lambda.hpp"
+				RelativePath="..\..\turtle\format.hpp"
 				>
 			</File>
 			<File
@@ -238,15 +186,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\turtle\operators.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\turtle\parent.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\turtle\root.hpp"
+				RelativePath="..\..\turtle\reset.hpp"
 				>
 			</File>
 			<File
@@ -254,17 +194,121 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\turtle\type_name.hpp"
+				RelativePath="..\..\turtle\stream.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\turtle\verifiable.hpp"
+				RelativePath="..\..\turtle\verify.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\turtle\yes_no_type.hpp"
+			<Filter
+				Name="detail"
 				>
-			</File>
+				<File
+					RelativePath="..\..\turtle\detail\action.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\check.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\child.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\cleanup.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\context.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\expectation_base.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\expectation_template.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\formatter.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\function.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\function_impl_template.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\function_iterate.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\function_template.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\functor.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\group.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\invocation.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\is_functor.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\lambda.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\object_impl.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\parameter.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\parent.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\root.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\sequence_impl.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\signature.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\type_name.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\verifiable.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\turtle\detail\yes_no_type.hpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/build/vc80/turtle_test.vcproj b/build/vc80/turtle_test.vcproj
index 1ec21fc..50d4fc0 100644
--- a/build/vc80/turtle_test.vcproj
+++ b/build/vc80/turtle_test.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm172"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../..; ../../include"
+				AdditionalIncludeDirectories="../.."
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -123,7 +123,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm162"
 				Optimization="2"
-				AdditionalIncludeDirectories="../../../..; ../../include"
+				AdditionalIncludeDirectories=".."
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="2"
@@ -194,10 +194,6 @@
 				RelativePath="..\..\test\mock_error.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\test\test_args.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\test\test_constraints.cpp"
 				>
@@ -206,22 +202,10 @@
 				RelativePath="..\..\test\test_error.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\test\test_function.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\test\test_integration.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\test\test_invocation.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\test\test_is_functor.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\test\test_log.cpp"
 				>
@@ -242,10 +226,30 @@
 				RelativePath="..\..\test\test_sequence.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\test\test_type_name.cpp"
+			<Filter
+				Name="detail"
 				>
-			</File>
+				<File
+					RelativePath="..\..\test\detail\test_function.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\test\detail\test_invocation.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\test\detail\test_is_functor.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\test\detail\test_signature.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\test\detail\test_type_name.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>