diff --git a/libs/turtle/build/build.properties b/build/build.properties
similarity index 100%
rename from libs/turtle/build/build.properties
rename to build/build.properties
diff --git a/libs/turtle/build/build.xml b/build/build.xml
similarity index 71%
rename from libs/turtle/build/build.xml
rename to build/build.xml
index a946b29..925567c 100644
--- a/libs/turtle/build/build.xml
+++ b/build/build.xml
@@ -119,6 +119,38 @@
     </tar>
   </target>
 
+  <property name="boost.dir" value="${out.dir}/../boost.mock"/>
+  <target name="boost" description="convert to boost">
+    <delete dir="${boost.dir}"/>
+    <copy todir="${boost.dir}/boost/mock">
+        <fileset dir="${libraries.dir}/turtle" includes="**"/>
+    </copy>
+    <copy todir="${boost.dir}/libs/mock/test">
+        <fileset dir="${tests.dir}/test" includes="**"/>
+    </copy>
+    <copy todir="${boost.dir}">
+        <fileset dir="${libraries.dir}" includes="Jam*"/>
+    </copy>
+    <replaceregexp match="MOCK" replace="BOOST_MOCK" flags="g">
+        <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
+    </replaceregexp>
+    <replaceregexp match="BOOST_MOCK_BOOST_MOCK" replace="BOOST_MOCK" flags="g">
+        <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
+    </replaceregexp>
+    <replaceregexp match='"([^"]+)"' replace="&lt;boost/mock/\1&gt;" flags="g">
+        <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
+    </replaceregexp>
+    <replaceregexp match="&lt;turtle/([^&gt;]+)" replace="&lt;boost/mock/\1" flags="g">
+        <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
+    </replaceregexp>
+    <replaceregexp match="(namespace mock)" replace="namespace boost${line.separator}{${line.separator}\1" flags="g">
+        <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
+    </replaceregexp>
+    <replaceregexp match="(}${line.separator}${line.separator}#endif //)" replace="}${line.separator}\1" flags="g">
+        <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
+    </replaceregexp>
+  </target>
+
   <target name="all" depends="configure,test,bench,reports,export,package" description="configure, build and run tests and benchmark, export and package distribution"/>
 
 </project>
diff --git a/libs/turtle/test/Jamfile.jam b/build/jam/Jamfile.jam
similarity index 100%
rename from libs/turtle/test/Jamfile.jam
rename to build/jam/Jamfile.jam
diff --git a/Jamfile.v2 b/build/jam/Jamfile.v2
similarity index 100%
rename from Jamfile.v2
rename to build/jam/Jamfile.v2
diff --git a/Jamroot.jam b/build/jam/Jamroot.jam
similarity index 100%
rename from Jamroot.jam
rename to build/jam/Jamroot.jam
diff --git a/libs/turtle/build/vc100/turtle.sln b/build/vc100/turtle.sln
similarity index 100%
rename from libs/turtle/build/vc100/turtle.sln
rename to build/vc100/turtle.sln
diff --git a/libs/turtle/build/vc100/turtle.vcxproj b/build/vc100/turtle.vcxproj
similarity index 100%
rename from libs/turtle/build/vc100/turtle.vcxproj
rename to build/vc100/turtle.vcxproj
diff --git a/libs/turtle/build/vc100/turtle.vcxproj.filters b/build/vc100/turtle.vcxproj.filters
similarity index 100%
rename from libs/turtle/build/vc100/turtle.vcxproj.filters
rename to build/vc100/turtle.vcxproj.filters
diff --git a/libs/turtle/build/vc100/turtle.vcxproj.user b/build/vc100/turtle.vcxproj.user
similarity index 100%
rename from libs/turtle/build/vc100/turtle.vcxproj.user
rename to build/vc100/turtle.vcxproj.user
diff --git a/libs/turtle/build/vc100/turtle_bench.vcxproj b/build/vc100/turtle_bench.vcxproj
similarity index 100%
rename from libs/turtle/build/vc100/turtle_bench.vcxproj
rename to build/vc100/turtle_bench.vcxproj
diff --git a/libs/turtle/build/vc100/turtle_bench.vcxproj.filters b/build/vc100/turtle_bench.vcxproj.filters
similarity index 100%
rename from libs/turtle/build/vc100/turtle_bench.vcxproj.filters
rename to build/vc100/turtle_bench.vcxproj.filters
diff --git a/libs/turtle/build/vc100/turtle_bench.vcxproj.user b/build/vc100/turtle_bench.vcxproj.user
similarity index 100%
rename from libs/turtle/build/vc100/turtle_bench.vcxproj.user
rename to build/vc100/turtle_bench.vcxproj.user
diff --git a/libs/turtle/build/vc100/turtle_test.vcxproj b/build/vc100/turtle_test.vcxproj
similarity index 100%
rename from libs/turtle/build/vc100/turtle_test.vcxproj
rename to build/vc100/turtle_test.vcxproj
diff --git a/libs/turtle/build/vc100/turtle_test.vcxproj.filters b/build/vc100/turtle_test.vcxproj.filters
similarity index 100%
rename from libs/turtle/build/vc100/turtle_test.vcxproj.filters
rename to build/vc100/turtle_test.vcxproj.filters
diff --git a/libs/turtle/build/vc100/turtle_test.vcxproj.user b/build/vc100/turtle_test.vcxproj.user
similarity index 100%
rename from libs/turtle/build/vc100/turtle_test.vcxproj.user
rename to build/vc100/turtle_test.vcxproj.user
diff --git a/libs/turtle/build/vc80/bench_test.vcproj b/build/vc80/bench_test.vcproj
similarity index 100%
rename from libs/turtle/build/vc80/bench_test.vcproj
rename to build/vc80/bench_test.vcproj
diff --git a/libs/turtle/build/vc80/errors_test.vcproj b/build/vc80/errors_test.vcproj
similarity index 100%
rename from libs/turtle/build/vc80/errors_test.vcproj
rename to build/vc80/errors_test.vcproj
diff --git a/libs/turtle/build/vc80/turtle.sln b/build/vc80/turtle.sln
similarity index 100%
rename from libs/turtle/build/vc80/turtle.sln
rename to build/vc80/turtle.sln
diff --git a/libs/turtle/build/vc80/turtle.vcproj b/build/vc80/turtle.vcproj
similarity index 100%
rename from libs/turtle/build/vc80/turtle.vcproj
rename to build/vc80/turtle.vcproj
diff --git a/libs/turtle/build/vc80/turtle_test.vcproj b/build/vc80/turtle_test.vcproj
similarity index 100%
rename from libs/turtle/build/vc80/turtle_test.vcproj
rename to build/vc80/turtle_test.vcproj
diff --git a/libs/turtle/test/bench_0_class.cpp b/test/bench_0_class.cpp
similarity index 100%
rename from libs/turtle/test/bench_0_class.cpp
rename to test/bench_0_class.cpp
diff --git a/libs/turtle/test/bench_0_class_10_max_args.cpp b/test/bench_0_class_10_max_args.cpp
similarity index 100%
rename from libs/turtle/test/bench_0_class_10_max_args.cpp
rename to test/bench_0_class_10_max_args.cpp
diff --git a/libs/turtle/test/bench_0_class_20_max_args.cpp b/test/bench_0_class_20_max_args.cpp
similarity index 100%
rename from libs/turtle/test/bench_0_class_20_max_args.cpp
rename to test/bench_0_class_20_max_args.cpp
diff --git a/libs/turtle/test/bench_0_class_30_max_args.cpp b/test/bench_0_class_30_max_args.cpp
similarity index 100%
rename from libs/turtle/test/bench_0_class_30_max_args.cpp
rename to test/bench_0_class_30_max_args.cpp
diff --git a/libs/turtle/test/bench_30_classes_30_methods_30_args_30_max_args.cpp b/test/bench_30_classes_30_methods_30_args_30_max_args.cpp
similarity index 100%
rename from libs/turtle/test/bench_30_classes_30_methods_30_args_30_max_args.cpp
rename to test/bench_30_classes_30_methods_30_args_30_max_args.cpp
diff --git a/libs/turtle/test/bench_30_classes_30_methods_9_args.cpp b/test/bench_30_classes_30_methods_9_args.cpp
similarity index 100%
rename from libs/turtle/test/bench_30_classes_30_methods_9_args.cpp
rename to test/bench_30_classes_30_methods_9_args.cpp
diff --git a/libs/turtle/test/bench_30_classes_30_methods_9_args_10_max_args.cpp b/test/bench_30_classes_30_methods_9_args_10_max_args.cpp
similarity index 100%
rename from libs/turtle/test/bench_30_classes_30_methods_9_args_10_max_args.cpp
rename to test/bench_30_classes_30_methods_9_args_10_max_args.cpp
diff --git a/libs/turtle/test/bench_30_classes_30_methods_9_args_20_max_args.cpp b/test/bench_30_classes_30_methods_9_args_20_max_args.cpp
similarity index 100%
rename from libs/turtle/test/bench_30_classes_30_methods_9_args_20_max_args.cpp
rename to test/bench_30_classes_30_methods_9_args_20_max_args.cpp
diff --git a/libs/turtle/test/bench_30_classes_30_methods_9_args_30_max_args.cpp b/test/bench_30_classes_30_methods_9_args_30_max_args.cpp
similarity index 100%
rename from libs/turtle/test/bench_30_classes_30_methods_9_args_30_max_args.cpp
rename to test/bench_30_classes_30_methods_9_args_30_max_args.cpp
diff --git a/libs/turtle/test/fail_ambiguous_mock_method.cpp b/test/fail_ambiguous_mock_method.cpp
similarity index 100%
rename from libs/turtle/test/fail_ambiguous_mock_method.cpp
rename to test/fail_ambiguous_mock_method.cpp
diff --git a/libs/turtle/test/fail_constraint_functor_not_compatible.cpp b/test/fail_constraint_functor_not_compatible.cpp
similarity index 100%
rename from libs/turtle/test/fail_constraint_functor_not_compatible.cpp
rename to test/fail_constraint_functor_not_compatible.cpp
diff --git a/libs/turtle/test/fail_constraint_value_not_comparable.cpp b/test/fail_constraint_value_not_comparable.cpp
similarity index 100%
rename from libs/turtle/test/fail_constraint_value_not_comparable.cpp
rename to test/fail_constraint_value_not_comparable.cpp
diff --git a/libs/turtle/test/fail_constraint_value_of_wrong_type_in_builtin_constraint.cpp b/test/fail_constraint_value_of_wrong_type_in_builtin_constraint.cpp
similarity index 100%
rename from libs/turtle/test/fail_constraint_value_of_wrong_type_in_builtin_constraint.cpp
rename to test/fail_constraint_value_of_wrong_type_in_builtin_constraint.cpp
diff --git a/libs/turtle/test/fail_mismatch_type_in_returns_int_action.cpp b/test/fail_mismatch_type_in_returns_int_action.cpp
similarity index 100%
rename from libs/turtle/test/fail_mismatch_type_in_returns_int_action.cpp
rename to test/fail_mismatch_type_in_returns_int_action.cpp
diff --git a/libs/turtle/test/fail_mismatch_type_in_returns_string_action.cpp b/test/fail_mismatch_type_in_returns_string_action.cpp
similarity index 100%
rename from libs/turtle/test/fail_mismatch_type_in_returns_string_action.cpp
rename to test/fail_mismatch_type_in_returns_string_action.cpp
diff --git a/libs/turtle/test/fail_mismatch_type_in_returns_void_action.cpp b/test/fail_mismatch_type_in_returns_void_action.cpp
similarity index 100%
rename from libs/turtle/test/fail_mismatch_type_in_returns_void_action.cpp
rename to test/fail_mismatch_type_in_returns_void_action.cpp
diff --git a/libs/turtle/test/fail_non_existing_base_class_method_in_mock_method.cpp b/test/fail_non_existing_base_class_method_in_mock_method.cpp
similarity index 100%
rename from libs/turtle/test/fail_non_existing_base_class_method_in_mock_method.cpp
rename to test/fail_non_existing_base_class_method_in_mock_method.cpp
diff --git a/libs/turtle/test/fail_number_of_arguments_greater_than_max_constant.cpp b/test/fail_number_of_arguments_greater_than_max_constant.cpp
similarity index 100%
rename from libs/turtle/test/fail_number_of_arguments_greater_than_max_constant.cpp
rename to test/fail_number_of_arguments_greater_than_max_constant.cpp
diff --git a/libs/turtle/test/fail_template_argument_without_tpl_macro.cpp b/test/fail_template_argument_without_tpl_macro.cpp
similarity index 100%
rename from libs/turtle/test/fail_template_argument_without_tpl_macro.cpp
rename to test/fail_template_argument_without_tpl_macro.cpp
diff --git a/libs/turtle/test/fail_too_many_arguments_in_mock_method.cpp b/test/fail_too_many_arguments_in_mock_method.cpp
similarity index 100%
rename from libs/turtle/test/fail_too_many_arguments_in_mock_method.cpp
rename to test/fail_too_many_arguments_in_mock_method.cpp
diff --git a/libs/turtle/test/fail_wrong_number_of_arguments_in_with.cpp b/test/fail_wrong_number_of_arguments_in_with.cpp
similarity index 100%
rename from libs/turtle/test/fail_wrong_number_of_arguments_in_with.cpp
rename to test/fail_wrong_number_of_arguments_in_with.cpp
diff --git a/libs/turtle/test/mock_error.hpp b/test/mock_error.hpp
similarity index 100%
rename from libs/turtle/test/mock_error.hpp
rename to test/mock_error.hpp
diff --git a/libs/turtle/test/test_args.cpp b/test/test_args.cpp
similarity index 100%
rename from libs/turtle/test/test_args.cpp
rename to test/test_args.cpp
diff --git a/libs/turtle/test/test_constraints.cpp b/test/test_constraints.cpp
similarity index 100%
rename from libs/turtle/test/test_constraints.cpp
rename to test/test_constraints.cpp
diff --git a/libs/turtle/test/test_error.cpp b/test/test_error.cpp
similarity index 100%
rename from libs/turtle/test/test_error.cpp
rename to test/test_error.cpp
diff --git a/libs/turtle/test/test_function.cpp b/test/test_function.cpp
similarity index 100%
rename from libs/turtle/test/test_function.cpp
rename to test/test_function.cpp
diff --git a/libs/turtle/test/test_integration.cpp b/test/test_integration.cpp
similarity index 100%
rename from libs/turtle/test/test_integration.cpp
rename to test/test_integration.cpp
diff --git a/libs/turtle/test/test_invocation.cpp b/test/test_invocation.cpp
similarity index 100%
rename from libs/turtle/test/test_invocation.cpp
rename to test/test_invocation.cpp
diff --git a/libs/turtle/test/test_is_functor.cpp b/test/test_is_functor.cpp
similarity index 100%
rename from libs/turtle/test/test_is_functor.cpp
rename to test/test_is_functor.cpp
diff --git a/libs/turtle/test/test_log.cpp b/test/test_log.cpp
similarity index 100%
rename from libs/turtle/test/test_log.cpp
rename to test/test_log.cpp
diff --git a/libs/turtle/test/test_max_args.cpp b/test/test_max_args.cpp
similarity index 100%
rename from libs/turtle/test/test_max_args.cpp
rename to test/test_max_args.cpp
diff --git a/libs/turtle/test/test_mock.cpp b/test/test_mock.cpp
similarity index 100%
rename from libs/turtle/test/test_mock.cpp
rename to test/test_mock.cpp
diff --git a/libs/turtle/test/test_object.cpp b/test/test_object.cpp
similarity index 100%
rename from libs/turtle/test/test_object.cpp
rename to test/test_object.cpp
diff --git a/libs/turtle/test/test_sequence.cpp b/test/test_sequence.cpp
similarity index 100%
rename from libs/turtle/test/test_sequence.cpp
rename to test/test_sequence.cpp
diff --git a/libs/turtle/test/test_type_name.cpp b/test/test_type_name.cpp
similarity index 100%
rename from libs/turtle/test/test_type_name.cpp
rename to test/test_type_name.cpp