diff --git a/build/build.xml b/build/build.xml
index 96f167a..d4d1258 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -65,10 +65,10 @@
     <quiet>
       <delete file="${reports.dir}/benchmark-${platform}.log"/>
       <touch file="${reports.dir}/benchmark-${platform}.log"/>
-      <delete dir="${out.dir}/turtle_bench"/>
+      <delete dir="${out.dir}/bench_test"/>
     </quiet>
     <for param="file">
-      <fileset dir="${applications.dir}/turtle_bench" includes="*.cpp"/>
+      <fileset dir="${tests.dir}/bench_test" includes="*.cpp"/>
       <sequential>
         <record name="${reports.dir}/benchmark-${platform}.log" action="start" append="true"/>
         <ant target="-bench">
@@ -83,7 +83,7 @@
     <echo>${file}</echo>
     <stopwatch name="bench"/>
     <quiet>
-      <compile name="bench" input="${applications.dir}/turtle_bench" outdir="${out.dir}/turtle_bench" excludes="**">
+      <compile name="bench" input="${tests.dir}/bench_test" outdir="${out.dir}/bench_test" excludes="**">
         <includepath path="${libraries.dir}"/>
         <fileset file="${file}"/>
       </compile>
diff --git a/build/vc80/turtle_bench.vcproj b/build/vc80/bench_test.vcproj
similarity index 79%
rename from build/vc80/turtle_bench.vcproj
rename to build/vc80/bench_test.vcproj
index f642fae..9cbd1b1 100644
--- a/build/vc80/turtle_bench.vcproj
+++ b/build/vc80/bench_test.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="turtle_bench"
+	Name="bench_test"
 	ProjectGUID="{2D607783-30B9-46DE-81E2-28513B31D5D2}"
 	>
 	<Platforms>
@@ -183,39 +183,39 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hpp;hxx;hm;inl;inc;xsd"
 			>
 			<File
-				RelativePath="..\..\src\applications\turtle_bench\turtle_bench_0_class.cpp"
+				RelativePath="..\..\src\tests\bench_test\turtle_bench_0_class.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\applications\turtle_bench\turtle_bench_0_class_10_max_args.cpp"
+				RelativePath="..\..\src\tests\bench_test\turtle_bench_0_class_10_max_args.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\applications\turtle_bench\turtle_bench_0_class_20_max_args.cpp"
+				RelativePath="..\..\src\tests\bench_test\turtle_bench_0_class_20_max_args.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\applications\turtle_bench\turtle_bench_0_class_30_max_args.cpp"
+				RelativePath="..\..\src\tests\bench_test\turtle_bench_0_class_30_max_args.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\applications\turtle_bench\turtle_bench_30_classes_30_methods_30_args_30_max_args.cpp"
+				RelativePath="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_30_args_30_max_args.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\applications\turtle_bench\turtle_bench_30_classes_30_methods_9_args.cpp"
+				RelativePath="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_9_args.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\applications\turtle_bench\turtle_bench_30_classes_30_methods_9_args_10_max_args.cpp"
+				RelativePath="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_9_args_10_max_args.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\applications\turtle_bench\turtle_bench_30_classes_30_methods_9_args_20_max_args.cpp"
+				RelativePath="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_9_args_20_max_args.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\applications\turtle_bench\turtle_bench_30_classes_30_methods_9_args_30_max_args.cpp"
+				RelativePath="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_9_args_30_max_args.cpp"
 				>
 			</File>
 		</Filter>
diff --git a/build/vc80/turtle.sln b/build/vc80/turtle.sln
index 9a36de5..dca88da 100644
--- a/build/vc80/turtle.sln
+++ b/build/vc80/turtle.sln
@@ -4,10 +4,10 @@ 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}") = "turtle_bench", "turtle_bench.vcproj", "{2D607783-30B9-46DE-81E2-28513B31D5D2}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pch_test", "pch_test.vcproj", "{121C87D6-DBCC-4A73-99DE-9A0759FD04B6}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_test", "bench_test.vcproj", "{2D607783-30B9-46DE-81E2-28513B31D5D2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		debug|Win32 = debug|Win32
@@ -22,14 +22,14 @@ 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
 		{121C87D6-DBCC-4A73-99DE-9A0759FD04B6}.debug|Win32.ActiveCfg = debug|Win32
 		{121C87D6-DBCC-4A73-99DE-9A0759FD04B6}.debug|Win32.Build.0 = debug|Win32
 		{121C87D6-DBCC-4A73-99DE-9A0759FD04B6}.release|Win32.ActiveCfg = release|Win32
 		{121C87D6-DBCC-4A73-99DE-9A0759FD04B6}.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/applications/turtle_bench/Jamfile.v2 b/src/tests/bench_test/Jamfile.v2
similarity index 100%
rename from src/applications/turtle_bench/Jamfile.v2
rename to src/tests/bench_test/Jamfile.v2
diff --git a/src/applications/turtle_bench/Jamroot b/src/tests/bench_test/Jamroot
similarity index 100%
rename from src/applications/turtle_bench/Jamroot
rename to src/tests/bench_test/Jamroot
diff --git a/src/applications/turtle_bench/turtle_bench_0_class.cpp b/src/tests/bench_test/turtle_bench_0_class.cpp
similarity index 100%
rename from src/applications/turtle_bench/turtle_bench_0_class.cpp
rename to src/tests/bench_test/turtle_bench_0_class.cpp
diff --git a/src/applications/turtle_bench/turtle_bench_0_class_10_max_args.cpp b/src/tests/bench_test/turtle_bench_0_class_10_max_args.cpp
similarity index 100%
rename from src/applications/turtle_bench/turtle_bench_0_class_10_max_args.cpp
rename to src/tests/bench_test/turtle_bench_0_class_10_max_args.cpp
diff --git a/src/applications/turtle_bench/turtle_bench_0_class_20_max_args.cpp b/src/tests/bench_test/turtle_bench_0_class_20_max_args.cpp
similarity index 100%
rename from src/applications/turtle_bench/turtle_bench_0_class_20_max_args.cpp
rename to src/tests/bench_test/turtle_bench_0_class_20_max_args.cpp
diff --git a/src/applications/turtle_bench/turtle_bench_0_class_30_max_args.cpp b/src/tests/bench_test/turtle_bench_0_class_30_max_args.cpp
similarity index 100%
rename from src/applications/turtle_bench/turtle_bench_0_class_30_max_args.cpp
rename to src/tests/bench_test/turtle_bench_0_class_30_max_args.cpp
diff --git a/src/applications/turtle_bench/turtle_bench_30_classes_30_methods_30_args_30_max_args.cpp b/src/tests/bench_test/turtle_bench_30_classes_30_methods_30_args_30_max_args.cpp
similarity index 100%
rename from src/applications/turtle_bench/turtle_bench_30_classes_30_methods_30_args_30_max_args.cpp
rename to src/tests/bench_test/turtle_bench_30_classes_30_methods_30_args_30_max_args.cpp
diff --git a/src/applications/turtle_bench/turtle_bench_30_classes_30_methods_9_args.cpp b/src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args.cpp
similarity index 100%
rename from src/applications/turtle_bench/turtle_bench_30_classes_30_methods_9_args.cpp
rename to src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args.cpp
diff --git a/src/applications/turtle_bench/turtle_bench_30_classes_30_methods_9_args_10_max_args.cpp b/src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_10_max_args.cpp
similarity index 100%
rename from src/applications/turtle_bench/turtle_bench_30_classes_30_methods_9_args_10_max_args.cpp
rename to src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_10_max_args.cpp
diff --git a/src/applications/turtle_bench/turtle_bench_30_classes_30_methods_9_args_20_max_args.cpp b/src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_20_max_args.cpp
similarity index 100%
rename from src/applications/turtle_bench/turtle_bench_30_classes_30_methods_9_args_20_max_args.cpp
rename to src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_20_max_args.cpp
diff --git a/src/applications/turtle_bench/turtle_bench_30_classes_30_methods_9_args_30_max_args.cpp b/src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_30_max_args.cpp
similarity index 100%
rename from src/applications/turtle_bench/turtle_bench_30_classes_30_methods_9_args_30_max_args.cpp
rename to src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_30_max_args.cpp