diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e5db746..d08e2e9c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,7 +39,7 @@ set(INTERNAL_HEADERS
     ${SOURCES_DIR}/catch_assertioninfo.h
     ${SOURCES_DIR}/catch_assertionresult.h
     ${SOURCES_DIR}/catch_capture.hpp
-    ${SOURCES_DIR}/catch_capture_matchers.h
+    ${SOURCES_DIR}/internal/catch_capture_matchers.h
     ${SOURCES_DIR}/catch_clara.h
     ${SOURCES_DIR}/catch_commandline.h
     ${SOURCES_DIR}/catch_common.h
@@ -72,13 +72,13 @@ set(INTERNAL_HEADERS
     ${SOURCES_DIR}/catch_interfaces_testcase.h
     ${SOURCES_DIR}/catch_leak_detector.h
     ${SOURCES_DIR}/catch_list.h
-    ${SOURCES_DIR}/catch_matchers.h
-    ${SOURCES_DIR}/catch_matchers_exception.hpp
-    ${SOURCES_DIR}/catch_matchers_floating.h
-    ${SOURCES_DIR}/catch_matchers_generic.hpp
-    ${SOURCES_DIR}/catch_matchers_string.h
-    ${SOURCES_DIR}/catch_matchers_templates.hpp
-    ${SOURCES_DIR}/catch_matchers_vector.h
+    ${SOURCES_DIR}/matchers/catch_matchers.h
+    ${SOURCES_DIR}/matchers/catch_matchers_exception.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_floating.h
+    ${SOURCES_DIR}/matchers/catch_matchers_generic.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_string.h
+    ${SOURCES_DIR}/matchers/catch_matchers_templates.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_vector.h
     ${SOURCES_DIR}/catch_message.h
     ${SOURCES_DIR}/catch_meta.hpp
     ${SOURCES_DIR}/catch_objc.hpp
@@ -130,7 +130,7 @@ set(IMPL_SOURCES
     ${SOURCES_DIR}/catch_approx.cpp
     ${SOURCES_DIR}/catch_assertionhandler.cpp
     ${SOURCES_DIR}/catch_assertionresult.cpp
-    ${SOURCES_DIR}/catch_capture_matchers.cpp
+    ${SOURCES_DIR}/internal/catch_capture_matchers.cpp
     ${SOURCES_DIR}/catch_commandline.cpp
     ${SOURCES_DIR}/catch_common.cpp
     ${SOURCES_DIR}/catch_config.cpp
@@ -155,12 +155,12 @@ set(IMPL_SOURCES
     ${SOURCES_DIR}/catch_interfaces_testcase.cpp
     ${SOURCES_DIR}/catch_list.cpp
     ${SOURCES_DIR}/catch_leak_detector.cpp
-    ${SOURCES_DIR}/catch_matchers.cpp
-    ${SOURCES_DIR}/catch_matchers_exception.cpp
-    ${SOURCES_DIR}/catch_matchers_floating.cpp
-    ${SOURCES_DIR}/catch_matchers_generic.cpp
-    ${SOURCES_DIR}/catch_matchers_string.cpp
-    ${SOURCES_DIR}/catch_matchers_templates.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_exception.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_floating.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_generic.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_string.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_templates.cpp
     ${SOURCES_DIR}/catch_message.cpp
     ${SOURCES_DIR}/catch_output_redirect.cpp
     ${SOURCES_DIR}/catch_registry_hub.cpp
diff --git a/src/catch2/catch_assertionhandler.cpp b/src/catch2/catch_assertionhandler.cpp
index 03834f1e..cf102ae7 100644
--- a/src/catch2/catch_assertionhandler.cpp
+++ b/src/catch2/catch_assertionhandler.cpp
@@ -14,9 +14,9 @@
 #include <catch2/catch_enforce.h>
 #include <catch2/catch_debugger.h>
 #include <catch2/catch_interfaces_registry_hub.h>
-#include <catch2/catch_capture_matchers.h>
+#include <catch2/internal/catch_capture_matchers.h>
 #include <catch2/catch_run_context.h>
-#include <catch2/catch_matchers_string.h>
+#include <catch2/matchers/catch_matchers_string.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_capture_matchers.cpp b/src/catch2/internal/catch_capture_matchers.cpp
similarity index 89%
rename from src/catch2/catch_capture_matchers.cpp
rename to src/catch2/internal/catch_capture_matchers.cpp
index 809da66d..c13d0543 100644
--- a/src/catch2/catch_capture_matchers.cpp
+++ b/src/catch2/internal/catch_capture_matchers.cpp
@@ -2,8 +2,8 @@
  *  Distributed under the Boost Software License, Version 1.0. (See accompanying
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
-#include <catch2/catch_capture_matchers.h>
-#include <catch2/catch_matchers.h>
+#include <catch2/internal/catch_capture_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
 #include <catch2/catch_interfaces_registry_hub.h>
 
 namespace Catch {
diff --git a/src/catch2/catch_capture_matchers.h b/src/catch2/internal/catch_capture_matchers.h
similarity index 100%
rename from src/catch2/catch_capture_matchers.h
rename to src/catch2/internal/catch_capture_matchers.h
diff --git a/src/catch2/catch_matchers.cpp b/src/catch2/matchers/catch_matchers.cpp
similarity index 92%
rename from src/catch2/catch_matchers.cpp
rename to src/catch2/matchers/catch_matchers.cpp
index af32b6cb..a8737497 100644
--- a/src/catch2/catch_matchers.cpp
+++ b/src/catch2/matchers/catch_matchers.cpp
@@ -3,7 +3,7 @@
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_matchers.h b/src/catch2/matchers/catch_matchers.h
similarity index 99%
rename from src/catch2/catch_matchers.h
rename to src/catch2/matchers/catch_matchers.h
index 102917a3..3e0f2083 100644
--- a/src/catch2/catch_matchers.h
+++ b/src/catch2/matchers/catch_matchers.h
@@ -6,7 +6,7 @@
 #define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
 
 #include <catch2/catch_common.h>
-#include <catch2/catch_capture_matchers.h>
+#include <catch2/internal/catch_capture_matchers.h>
 
 #include <string>
 #include <vector>
diff --git a/src/catch2/catch_matchers_exception.cpp b/src/catch2/matchers/catch_matchers_exception.cpp
similarity index 92%
rename from src/catch2/catch_matchers_exception.cpp
rename to src/catch2/matchers/catch_matchers_exception.cpp
index 2623193d..eec08f88 100644
--- a/src/catch2/catch_matchers_exception.cpp
+++ b/src/catch2/matchers/catch_matchers_exception.cpp
@@ -5,7 +5,7 @@
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include <catch2/catch_matchers_exception.hpp>
+#include <catch2/matchers/catch_matchers_exception.hpp>
 
 
 namespace Catch {
diff --git a/src/catch2/catch_matchers_exception.hpp b/src/catch2/matchers/catch_matchers_exception.hpp
similarity index 95%
rename from src/catch2/catch_matchers_exception.hpp
rename to src/catch2/matchers/catch_matchers_exception.hpp
index b0f3d32d..fabc26ea 100644
--- a/src/catch2/catch_matchers_exception.hpp
+++ b/src/catch2/matchers/catch_matchers_exception.hpp
@@ -7,7 +7,7 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
 
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
 
 namespace Catch {
 namespace Matchers {
diff --git a/src/catch2/catch_matchers_floating.cpp b/src/catch2/matchers/catch_matchers_floating.cpp
similarity index 99%
rename from src/catch2/catch_matchers_floating.cpp
rename to src/catch2/matchers/catch_matchers_floating.cpp
index 961a82fd..77684458 100644
--- a/src/catch2/catch_matchers_floating.cpp
+++ b/src/catch2/matchers/catch_matchers_floating.cpp
@@ -5,7 +5,7 @@
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include <catch2/catch_matchers_floating.h>
+#include <catch2/matchers/catch_matchers_floating.h>
 #include <catch2/catch_enforce.h>
 #include <catch2/catch_polyfills.hpp>
 #include <catch2/catch_to_string.hpp>
diff --git a/src/catch2/catch_matchers_floating.h b/src/catch2/matchers/catch_matchers_floating.h
similarity index 98%
rename from src/catch2/catch_matchers_floating.h
rename to src/catch2/matchers/catch_matchers_floating.h
index dc1bebe0..a935b570 100644
--- a/src/catch2/catch_matchers_floating.h
+++ b/src/catch2/matchers/catch_matchers_floating.h
@@ -7,7 +7,7 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_FLOATING_H_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_FLOATING_H_INCLUDED
 
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
 
 namespace Catch {
 namespace Matchers {
diff --git a/src/catch2/catch_matchers_generic.cpp b/src/catch2/matchers/catch_matchers_generic.cpp
similarity index 81%
rename from src/catch2/catch_matchers_generic.cpp
rename to src/catch2/matchers/catch_matchers_generic.cpp
index de262ae8..15b7fc9d 100644
--- a/src/catch2/catch_matchers_generic.cpp
+++ b/src/catch2/matchers/catch_matchers_generic.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch_matchers_generic.hpp>
+#include <catch2/matchers/catch_matchers_generic.hpp>
 
 std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
     if (desc.empty()) {
diff --git a/src/catch2/catch_matchers_generic.hpp b/src/catch2/matchers/catch_matchers_generic.hpp
similarity index 97%
rename from src/catch2/catch_matchers_generic.hpp
rename to src/catch2/matchers/catch_matchers_generic.hpp
index d39d1bbe..90f26d0c 100644
--- a/src/catch2/catch_matchers_generic.hpp
+++ b/src/catch2/matchers/catch_matchers_generic.hpp
@@ -8,7 +8,7 @@
 #define TWOBLUECUBES_CATCH_MATCHERS_GENERIC_HPP_INCLUDED
 
 #include <catch2/catch_common.h>
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
 #include <catch2/catch_meta.hpp>
 
 #include <string>
diff --git a/src/catch2/catch_matchers_string.cpp b/src/catch2/matchers/catch_matchers_string.cpp
similarity index 96%
rename from src/catch2/catch_matchers_string.cpp
rename to src/catch2/matchers/catch_matchers_string.cpp
index 024cf549..91282ddf 100644
--- a/src/catch2/catch_matchers_string.cpp
+++ b/src/catch2/matchers/catch_matchers_string.cpp
@@ -1,12 +1,9 @@
 /*
- *  Created by Phil Nash on 08/02/2017.
- *  Copyright (c) 2017 Two Blue Cubes Ltd. All rights reserved.
- *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include <catch2/catch_matchers_string.h>
+#include <catch2/matchers/catch_matchers_string.h>
 #include <catch2/catch_string_manip.h>
 #include <catch2/catch_tostring.h>
 
diff --git a/src/catch2/catch_matchers_string.h b/src/catch2/matchers/catch_matchers_string.h
similarity index 98%
rename from src/catch2/catch_matchers_string.h
rename to src/catch2/matchers/catch_matchers_string.h
index 075a7e94..c1096b14 100644
--- a/src/catch2/catch_matchers_string.h
+++ b/src/catch2/matchers/catch_matchers_string.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED
 
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
 
 #include <string>
 
diff --git a/src/catch2/catch_matchers_templates.cpp b/src/catch2/matchers/catch_matchers_templates.cpp
similarity index 95%
rename from src/catch2/catch_matchers_templates.cpp
rename to src/catch2/matchers/catch_matchers_templates.cpp
index 663173f2..f2d744f4 100644
--- a/src/catch2/catch_matchers_templates.cpp
+++ b/src/catch2/matchers/catch_matchers_templates.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch_matchers_templates.hpp>
+#include <catch2/matchers/catch_matchers_templates.hpp>
 
 namespace Catch {
 namespace Matchers {
diff --git a/src/catch2/catch_matchers_templates.hpp b/src/catch2/matchers/catch_matchers_templates.hpp
similarity index 99%
rename from src/catch2/catch_matchers_templates.hpp
rename to src/catch2/matchers/catch_matchers_templates.hpp
index 17ae0d62..918cba84 100644
--- a/src/catch2/catch_matchers_templates.hpp
+++ b/src/catch2/matchers/catch_matchers_templates.hpp
@@ -2,7 +2,7 @@
 #define TWOBLUECUBES_CATCH_MATCHERS_TEMPLATES_HPP_INCLUDED
 
 #include <catch2/catch_common.h>
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
 #include <catch2/catch_stringref.h>
 
 #include <array>
diff --git a/src/catch2/catch_matchers_vector.h b/src/catch2/matchers/catch_matchers_vector.h
similarity index 99%
rename from src/catch2/catch_matchers_vector.h
rename to src/catch2/matchers/catch_matchers_vector.h
index 86fb2214..620b7211 100644
--- a/src/catch2/catch_matchers_vector.h
+++ b/src/catch2/matchers/catch_matchers_vector.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
 
-#include <catch2/catch_matchers.h>
+#include <catch2/matchers/catch_matchers.h>
 #include <catch2/catch_approx.h>
 
 #include <algorithm>
diff --git a/tests/ExtraTests/X01-PrefixedMacros.cpp b/tests/ExtraTests/X01-PrefixedMacros.cpp
index 40b98978..683b86ed 100644
--- a/tests/ExtraTests/X01-PrefixedMacros.cpp
+++ b/tests/ExtraTests/X01-PrefixedMacros.cpp
@@ -5,8 +5,8 @@
 // This won't provide full coverage, but it might be worth checking
 // the other branch as well
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_matchers_generic.hpp>
-#include <catch2/catch_matchers_string.h>
+#include <catch2/matchers/catch_matchers_generic.hpp>
+#include <catch2/matchers/catch_matchers_string.h>
 
 #include <type_traits>
 #include <stdexcept>
diff --git a/tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp b/tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp
index 2d62e9e1..cea898da 100644
--- a/tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp
+++ b/tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp
@@ -5,7 +5,7 @@
 
 #include <catch2/catch_approx.h>
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_matchers_string.h>
+#include <catch2/matchers/catch_matchers_string.h>
 #include <catch2/catch_test_spec_parser.h>
 #include <catch2/catch_test_case_info.h>
 #include <catch2/catch_config.hpp>
diff --git a/tests/SelfTest/IntrospectiveTests/StringManip.tests.cpp b/tests/SelfTest/IntrospectiveTests/StringManip.tests.cpp
index 69e72aa7..19a1e0f2 100644
--- a/tests/SelfTest/IntrospectiveTests/StringManip.tests.cpp
+++ b/tests/SelfTest/IntrospectiveTests/StringManip.tests.cpp
@@ -1,5 +1,5 @@
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_matchers_vector.h>
+#include <catch2/matchers/catch_matchers_vector.h>
 #include <catch2/catch_string_manip.h>
 
 static const char * const no_whitespace = "There is no extra whitespace here";
diff --git a/tests/SelfTest/IntrospectiveTests/Tag.tests.cpp b/tests/SelfTest/IntrospectiveTests/Tag.tests.cpp
index 7b1f4857..3621fcd7 100644
--- a/tests/SelfTest/IntrospectiveTests/Tag.tests.cpp
+++ b/tests/SelfTest/IntrospectiveTests/Tag.tests.cpp
@@ -3,8 +3,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include <catch2/catch_matchers_string.h>
-#include <catch2/catch_matchers_vector.h>
+#include <catch2/matchers/catch_matchers_string.h>
+#include <catch2/matchers/catch_matchers_vector.h>
 #include <catch2/catch_tag_alias_registry.h>
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_test_case_info.h>
diff --git a/tests/SelfTest/IntrospectiveTests/ToString.tests.cpp b/tests/SelfTest/IntrospectiveTests/ToString.tests.cpp
index 20a40160..98cc9024 100644
--- a/tests/SelfTest/IntrospectiveTests/ToString.tests.cpp
+++ b/tests/SelfTest/IntrospectiveTests/ToString.tests.cpp
@@ -1,5 +1,5 @@
 #include <catch2/catch_enum_values_registry.h>
-#include <catch2/catch_matchers_vector.h>
+#include <catch2/matchers/catch_matchers_vector.h>
 #include <catch2/catch_test_macros.hpp>
 
 enum class EnumClass3 { Value1, Value2, Value3, Value4 };
diff --git a/tests/SelfTest/UsageTests/Compilation.tests.cpp b/tests/SelfTest/UsageTests/Compilation.tests.cpp
index 2b0ef0b9..5750ad72 100644
--- a/tests/SelfTest/UsageTests/Compilation.tests.cpp
+++ b/tests/SelfTest/UsageTests/Compilation.tests.cpp
@@ -29,7 +29,7 @@ std::ostream& operator<<(std::ostream& out, foo::helper_1403 const&) {
 ///////////////////////////////
 
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_matchers_string.h>
+#include <catch2/matchers/catch_matchers_string.h>
 
 #include <cstring>
 
diff --git a/tests/SelfTest/UsageTests/Exception.tests.cpp b/tests/SelfTest/UsageTests/Exception.tests.cpp
index 79745c8f..d58b1933 100644
--- a/tests/SelfTest/UsageTests/Exception.tests.cpp
+++ b/tests/SelfTest/UsageTests/Exception.tests.cpp
@@ -4,7 +4,7 @@
  */
 
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_matchers_string.h>
+#include <catch2/matchers/catch_matchers_string.h>
 
 #include <string>
 #include <stdexcept>
diff --git a/tests/SelfTest/UsageTests/Matchers.tests.cpp b/tests/SelfTest/UsageTests/Matchers.tests.cpp
index 0333a457..06db9a1a 100644
--- a/tests/SelfTest/UsageTests/Matchers.tests.cpp
+++ b/tests/SelfTest/UsageTests/Matchers.tests.cpp
@@ -4,12 +4,12 @@
  */
 
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_matchers_exception.hpp>
-#include <catch2/catch_matchers_floating.h>
-#include <catch2/catch_matchers_generic.hpp>
-#include <catch2/catch_matchers_string.h>
-#include <catch2/catch_matchers_vector.h>
-#include <catch2/catch_matchers_templates.hpp>
+#include <catch2/matchers/catch_matchers_exception.hpp>
+#include <catch2/matchers/catch_matchers_floating.h>
+#include <catch2/matchers/catch_matchers_generic.hpp>
+#include <catch2/matchers/catch_matchers_string.h>
+#include <catch2/matchers/catch_matchers_vector.h>
+#include <catch2/matchers/catch_matchers_templates.hpp>
 
 #include <algorithm>
 #include <cmath>