diff --git a/build/vc100/turtle.vcxproj b/build/vc100/turtle.vcxproj
index 05fa556..536b960 100644
--- a/build/vc100/turtle.vcxproj
+++ b/build/vc100/turtle.vcxproj
@@ -19,18 +19,25 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -39,17 +46,10 @@
-
-
-
-
-
-
-
diff --git a/build/vc100/turtle.vcxproj.filters b/build/vc100/turtle.vcxproj.filters
index a64dfb7..4a65982 100644
--- a/build/vc100/turtle.vcxproj.filters
+++ b/build/vc100/turtle.vcxproj.filters
@@ -25,12 +25,6 @@
Source Files
-
- Source Files
-
-
- Source Files
-
Source Files
@@ -43,24 +37,12 @@
Source Files
-
- Source Files
-
Source Files
-
- Source Files
-
Source Files
-
- Source Files
-
-
- Source Files
-
Source Files\detail
@@ -94,17 +76,35 @@
Source Files\detail
-
- Source Files
+
+ Source Files\detail
-
- Source Files
+
+ Source Files\detail
-
- Source Files
+
+ Source Files\detail
-
- Source Files
+
+ Source Files\detail
+
+
+ Source Files\detail
+
+
+ Source Files\detail
+
+
+ Source Files\detail
+
+
+ Source Files\detail
+
+
+ Source Files\detail
+
+
+ Source Files\detail
\ No newline at end of file
diff --git a/build/vc100/turtle_test.vcxproj b/build/vc100/turtle_test.vcxproj
index 7963ae4..1a2536d 100644
--- a/build/vc100/turtle_test.vcxproj
+++ b/build/vc100/turtle_test.vcxproj
@@ -22,14 +22,14 @@
+
+
-
-
diff --git a/build/vc100/turtle_test.vcxproj.filters b/build/vc100/turtle_test.vcxproj.filters
index c547135..7d14774 100644
--- a/build/vc100/turtle_test.vcxproj.filters
+++ b/build/vc100/turtle_test.vcxproj.filters
@@ -21,15 +21,9 @@
Source Files
-
- Source Files
-
Source Files
-
- Source Files
-
Source Files
@@ -57,5 +51,11 @@
Source Files\detail
+
+ Source Files\detail
+
+
+ Source Files\detail
+
\ No newline at end of file
diff --git a/test/test_function.cpp b/test/detail/test_function.cpp
similarity index 96%
rename from test/test_function.cpp
rename to test/detail/test_function.cpp
index 3528b00..e234a6a 100644
--- a/test/test_function.cpp
+++ b/test/detail/test_function.cpp
@@ -7,8 +7,8 @@
// http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_AUTO_TEST_MAIN
-#include "mock_error.hpp"
-#include
+#include "../mock_error.hpp"
+#include
#include
#include
#define BOOST_LIB_NAME boost_unit_test_framework
diff --git a/test/test_invocation.cpp b/test/detail/test_invocation.cpp
similarity index 95%
rename from test/test_invocation.cpp
rename to test/detail/test_invocation.cpp
index 8ae6c25..f302c1c 100644
--- a/test/test_invocation.cpp
+++ b/test/detail/test_invocation.cpp
@@ -6,7 +6,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include
+#include
#include
BOOST_AUTO_TEST_CASE( unlimited )
diff --git a/test/detail/test_type_name.cpp b/test/detail/test_type_name.cpp
index 9db1012..b5fd606 100644
--- a/test/detail/test_type_name.cpp
+++ b/test/detail/test_type_name.cpp
@@ -6,7 +6,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include
+#include
#include
#include
diff --git a/test/test_constraints.cpp b/test/test_constraints.cpp
index 86cf49a..f4aba81 100644
--- a/test/test_constraints.cpp
+++ b/test/test_constraints.cpp
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
#include
-#include
+#include
#include
BOOST_AUTO_TEST_CASE( all_comparison_constraints_can_be_instanciated )
diff --git a/test/test_object.cpp b/test/test_object.cpp
index 650ab80..cb594f4 100644
--- a/test/test_object.cpp
+++ b/test/test_object.cpp
@@ -8,7 +8,7 @@
#include "mock_error.hpp"
#include
-#include
+#include
#include
namespace
diff --git a/test/test_sequence.cpp b/test/test_sequence.cpp
index 181e5fe..5c5abc4 100644
--- a/test/test_sequence.cpp
+++ b/test/test_sequence.cpp
@@ -8,7 +8,7 @@
#include "mock_error.hpp"
#include
-#include
+#include
#include
BOOST_AUTO_TEST_CASE( registering_to_a_sequence_and_calling_out_of_order_throws )
diff --git a/turtle/action.hpp b/turtle/detail/action.hpp
similarity index 95%
rename from turtle/action.hpp
rename to turtle/detail/action.hpp
index 9b3c7e8..abd3780 100644
--- a/turtle/action.hpp
+++ b/turtle/detail/action.hpp
@@ -9,7 +9,7 @@
#ifndef MOCK_ACTION_HPP_INCLUDED
#define MOCK_ACTION_HPP_INCLUDED
-#include "detail/lambda.hpp"
+#include "lambda.hpp"
#include
#include
#include
diff --git a/turtle/check.hpp b/turtle/detail/check.hpp
similarity index 94%
rename from turtle/check.hpp
rename to turtle/detail/check.hpp
index 7a648d0..e360a90 100644
--- a/turtle/check.hpp
+++ b/turtle/detail/check.hpp
@@ -9,9 +9,9 @@
#ifndef MOCK_CHECK_HPP_INCLUDED
#define MOCK_CHECK_HPP_INCLUDED
-#include "is_functor.hpp"
#include "operators.hpp"
-#include "log.hpp"
+#include "../log.hpp"
+#include "../is_functor.hpp"
#include
#include
#include
diff --git a/turtle/detail/child.hpp b/turtle/detail/child.hpp
index ae2bdca..91ffac4 100644
--- a/turtle/detail/child.hpp
+++ b/turtle/detail/child.hpp
@@ -9,8 +9,8 @@
#ifndef MOCK_CHILD_HPP_INCLUDED
#define MOCK_CHILD_HPP_INCLUDED
-#include "detail/type_name.hpp"
-#include "detail/parent.hpp"
+#include "type_name.hpp"
+#include "parent.hpp"
#include
#include
#include
diff --git a/turtle/cleanup.hpp b/turtle/detail/cleanup.hpp
similarity index 90%
rename from turtle/cleanup.hpp
rename to turtle/detail/cleanup.hpp
index 226e655..24032c5 100644
--- a/turtle/cleanup.hpp
+++ b/turtle/detail/cleanup.hpp
@@ -9,11 +9,11 @@
#ifndef MOCK_CLEANUP_HPP_INCLUDED
#define MOCK_CLEANUP_HPP_INCLUDED
-#include "config.hpp"
+#include "../config.hpp"
#ifdef MOCK_USE_BOOST_TEST
-#include "detail/root.hpp"
+#include "root.hpp"
#include
namespace mock
diff --git a/turtle/detail/context.hpp b/turtle/detail/context.hpp
index 3e559e3..0fd6511 100644
--- a/turtle/detail/context.hpp
+++ b/turtle/detail/context.hpp
@@ -9,7 +9,7 @@
#ifndef MOCK_CONTEXT_HPP_INCLUDED
#define MOCK_CONTEXT_HPP_INCLUDED
-#include "detail/type_name.hpp"
+#include "type_name.hpp"
#include
#include
#include
diff --git a/turtle/expectation_base.hpp b/turtle/detail/expectation_base.hpp
similarity index 94%
rename from turtle/expectation_base.hpp
rename to turtle/detail/expectation_base.hpp
index b436424..bfb5baf 100644
--- a/turtle/expectation_base.hpp
+++ b/turtle/detail/expectation_base.hpp
@@ -10,7 +10,7 @@
#define MOCK_EXPECTATION_BASE_HPP_INCLUDED
#include "invocation.hpp"
-#include "sequence.hpp"
+#include "../sequence.hpp"
#include
#include
diff --git a/turtle/expectation_template.hpp b/turtle/detail/expectation_template.hpp
similarity index 100%
rename from turtle/expectation_template.hpp
rename to turtle/detail/expectation_template.hpp
diff --git a/turtle/function.hpp b/turtle/detail/function.hpp
similarity index 84%
rename from turtle/function.hpp
rename to turtle/detail/function.hpp
index ddd8dc6..5170308 100644
--- a/turtle/function.hpp
+++ b/turtle/detail/function.hpp
@@ -9,18 +9,18 @@
#ifndef MOCK_FUNCTION_HPP_INCLUDED
#define MOCK_FUNCTION_HPP_INCLUDED
-#include "config.hpp"
-#include "error.hpp"
-#include "log.hpp"
+#include "../config.hpp"
+#include "../error.hpp"
+#include "../log.hpp"
+#include "../constraints.hpp"
+#include "../sequence.hpp"
#include "check.hpp"
#include "action.hpp"
+#include "verifiable.hpp"
+#include "type_name.hpp"
+#include "context.hpp"
#include "invocation.hpp"
-#include "constraints.hpp"
-#include "sequence.hpp"
#include "expectation_base.hpp"
-#include "detail/verifiable.hpp"
-#include "detail/type_name.hpp"
-#include "detail/context.hpp"
#include
#include
#include
diff --git a/turtle/function_iterate.hpp b/turtle/detail/function_iterate.hpp
similarity index 100%
rename from turtle/function_iterate.hpp
rename to turtle/detail/function_iterate.hpp
diff --git a/turtle/function_template.hpp b/turtle/detail/function_template.hpp
similarity index 100%
rename from turtle/function_template.hpp
rename to turtle/detail/function_template.hpp
diff --git a/turtle/detail/group.hpp b/turtle/detail/group.hpp
index 9cb9d00..ff4b269 100644
--- a/turtle/detail/group.hpp
+++ b/turtle/detail/group.hpp
@@ -9,7 +9,7 @@
#ifndef MOCK_GROUP_HPP_INCLUDED
#define MOCK_GROUP_HPP_INCLUDED
-#include "detail/verifiable.hpp"
+#include "verifiable.hpp"
#include
#include
#include
diff --git a/turtle/invocation.hpp b/turtle/detail/invocation.hpp
similarity index 100%
rename from turtle/invocation.hpp
rename to turtle/detail/invocation.hpp
diff --git a/turtle/operators.hpp b/turtle/detail/operators.hpp
similarity index 94%
rename from turtle/operators.hpp
rename to turtle/detail/operators.hpp
index 89fb166..10cfcff 100644
--- a/turtle/operators.hpp
+++ b/turtle/detail/operators.hpp
@@ -9,8 +9,8 @@
#ifndef MOCK_OPERATORS_HPP_INCLUDED
#define MOCK_OPERATORS_HPP_INCLUDED
-#include "constraint.hpp"
-#include "log.hpp"
+#include "../constraint.hpp"
+#include "../log.hpp"
namespace mock
{
diff --git a/turtle/detail/parent.hpp b/turtle/detail/parent.hpp
index 400e509..96a6c8f 100644
--- a/turtle/detail/parent.hpp
+++ b/turtle/detail/parent.hpp
@@ -9,7 +9,7 @@
#ifndef MOCK_PARENT_HPP_INCLUDED
#define MOCK_PARENT_HPP_INCLUDED
-#include "detail/type_name.hpp"
+#include "type_name.hpp"
#include
#include
#include
diff --git a/turtle/detail/root.hpp b/turtle/detail/root.hpp
index cea6c35..1aa8c2e 100644
--- a/turtle/detail/root.hpp
+++ b/turtle/detail/root.hpp
@@ -9,10 +9,10 @@
#ifndef MOCK_ROOT_HPP_INCLUDED
#define MOCK_ROOT_HPP_INCLUDED
-#include "detail/parent.hpp"
-#include "detail/group.hpp"
-#include "detail/context.hpp"
-#include "detail/child.hpp"
+#include "parent.hpp"
+#include "group.hpp"
+#include "context.hpp"
+#include "child.hpp"
#include
#include
#include