diff --git a/src/benchmark/catch_benchmark.hpp b/src/catch2/benchmark/catch_benchmark.hpp
similarity index 100%
rename from src/benchmark/catch_benchmark.hpp
rename to src/catch2/benchmark/catch_benchmark.hpp
diff --git a/src/benchmark/catch_chronometer.hpp b/src/catch2/benchmark/catch_chronometer.hpp
similarity index 100%
rename from src/benchmark/catch_chronometer.hpp
rename to src/catch2/benchmark/catch_chronometer.hpp
diff --git a/src/benchmark/catch_clock.hpp b/src/catch2/benchmark/catch_clock.hpp
similarity index 100%
rename from src/benchmark/catch_clock.hpp
rename to src/catch2/benchmark/catch_clock.hpp
diff --git a/src/benchmark/catch_constructor.hpp b/src/catch2/benchmark/catch_constructor.hpp
similarity index 100%
rename from src/benchmark/catch_constructor.hpp
rename to src/catch2/benchmark/catch_constructor.hpp
diff --git a/src/benchmark/catch_environment.hpp b/src/catch2/benchmark/catch_environment.hpp
similarity index 100%
rename from src/benchmark/catch_environment.hpp
rename to src/catch2/benchmark/catch_environment.hpp
diff --git a/src/benchmark/catch_estimate.hpp b/src/catch2/benchmark/catch_estimate.hpp
similarity index 100%
rename from src/benchmark/catch_estimate.hpp
rename to src/catch2/benchmark/catch_estimate.hpp
diff --git a/src/benchmark/catch_execution_plan.hpp b/src/catch2/benchmark/catch_execution_plan.hpp
similarity index 100%
rename from src/benchmark/catch_execution_plan.hpp
rename to src/catch2/benchmark/catch_execution_plan.hpp
diff --git a/src/benchmark/catch_optimizer.hpp b/src/catch2/benchmark/catch_optimizer.hpp
similarity index 100%
rename from src/benchmark/catch_optimizer.hpp
rename to src/catch2/benchmark/catch_optimizer.hpp
diff --git a/src/benchmark/catch_outlier_classification.hpp b/src/catch2/benchmark/catch_outlier_classification.hpp
similarity index 100%
rename from src/benchmark/catch_outlier_classification.hpp
rename to src/catch2/benchmark/catch_outlier_classification.hpp
diff --git a/src/benchmark/catch_sample_analysis.hpp b/src/catch2/benchmark/catch_sample_analysis.hpp
similarity index 100%
rename from src/benchmark/catch_sample_analysis.hpp
rename to src/catch2/benchmark/catch_sample_analysis.hpp
diff --git a/src/benchmark/detail/catch_analyse.hpp b/src/catch2/benchmark/detail/catch_analyse.hpp
similarity index 100%
rename from src/benchmark/detail/catch_analyse.hpp
rename to src/catch2/benchmark/detail/catch_analyse.hpp
diff --git a/src/benchmark/detail/catch_benchmark_function.hpp b/src/catch2/benchmark/detail/catch_benchmark_function.hpp
similarity index 100%
rename from src/benchmark/detail/catch_benchmark_function.hpp
rename to src/catch2/benchmark/detail/catch_benchmark_function.hpp
diff --git a/src/benchmark/detail/catch_complete_invoke.hpp b/src/catch2/benchmark/detail/catch_complete_invoke.hpp
similarity index 100%
rename from src/benchmark/detail/catch_complete_invoke.hpp
rename to src/catch2/benchmark/detail/catch_complete_invoke.hpp
diff --git a/src/benchmark/detail/catch_estimate_clock.hpp b/src/catch2/benchmark/detail/catch_estimate_clock.hpp
similarity index 100%
rename from src/benchmark/detail/catch_estimate_clock.hpp
rename to src/catch2/benchmark/detail/catch_estimate_clock.hpp
diff --git a/src/benchmark/detail/catch_measure.hpp b/src/catch2/benchmark/detail/catch_measure.hpp
similarity index 100%
rename from src/benchmark/detail/catch_measure.hpp
rename to src/catch2/benchmark/detail/catch_measure.hpp
diff --git a/src/benchmark/detail/catch_repeat.hpp b/src/catch2/benchmark/detail/catch_repeat.hpp
similarity index 100%
rename from src/benchmark/detail/catch_repeat.hpp
rename to src/catch2/benchmark/detail/catch_repeat.hpp
diff --git a/src/benchmark/detail/catch_run_for_at_least.hpp b/src/catch2/benchmark/detail/catch_run_for_at_least.hpp
similarity index 100%
rename from src/benchmark/detail/catch_run_for_at_least.hpp
rename to src/catch2/benchmark/detail/catch_run_for_at_least.hpp
diff --git a/src/benchmark/detail/catch_stats.cpp b/src/catch2/benchmark/detail/catch_stats.cpp
similarity index 100%
rename from src/benchmark/detail/catch_stats.cpp
rename to src/catch2/benchmark/detail/catch_stats.cpp
diff --git a/src/benchmark/detail/catch_stats.hpp b/src/catch2/benchmark/detail/catch_stats.hpp
similarity index 100%
rename from src/benchmark/detail/catch_stats.hpp
rename to src/catch2/benchmark/detail/catch_stats.hpp
diff --git a/src/benchmark/detail/catch_timing.hpp b/src/catch2/benchmark/detail/catch_timing.hpp
similarity index 100%
rename from src/benchmark/detail/catch_timing.hpp
rename to src/catch2/benchmark/detail/catch_timing.hpp
diff --git a/src/catch.hpp b/src/catch2/catch.hpp
similarity index 100%
rename from src/catch.hpp
rename to src/catch2/catch.hpp
diff --git a/src/catch_approx.cpp b/src/catch2/catch_approx.cpp
similarity index 100%
rename from src/catch_approx.cpp
rename to src/catch2/catch_approx.cpp
diff --git a/src/catch_approx.h b/src/catch2/catch_approx.h
similarity index 100%
rename from src/catch_approx.h
rename to src/catch2/catch_approx.h
diff --git a/src/catch_assertionhandler.cpp b/src/catch2/catch_assertionhandler.cpp
similarity index 100%
rename from src/catch_assertionhandler.cpp
rename to src/catch2/catch_assertionhandler.cpp
diff --git a/src/catch_assertionhandler.h b/src/catch2/catch_assertionhandler.h
similarity index 100%
rename from src/catch_assertionhandler.h
rename to src/catch2/catch_assertionhandler.h
diff --git a/src/catch_assertioninfo.h b/src/catch2/catch_assertioninfo.h
similarity index 100%
rename from src/catch_assertioninfo.h
rename to src/catch2/catch_assertioninfo.h
diff --git a/src/catch_assertionresult.cpp b/src/catch2/catch_assertionresult.cpp
similarity index 100%
rename from src/catch_assertionresult.cpp
rename to src/catch2/catch_assertionresult.cpp
diff --git a/src/catch_assertionresult.h b/src/catch2/catch_assertionresult.h
similarity index 100%
rename from src/catch_assertionresult.h
rename to src/catch2/catch_assertionresult.h
diff --git a/src/catch_capture.hpp b/src/catch2/catch_capture.hpp
similarity index 100%
rename from src/catch_capture.hpp
rename to src/catch2/catch_capture.hpp
diff --git a/src/catch_capture_matchers.cpp b/src/catch2/catch_capture_matchers.cpp
similarity index 100%
rename from src/catch_capture_matchers.cpp
rename to src/catch2/catch_capture_matchers.cpp
diff --git a/src/catch_capture_matchers.h b/src/catch2/catch_capture_matchers.h
similarity index 100%
rename from src/catch_capture_matchers.h
rename to src/catch2/catch_capture_matchers.h
diff --git a/src/catch_clara.h b/src/catch2/catch_clara.h
similarity index 100%
rename from src/catch_clara.h
rename to src/catch2/catch_clara.h
diff --git a/src/catch_commandline.cpp b/src/catch2/catch_commandline.cpp
similarity index 100%
rename from src/catch_commandline.cpp
rename to src/catch2/catch_commandline.cpp
diff --git a/src/catch_commandline.h b/src/catch2/catch_commandline.h
similarity index 100%
rename from src/catch_commandline.h
rename to src/catch2/catch_commandline.h
diff --git a/src/catch_common.cpp b/src/catch2/catch_common.cpp
similarity index 100%
rename from src/catch_common.cpp
rename to src/catch2/catch_common.cpp
diff --git a/src/catch_common.h b/src/catch2/catch_common.h
similarity index 100%
rename from src/catch_common.h
rename to src/catch2/catch_common.h
diff --git a/src/catch_compiler_capabilities.h b/src/catch2/catch_compiler_capabilities.h
similarity index 100%
rename from src/catch_compiler_capabilities.h
rename to src/catch2/catch_compiler_capabilities.h
diff --git a/src/catch_config.cpp b/src/catch2/catch_config.cpp
similarity index 100%
rename from src/catch_config.cpp
rename to src/catch2/catch_config.cpp
diff --git a/src/catch_config.hpp b/src/catch2/catch_config.hpp
similarity index 100%
rename from src/catch_config.hpp
rename to src/catch2/catch_config.hpp
diff --git a/src/catch_console_colour.cpp b/src/catch2/catch_console_colour.cpp
similarity index 100%
rename from src/catch_console_colour.cpp
rename to src/catch2/catch_console_colour.cpp
diff --git a/src/catch_console_colour.h b/src/catch2/catch_console_colour.h
similarity index 100%
rename from src/catch_console_colour.h
rename to src/catch2/catch_console_colour.h
diff --git a/src/catch_context.cpp b/src/catch2/catch_context.cpp
similarity index 100%
rename from src/catch_context.cpp
rename to src/catch2/catch_context.cpp
diff --git a/src/catch_context.h b/src/catch2/catch_context.h
similarity index 100%
rename from src/catch_context.h
rename to src/catch2/catch_context.h
diff --git a/src/catch_debug_console.cpp b/src/catch2/catch_debug_console.cpp
similarity index 100%
rename from src/catch_debug_console.cpp
rename to src/catch2/catch_debug_console.cpp
diff --git a/src/catch_debug_console.h b/src/catch2/catch_debug_console.h
similarity index 100%
rename from src/catch_debug_console.h
rename to src/catch2/catch_debug_console.h
diff --git a/src/catch_debugger.cpp b/src/catch2/catch_debugger.cpp
similarity index 100%
rename from src/catch_debugger.cpp
rename to src/catch2/catch_debugger.cpp
diff --git a/src/catch_debugger.h b/src/catch2/catch_debugger.h
similarity index 100%
rename from src/catch_debugger.h
rename to src/catch2/catch_debugger.h
diff --git a/src/catch_decomposer.cpp b/src/catch2/catch_decomposer.cpp
similarity index 100%
rename from src/catch_decomposer.cpp
rename to src/catch2/catch_decomposer.cpp
diff --git a/src/catch_decomposer.h b/src/catch2/catch_decomposer.h
similarity index 100%
rename from src/catch_decomposer.h
rename to src/catch2/catch_decomposer.h
diff --git a/src/catch_default_main.hpp b/src/catch2/catch_default_main.hpp
similarity index 100%
rename from src/catch_default_main.hpp
rename to src/catch2/catch_default_main.hpp
diff --git a/src/catch_enforce.cpp b/src/catch2/catch_enforce.cpp
similarity index 100%
rename from src/catch_enforce.cpp
rename to src/catch2/catch_enforce.cpp
diff --git a/src/catch_enforce.h b/src/catch2/catch_enforce.h
similarity index 100%
rename from src/catch_enforce.h
rename to src/catch2/catch_enforce.h
diff --git a/src/catch_enum_values_registry.cpp b/src/catch2/catch_enum_values_registry.cpp
similarity index 100%
rename from src/catch_enum_values_registry.cpp
rename to src/catch2/catch_enum_values_registry.cpp
diff --git a/src/catch_enum_values_registry.h b/src/catch2/catch_enum_values_registry.h
similarity index 100%
rename from src/catch_enum_values_registry.h
rename to src/catch2/catch_enum_values_registry.h
diff --git a/src/catch_errno_guard.cpp b/src/catch2/catch_errno_guard.cpp
similarity index 100%
rename from src/catch_errno_guard.cpp
rename to src/catch2/catch_errno_guard.cpp
diff --git a/src/catch_errno_guard.h b/src/catch2/catch_errno_guard.h
similarity index 100%
rename from src/catch_errno_guard.h
rename to src/catch2/catch_errno_guard.h
diff --git a/src/catch_exception_translator_registry.cpp b/src/catch2/catch_exception_translator_registry.cpp
similarity index 100%
rename from src/catch_exception_translator_registry.cpp
rename to src/catch2/catch_exception_translator_registry.cpp
diff --git a/src/catch_exception_translator_registry.h b/src/catch2/catch_exception_translator_registry.h
similarity index 100%
rename from src/catch_exception_translator_registry.h
rename to src/catch2/catch_exception_translator_registry.h
diff --git a/src/catch_external_interfaces.h b/src/catch2/catch_external_interfaces.h
similarity index 100%
rename from src/catch_external_interfaces.h
rename to src/catch2/catch_external_interfaces.h
diff --git a/src/catch_fatal_condition.cpp b/src/catch2/catch_fatal_condition.cpp
similarity index 100%
rename from src/catch_fatal_condition.cpp
rename to src/catch2/catch_fatal_condition.cpp
diff --git a/src/catch_fatal_condition.h b/src/catch2/catch_fatal_condition.h
similarity index 100%
rename from src/catch_fatal_condition.h
rename to src/catch2/catch_fatal_condition.h
diff --git a/src/catch_generators.cpp b/src/catch2/catch_generators.cpp
similarity index 100%
rename from src/catch_generators.cpp
rename to src/catch2/catch_generators.cpp
diff --git a/src/catch_generators.hpp b/src/catch2/catch_generators.hpp
similarity index 100%
rename from src/catch_generators.hpp
rename to src/catch2/catch_generators.hpp
diff --git a/src/catch_generators_generic.hpp b/src/catch2/catch_generators_generic.hpp
similarity index 100%
rename from src/catch_generators_generic.hpp
rename to src/catch2/catch_generators_generic.hpp
diff --git a/src/catch_generators_specific.hpp b/src/catch2/catch_generators_specific.hpp
similarity index 100%
rename from src/catch_generators_specific.hpp
rename to src/catch2/catch_generators_specific.hpp
diff --git a/src/catch_impl.hpp b/src/catch2/catch_impl.hpp
similarity index 100%
rename from src/catch_impl.hpp
rename to src/catch2/catch_impl.hpp
diff --git a/src/catch_interfaces_capture.cpp b/src/catch2/catch_interfaces_capture.cpp
similarity index 100%
rename from src/catch_interfaces_capture.cpp
rename to src/catch2/catch_interfaces_capture.cpp
diff --git a/src/catch_interfaces_capture.h b/src/catch2/catch_interfaces_capture.h
similarity index 100%
rename from src/catch_interfaces_capture.h
rename to src/catch2/catch_interfaces_capture.h
diff --git a/src/catch_interfaces_config.cpp b/src/catch2/catch_interfaces_config.cpp
similarity index 100%
rename from src/catch_interfaces_config.cpp
rename to src/catch2/catch_interfaces_config.cpp
diff --git a/src/catch_interfaces_config.h b/src/catch2/catch_interfaces_config.h
similarity index 100%
rename from src/catch_interfaces_config.h
rename to src/catch2/catch_interfaces_config.h
diff --git a/src/catch_interfaces_enum_values_registry.h b/src/catch2/catch_interfaces_enum_values_registry.h
similarity index 100%
rename from src/catch_interfaces_enum_values_registry.h
rename to src/catch2/catch_interfaces_enum_values_registry.h
diff --git a/src/catch_interfaces_exception.cpp b/src/catch2/catch_interfaces_exception.cpp
similarity index 100%
rename from src/catch_interfaces_exception.cpp
rename to src/catch2/catch_interfaces_exception.cpp
diff --git a/src/catch_interfaces_exception.h b/src/catch2/catch_interfaces_exception.h
similarity index 100%
rename from src/catch_interfaces_exception.h
rename to src/catch2/catch_interfaces_exception.h
diff --git a/src/catch_interfaces_generatortracker.h b/src/catch2/catch_interfaces_generatortracker.h
similarity index 100%
rename from src/catch_interfaces_generatortracker.h
rename to src/catch2/catch_interfaces_generatortracker.h
diff --git a/src/catch_interfaces_registry_hub.cpp b/src/catch2/catch_interfaces_registry_hub.cpp
similarity index 100%
rename from src/catch_interfaces_registry_hub.cpp
rename to src/catch2/catch_interfaces_registry_hub.cpp
diff --git a/src/catch_interfaces_registry_hub.h b/src/catch2/catch_interfaces_registry_hub.h
similarity index 100%
rename from src/catch_interfaces_registry_hub.h
rename to src/catch2/catch_interfaces_registry_hub.h
diff --git a/src/catch_interfaces_reporter.cpp b/src/catch2/catch_interfaces_reporter.cpp
similarity index 100%
rename from src/catch_interfaces_reporter.cpp
rename to src/catch2/catch_interfaces_reporter.cpp
diff --git a/src/catch_interfaces_reporter.h b/src/catch2/catch_interfaces_reporter.h
similarity index 100%
rename from src/catch_interfaces_reporter.h
rename to src/catch2/catch_interfaces_reporter.h
diff --git a/src/catch_interfaces_runner.cpp b/src/catch2/catch_interfaces_runner.cpp
similarity index 100%
rename from src/catch_interfaces_runner.cpp
rename to src/catch2/catch_interfaces_runner.cpp
diff --git a/src/catch_interfaces_runner.h b/src/catch2/catch_interfaces_runner.h
similarity index 100%
rename from src/catch_interfaces_runner.h
rename to src/catch2/catch_interfaces_runner.h
diff --git a/src/catch_interfaces_tag_alias_registry.h b/src/catch2/catch_interfaces_tag_alias_registry.h
similarity index 100%
rename from src/catch_interfaces_tag_alias_registry.h
rename to src/catch2/catch_interfaces_tag_alias_registry.h
diff --git a/src/catch_interfaces_testcase.cpp b/src/catch2/catch_interfaces_testcase.cpp
similarity index 100%
rename from src/catch_interfaces_testcase.cpp
rename to src/catch2/catch_interfaces_testcase.cpp
diff --git a/src/catch_interfaces_testcase.h b/src/catch2/catch_interfaces_testcase.h
similarity index 100%
rename from src/catch_interfaces_testcase.h
rename to src/catch2/catch_interfaces_testcase.h
diff --git a/src/catch_leak_detector.cpp b/src/catch2/catch_leak_detector.cpp
similarity index 100%
rename from src/catch_leak_detector.cpp
rename to src/catch2/catch_leak_detector.cpp
diff --git a/src/catch_leak_detector.h b/src/catch2/catch_leak_detector.h
similarity index 100%
rename from src/catch_leak_detector.h
rename to src/catch2/catch_leak_detector.h
diff --git a/src/catch_list.cpp b/src/catch2/catch_list.cpp
similarity index 100%
rename from src/catch_list.cpp
rename to src/catch2/catch_list.cpp
diff --git a/src/catch_list.h b/src/catch2/catch_list.h
similarity index 100%
rename from src/catch_list.h
rename to src/catch2/catch_list.h
diff --git a/src/catch_matchers.cpp b/src/catch2/catch_matchers.cpp
similarity index 100%
rename from src/catch_matchers.cpp
rename to src/catch2/catch_matchers.cpp
diff --git a/src/catch_matchers.h b/src/catch2/catch_matchers.h
similarity index 100%
rename from src/catch_matchers.h
rename to src/catch2/catch_matchers.h
diff --git a/src/catch_matchers_exception.cpp b/src/catch2/catch_matchers_exception.cpp
similarity index 100%
rename from src/catch_matchers_exception.cpp
rename to src/catch2/catch_matchers_exception.cpp
diff --git a/src/catch_matchers_exception.hpp b/src/catch2/catch_matchers_exception.hpp
similarity index 100%
rename from src/catch_matchers_exception.hpp
rename to src/catch2/catch_matchers_exception.hpp
diff --git a/src/catch_matchers_floating.cpp b/src/catch2/catch_matchers_floating.cpp
similarity index 100%
rename from src/catch_matchers_floating.cpp
rename to src/catch2/catch_matchers_floating.cpp
diff --git a/src/catch_matchers_floating.h b/src/catch2/catch_matchers_floating.h
similarity index 100%
rename from src/catch_matchers_floating.h
rename to src/catch2/catch_matchers_floating.h
diff --git a/src/catch_matchers_generic.cpp b/src/catch2/catch_matchers_generic.cpp
similarity index 100%
rename from src/catch_matchers_generic.cpp
rename to src/catch2/catch_matchers_generic.cpp
diff --git a/src/catch_matchers_generic.hpp b/src/catch2/catch_matchers_generic.hpp
similarity index 100%
rename from src/catch_matchers_generic.hpp
rename to src/catch2/catch_matchers_generic.hpp
diff --git a/src/catch_matchers_string.cpp b/src/catch2/catch_matchers_string.cpp
similarity index 100%
rename from src/catch_matchers_string.cpp
rename to src/catch2/catch_matchers_string.cpp
diff --git a/src/catch_matchers_string.h b/src/catch2/catch_matchers_string.h
similarity index 100%
rename from src/catch_matchers_string.h
rename to src/catch2/catch_matchers_string.h
diff --git a/src/catch_matchers_vector.h b/src/catch2/catch_matchers_vector.h
similarity index 100%
rename from src/catch_matchers_vector.h
rename to src/catch2/catch_matchers_vector.h
diff --git a/src/catch_message.cpp b/src/catch2/catch_message.cpp
similarity index 100%
rename from src/catch_message.cpp
rename to src/catch2/catch_message.cpp
diff --git a/src/catch_message.h b/src/catch2/catch_message.h
similarity index 100%
rename from src/catch_message.h
rename to src/catch2/catch_message.h
diff --git a/src/catch_meta.hpp b/src/catch2/catch_meta.hpp
similarity index 100%
rename from src/catch_meta.hpp
rename to src/catch2/catch_meta.hpp
diff --git a/src/catch_objc.hpp b/src/catch2/catch_objc.hpp
similarity index 100%
rename from src/catch_objc.hpp
rename to src/catch2/catch_objc.hpp
diff --git a/src/catch_objc_arc.hpp b/src/catch2/catch_objc_arc.hpp
similarity index 100%
rename from src/catch_objc_arc.hpp
rename to src/catch2/catch_objc_arc.hpp
diff --git a/src/catch_option.hpp b/src/catch2/catch_option.hpp
similarity index 100%
rename from src/catch_option.hpp
rename to src/catch2/catch_option.hpp
diff --git a/src/catch_output_redirect.cpp b/src/catch2/catch_output_redirect.cpp
similarity index 100%
rename from src/catch_output_redirect.cpp
rename to src/catch2/catch_output_redirect.cpp
diff --git a/src/catch_output_redirect.h b/src/catch2/catch_output_redirect.h
similarity index 100%
rename from src/catch_output_redirect.h
rename to src/catch2/catch_output_redirect.h
diff --git a/src/catch_platform.h b/src/catch2/catch_platform.h
similarity index 100%
rename from src/catch_platform.h
rename to src/catch2/catch_platform.h
diff --git a/src/catch_polyfills.cpp b/src/catch2/catch_polyfills.cpp
similarity index 100%
rename from src/catch_polyfills.cpp
rename to src/catch2/catch_polyfills.cpp
diff --git a/src/catch_polyfills.hpp b/src/catch2/catch_polyfills.hpp
similarity index 100%
rename from src/catch_polyfills.hpp
rename to src/catch2/catch_polyfills.hpp
diff --git a/src/catch_preprocessor.hpp b/src/catch2/catch_preprocessor.hpp
similarity index 100%
rename from src/catch_preprocessor.hpp
rename to src/catch2/catch_preprocessor.hpp
diff --git a/src/catch_random_number_generator.cpp b/src/catch2/catch_random_number_generator.cpp
similarity index 100%
rename from src/catch_random_number_generator.cpp
rename to src/catch2/catch_random_number_generator.cpp
diff --git a/src/catch_random_number_generator.h b/src/catch2/catch_random_number_generator.h
similarity index 100%
rename from src/catch_random_number_generator.h
rename to src/catch2/catch_random_number_generator.h
diff --git a/src/catch_reenable_warnings.h b/src/catch2/catch_reenable_warnings.h
similarity index 100%
rename from src/catch_reenable_warnings.h
rename to src/catch2/catch_reenable_warnings.h
diff --git a/src/catch_registry_hub.cpp b/src/catch2/catch_registry_hub.cpp
similarity index 100%
rename from src/catch_registry_hub.cpp
rename to src/catch2/catch_registry_hub.cpp
diff --git a/src/catch_reporter_registrars.hpp b/src/catch2/catch_reporter_registrars.hpp
similarity index 100%
rename from src/catch_reporter_registrars.hpp
rename to src/catch2/catch_reporter_registrars.hpp
diff --git a/src/catch_reporter_registry.cpp b/src/catch2/catch_reporter_registry.cpp
similarity index 100%
rename from src/catch_reporter_registry.cpp
rename to src/catch2/catch_reporter_registry.cpp
diff --git a/src/catch_reporter_registry.h b/src/catch2/catch_reporter_registry.h
similarity index 100%
rename from src/catch_reporter_registry.h
rename to src/catch2/catch_reporter_registry.h
diff --git a/src/catch_result_type.cpp b/src/catch2/catch_result_type.cpp
similarity index 100%
rename from src/catch_result_type.cpp
rename to src/catch2/catch_result_type.cpp
diff --git a/src/catch_result_type.h b/src/catch2/catch_result_type.h
similarity index 100%
rename from src/catch_result_type.h
rename to src/catch2/catch_result_type.h
diff --git a/src/catch_run_context.cpp b/src/catch2/catch_run_context.cpp
similarity index 100%
rename from src/catch_run_context.cpp
rename to src/catch2/catch_run_context.cpp
diff --git a/src/catch_run_context.h b/src/catch2/catch_run_context.h
similarity index 100%
rename from src/catch_run_context.h
rename to src/catch2/catch_run_context.h
diff --git a/src/catch_section.cpp b/src/catch2/catch_section.cpp
similarity index 100%
rename from src/catch_section.cpp
rename to src/catch2/catch_section.cpp
diff --git a/src/catch_section.h b/src/catch2/catch_section.h
similarity index 100%
rename from src/catch_section.h
rename to src/catch2/catch_section.h
diff --git a/src/catch_section_info.h b/src/catch2/catch_section_info.h
similarity index 100%
rename from src/catch_section_info.h
rename to src/catch2/catch_section_info.h
diff --git a/src/catch_session.cpp b/src/catch2/catch_session.cpp
similarity index 100%
rename from src/catch_session.cpp
rename to src/catch2/catch_session.cpp
diff --git a/src/catch_session.h b/src/catch2/catch_session.h
similarity index 100%
rename from src/catch_session.h
rename to src/catch2/catch_session.h
diff --git a/src/catch_singletons.cpp b/src/catch2/catch_singletons.cpp
similarity index 100%
rename from src/catch_singletons.cpp
rename to src/catch2/catch_singletons.cpp
diff --git a/src/catch_singletons.hpp b/src/catch2/catch_singletons.hpp
similarity index 100%
rename from src/catch_singletons.hpp
rename to src/catch2/catch_singletons.hpp
diff --git a/src/catch_startup_exception_registry.cpp b/src/catch2/catch_startup_exception_registry.cpp
similarity index 100%
rename from src/catch_startup_exception_registry.cpp
rename to src/catch2/catch_startup_exception_registry.cpp
diff --git a/src/catch_startup_exception_registry.h b/src/catch2/catch_startup_exception_registry.h
similarity index 100%
rename from src/catch_startup_exception_registry.h
rename to src/catch2/catch_startup_exception_registry.h
diff --git a/src/catch_stream.cpp b/src/catch2/catch_stream.cpp
similarity index 100%
rename from src/catch_stream.cpp
rename to src/catch2/catch_stream.cpp
diff --git a/src/catch_stream.h b/src/catch2/catch_stream.h
similarity index 100%
rename from src/catch_stream.h
rename to src/catch2/catch_stream.h
diff --git a/src/catch_string_manip.cpp b/src/catch2/catch_string_manip.cpp
similarity index 100%
rename from src/catch_string_manip.cpp
rename to src/catch2/catch_string_manip.cpp
diff --git a/src/catch_string_manip.h b/src/catch2/catch_string_manip.h
similarity index 100%
rename from src/catch_string_manip.h
rename to src/catch2/catch_string_manip.h
diff --git a/src/catch_stringref.cpp b/src/catch2/catch_stringref.cpp
similarity index 100%
rename from src/catch_stringref.cpp
rename to src/catch2/catch_stringref.cpp
diff --git a/src/catch_stringref.h b/src/catch2/catch_stringref.h
similarity index 100%
rename from src/catch_stringref.h
rename to src/catch2/catch_stringref.h
diff --git a/src/catch_suppress_warnings.h b/src/catch2/catch_suppress_warnings.h
similarity index 100%
rename from src/catch_suppress_warnings.h
rename to src/catch2/catch_suppress_warnings.h
diff --git a/src/catch_tag_alias.cpp b/src/catch2/catch_tag_alias.cpp
similarity index 100%
rename from src/catch_tag_alias.cpp
rename to src/catch2/catch_tag_alias.cpp
diff --git a/src/catch_tag_alias.h b/src/catch2/catch_tag_alias.h
similarity index 100%
rename from src/catch_tag_alias.h
rename to src/catch2/catch_tag_alias.h
diff --git a/src/catch_tag_alias_autoregistrar.cpp b/src/catch2/catch_tag_alias_autoregistrar.cpp
similarity index 100%
rename from src/catch_tag_alias_autoregistrar.cpp
rename to src/catch2/catch_tag_alias_autoregistrar.cpp
diff --git a/src/catch_tag_alias_autoregistrar.h b/src/catch2/catch_tag_alias_autoregistrar.h
similarity index 100%
rename from src/catch_tag_alias_autoregistrar.h
rename to src/catch2/catch_tag_alias_autoregistrar.h
diff --git a/src/catch_tag_alias_registry.cpp b/src/catch2/catch_tag_alias_registry.cpp
similarity index 100%
rename from src/catch_tag_alias_registry.cpp
rename to src/catch2/catch_tag_alias_registry.cpp
diff --git a/src/catch_tag_alias_registry.h b/src/catch2/catch_tag_alias_registry.h
similarity index 100%
rename from src/catch_tag_alias_registry.h
rename to src/catch2/catch_tag_alias_registry.h
diff --git a/src/catch_test_case_info.cpp b/src/catch2/catch_test_case_info.cpp
similarity index 100%
rename from src/catch_test_case_info.cpp
rename to src/catch2/catch_test_case_info.cpp
diff --git a/src/catch_test_case_info.h b/src/catch2/catch_test_case_info.h
similarity index 100%
rename from src/catch_test_case_info.h
rename to src/catch2/catch_test_case_info.h
diff --git a/src/catch_test_case_registry_impl.cpp b/src/catch2/catch_test_case_registry_impl.cpp
similarity index 100%
rename from src/catch_test_case_registry_impl.cpp
rename to src/catch2/catch_test_case_registry_impl.cpp
diff --git a/src/catch_test_case_registry_impl.h b/src/catch2/catch_test_case_registry_impl.h
similarity index 100%
rename from src/catch_test_case_registry_impl.h
rename to src/catch2/catch_test_case_registry_impl.h
diff --git a/src/catch_test_case_tracker.cpp b/src/catch2/catch_test_case_tracker.cpp
similarity index 100%
rename from src/catch_test_case_tracker.cpp
rename to src/catch2/catch_test_case_tracker.cpp
diff --git a/src/catch_test_case_tracker.h b/src/catch2/catch_test_case_tracker.h
similarity index 100%
rename from src/catch_test_case_tracker.h
rename to src/catch2/catch_test_case_tracker.h
diff --git a/src/catch_test_registry.cpp b/src/catch2/catch_test_registry.cpp
similarity index 100%
rename from src/catch_test_registry.cpp
rename to src/catch2/catch_test_registry.cpp
diff --git a/src/catch_test_registry.h b/src/catch2/catch_test_registry.h
similarity index 100%
rename from src/catch_test_registry.h
rename to src/catch2/catch_test_registry.h
diff --git a/src/catch_test_spec.cpp b/src/catch2/catch_test_spec.cpp
similarity index 100%
rename from src/catch_test_spec.cpp
rename to src/catch2/catch_test_spec.cpp
diff --git a/src/catch_test_spec.h b/src/catch2/catch_test_spec.h
similarity index 100%
rename from src/catch_test_spec.h
rename to src/catch2/catch_test_spec.h
diff --git a/src/catch_test_spec_parser.cpp b/src/catch2/catch_test_spec_parser.cpp
similarity index 100%
rename from src/catch_test_spec_parser.cpp
rename to src/catch2/catch_test_spec_parser.cpp
diff --git a/src/catch_test_spec_parser.h b/src/catch2/catch_test_spec_parser.h
similarity index 100%
rename from src/catch_test_spec_parser.h
rename to src/catch2/catch_test_spec_parser.h
diff --git a/src/catch_text.h b/src/catch2/catch_text.h
similarity index 100%
rename from src/catch_text.h
rename to src/catch2/catch_text.h
diff --git a/src/catch_timer.cpp b/src/catch2/catch_timer.cpp
similarity index 100%
rename from src/catch_timer.cpp
rename to src/catch2/catch_timer.cpp
diff --git a/src/catch_timer.h b/src/catch2/catch_timer.h
similarity index 100%
rename from src/catch_timer.h
rename to src/catch2/catch_timer.h
diff --git a/src/catch_to_string.hpp b/src/catch2/catch_to_string.hpp
similarity index 100%
rename from src/catch_to_string.hpp
rename to src/catch2/catch_to_string.hpp
diff --git a/src/catch_tostring.cpp b/src/catch2/catch_tostring.cpp
similarity index 100%
rename from src/catch_tostring.cpp
rename to src/catch2/catch_tostring.cpp
diff --git a/src/catch_tostring.h b/src/catch2/catch_tostring.h
similarity index 100%
rename from src/catch_tostring.h
rename to src/catch2/catch_tostring.h
diff --git a/src/catch_totals.cpp b/src/catch2/catch_totals.cpp
similarity index 100%
rename from src/catch_totals.cpp
rename to src/catch2/catch_totals.cpp
diff --git a/src/catch_totals.h b/src/catch2/catch_totals.h
similarity index 100%
rename from src/catch_totals.h
rename to src/catch2/catch_totals.h
diff --git a/src/catch_uncaught_exceptions.cpp b/src/catch2/catch_uncaught_exceptions.cpp
similarity index 100%
rename from src/catch_uncaught_exceptions.cpp
rename to src/catch2/catch_uncaught_exceptions.cpp
diff --git a/src/catch_uncaught_exceptions.h b/src/catch2/catch_uncaught_exceptions.h
similarity index 100%
rename from src/catch_uncaught_exceptions.h
rename to src/catch2/catch_uncaught_exceptions.h
diff --git a/src/catch_user_interfaces.h b/src/catch2/catch_user_interfaces.h
similarity index 100%
rename from src/catch_user_interfaces.h
rename to src/catch2/catch_user_interfaces.h
diff --git a/src/catch_version.cpp b/src/catch2/catch_version.cpp
similarity index 100%
rename from src/catch_version.cpp
rename to src/catch2/catch_version.cpp
diff --git a/src/catch_version.h b/src/catch2/catch_version.h
similarity index 100%
rename from src/catch_version.h
rename to src/catch2/catch_version.h
diff --git a/src/catch_wildcard_pattern.cpp b/src/catch2/catch_wildcard_pattern.cpp
similarity index 100%
rename from src/catch_wildcard_pattern.cpp
rename to src/catch2/catch_wildcard_pattern.cpp
diff --git a/src/catch_wildcard_pattern.h b/src/catch2/catch_wildcard_pattern.h
similarity index 100%
rename from src/catch_wildcard_pattern.h
rename to src/catch2/catch_wildcard_pattern.h
diff --git a/src/catch_windows_h_proxy.h b/src/catch2/catch_windows_h_proxy.h
similarity index 100%
rename from src/catch_windows_h_proxy.h
rename to src/catch2/catch_windows_h_proxy.h
diff --git a/src/catch_xmlwriter.cpp b/src/catch2/catch_xmlwriter.cpp
similarity index 100%
rename from src/catch_xmlwriter.cpp
rename to src/catch2/catch_xmlwriter.cpp
diff --git a/src/catch_xmlwriter.h b/src/catch2/catch_xmlwriter.h
similarity index 100%
rename from src/catch_xmlwriter.h
rename to src/catch2/catch_xmlwriter.h
diff --git a/src/external/clara.hpp b/src/catch2/external/clara.hpp
similarity index 100%
rename from src/external/clara.hpp
rename to src/catch2/external/clara.hpp
diff --git a/src/reporters/catch_reporter_automake.hpp b/src/catch2/reporters/catch_reporter_automake.hpp
similarity index 100%
rename from src/reporters/catch_reporter_automake.hpp
rename to src/catch2/reporters/catch_reporter_automake.hpp
diff --git a/src/reporters/catch_reporter_bases.cpp b/src/catch2/reporters/catch_reporter_bases.cpp
similarity index 100%
rename from src/reporters/catch_reporter_bases.cpp
rename to src/catch2/reporters/catch_reporter_bases.cpp
diff --git a/src/reporters/catch_reporter_bases.hpp b/src/catch2/reporters/catch_reporter_bases.hpp
similarity index 100%
rename from src/reporters/catch_reporter_bases.hpp
rename to src/catch2/reporters/catch_reporter_bases.hpp
diff --git a/src/reporters/catch_reporter_compact.cpp b/src/catch2/reporters/catch_reporter_compact.cpp
similarity index 100%
rename from src/reporters/catch_reporter_compact.cpp
rename to src/catch2/reporters/catch_reporter_compact.cpp
diff --git a/src/reporters/catch_reporter_compact.h b/src/catch2/reporters/catch_reporter_compact.h
similarity index 100%
rename from src/reporters/catch_reporter_compact.h
rename to src/catch2/reporters/catch_reporter_compact.h
diff --git a/src/reporters/catch_reporter_console.cpp b/src/catch2/reporters/catch_reporter_console.cpp
similarity index 100%
rename from src/reporters/catch_reporter_console.cpp
rename to src/catch2/reporters/catch_reporter_console.cpp
diff --git a/src/reporters/catch_reporter_console.h b/src/catch2/reporters/catch_reporter_console.h
similarity index 100%
rename from src/reporters/catch_reporter_console.h
rename to src/catch2/reporters/catch_reporter_console.h
diff --git a/src/reporters/catch_reporter_junit.cpp b/src/catch2/reporters/catch_reporter_junit.cpp
similarity index 100%
rename from src/reporters/catch_reporter_junit.cpp
rename to src/catch2/reporters/catch_reporter_junit.cpp
diff --git a/src/reporters/catch_reporter_junit.h b/src/catch2/reporters/catch_reporter_junit.h
similarity index 100%
rename from src/reporters/catch_reporter_junit.h
rename to src/catch2/reporters/catch_reporter_junit.h
diff --git a/src/reporters/catch_reporter_listening.cpp b/src/catch2/reporters/catch_reporter_listening.cpp
similarity index 100%
rename from src/reporters/catch_reporter_listening.cpp
rename to src/catch2/reporters/catch_reporter_listening.cpp
diff --git a/src/reporters/catch_reporter_listening.h b/src/catch2/reporters/catch_reporter_listening.h
similarity index 100%
rename from src/reporters/catch_reporter_listening.h
rename to src/catch2/reporters/catch_reporter_listening.h
diff --git a/src/reporters/catch_reporter_sonarqube.hpp b/src/catch2/reporters/catch_reporter_sonarqube.hpp
similarity index 100%
rename from src/reporters/catch_reporter_sonarqube.hpp
rename to src/catch2/reporters/catch_reporter_sonarqube.hpp
diff --git a/src/reporters/catch_reporter_tap.hpp b/src/catch2/reporters/catch_reporter_tap.hpp
similarity index 100%
rename from src/reporters/catch_reporter_tap.hpp
rename to src/catch2/reporters/catch_reporter_tap.hpp
diff --git a/src/reporters/catch_reporter_teamcity.hpp b/src/catch2/reporters/catch_reporter_teamcity.hpp
similarity index 100%
rename from src/reporters/catch_reporter_teamcity.hpp
rename to src/catch2/reporters/catch_reporter_teamcity.hpp
diff --git a/src/reporters/catch_reporter_xml.cpp b/src/catch2/reporters/catch_reporter_xml.cpp
similarity index 100%
rename from src/reporters/catch_reporter_xml.cpp
rename to src/catch2/reporters/catch_reporter_xml.cpp
diff --git a/src/reporters/catch_reporter_xml.h b/src/catch2/reporters/catch_reporter_xml.h
similarity index 100%
rename from src/reporters/catch_reporter_xml.h
rename to src/catch2/reporters/catch_reporter_xml.h