diff --git a/.travis.yml b/.travis.yml
index 837ec890..18766e52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -175,7 +175,7 @@ before_script:
   - export CXX=${COMPILER}
   - cd ${TRAVIS_BUILD_DIR}
   # Regenerate single header file, so it is tested in the examples...
-  - python scripts/generateSingleHeader.py
+  - python tools/scripts/generateSingleHeader.py
 
   - |
     if [[ ${CPP17} -eq 1 ]]; then
diff --git a/docs/contributing.md b/docs/contributing.md
index 5429bf9d..2bfd2a92 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -35,7 +35,7 @@ While these files are not essential to compilation they help to keep the impleme
 At time of writing this set is not complete but has reasonable coverage.
 If you add additional headers please try to remember to add a surrogate cpp for it.
 
-The other directories are `scripts` which contains a set of python scripts to help in testing Catch as well as
+The other directories are `tools/scripts` which contains a set of python scripts to help in testing Catch as well as
 generating the single include, and `docs`, which contains the documentation as a set of markdown files.
 
 __When submitting a pull request please do not include changes to the single include, or to the version number file
diff --git a/docs/release-process.md b/docs/release-process.md
index ca48da03..1b39b1f2 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -1,7 +1,7 @@
 <a id="top"></a>
 # How to release
 
-When enough changes have accumulated, it is time to release new version of Catch. This document describes the process in doing so, that no steps are forgotten. Note that all referenced scripts can be found in the `scripts/` directory.
+When enough changes have accumulated, it is time to release new version of Catch. This document describes the process in doing so, that no steps are forgotten. Note that all referenced scripts can be found in the `tools/scripts/` directory.
 
 ## Necessary steps
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9708fb0d..f65f5100 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -213,7 +213,7 @@ add_test(NAME FilteredSection-2 COMMAND $<TARGET_FILE:SelfTest> \#1394\ nested -
 set_tests_properties(FilteredSection-2 PROPERTIES FAIL_REGULAR_EXPRESSION "No tests ran")
 
 # AppVeyor has a Python 2.7 in path, but doesn't have .py files as autorunnable
-add_test(NAME ApprovalTests COMMAND ${PYTHON_EXECUTABLE} ${CATCH_DIR}/scripts/approvalTests.py $<TARGET_FILE:SelfTest>)
+add_test(NAME ApprovalTests COMMAND ${PYTHON_EXECUTABLE} ${CATCH_DIR}/tools/scripts/approvalTests.py $<TARGET_FILE:SelfTest>)
 set_tests_properties(ApprovalTests PROPERTIES FAIL_REGULAR_EXPRESSION "Results differed")
 
 add_test(NAME RegressionCheck-1670 COMMAND $<TARGET_FILE:SelfTest> "#1670 regression check" -c A -r compact)
diff --git a/scripts/approvalTests.py b/tools/scripts/approvalTests.py
similarity index 100%
rename from scripts/approvalTests.py
rename to tools/scripts/approvalTests.py
diff --git a/scripts/approve.py b/tools/scripts/approve.py
similarity index 100%
rename from scripts/approve.py
rename to tools/scripts/approve.py
diff --git a/scripts/benchmarkCompile.py b/tools/scripts/benchmarkCompile.py
similarity index 100%
rename from scripts/benchmarkCompile.py
rename to tools/scripts/benchmarkCompile.py
diff --git a/scripts/benchmarkRunner.py b/tools/scripts/benchmarkRunner.py
similarity index 100%
rename from scripts/benchmarkRunner.py
rename to tools/scripts/benchmarkRunner.py
diff --git a/scripts/developBuild.py b/tools/scripts/developBuild.py
similarity index 100%
rename from scripts/developBuild.py
rename to tools/scripts/developBuild.py
diff --git a/scripts/embed.py b/tools/scripts/embed.py
similarity index 100%
rename from scripts/embed.py
rename to tools/scripts/embed.py
diff --git a/scripts/embedClara.py b/tools/scripts/embedClara.py
similarity index 100%
rename from scripts/embedClara.py
rename to tools/scripts/embedClara.py
diff --git a/scripts/extractFeaturesFromReleaseNotes.py b/tools/scripts/extractFeaturesFromReleaseNotes.py
similarity index 100%
rename from scripts/extractFeaturesFromReleaseNotes.py
rename to tools/scripts/extractFeaturesFromReleaseNotes.py
diff --git a/scripts/fixWhitespace.py b/tools/scripts/fixWhitespace.py
similarity index 100%
rename from scripts/fixWhitespace.py
rename to tools/scripts/fixWhitespace.py
diff --git a/scripts/generateSingleHeader.py b/tools/scripts/generateSingleHeader.py
similarity index 100%
rename from scripts/generateSingleHeader.py
rename to tools/scripts/generateSingleHeader.py
diff --git a/scripts/majorRelease.py b/tools/scripts/majorRelease.py
similarity index 100%
rename from scripts/majorRelease.py
rename to tools/scripts/majorRelease.py
diff --git a/scripts/minorRelease.py b/tools/scripts/minorRelease.py
similarity index 100%
rename from scripts/minorRelease.py
rename to tools/scripts/minorRelease.py
diff --git a/scripts/patchRelease.py b/tools/scripts/patchRelease.py
similarity index 100%
rename from scripts/patchRelease.py
rename to tools/scripts/patchRelease.py
diff --git a/scripts/releaseCommon.py b/tools/scripts/releaseCommon.py
similarity index 100%
rename from scripts/releaseCommon.py
rename to tools/scripts/releaseCommon.py
diff --git a/scripts/releaseNotes.py b/tools/scripts/releaseNotes.py
similarity index 100%
rename from scripts/releaseNotes.py
rename to tools/scripts/releaseNotes.py
diff --git a/scripts/scriptCommon.py b/tools/scripts/scriptCommon.py
similarity index 88%
rename from scripts/scriptCommon.py
rename to tools/scripts/scriptCommon.py
index eadf9ff3..a6930063 100644
--- a/scripts/scriptCommon.py
+++ b/tools/scripts/scriptCommon.py
@@ -3,7 +3,7 @@ import sys
 import subprocess
 
 
-catchPath = os.path.dirname(os.path.realpath( os.path.dirname(sys.argv[0])))
+catchPath = os.path.dirname(os.path.dirname(os.path.realpath( os.path.dirname(sys.argv[0]))))
 
 def getBuildExecutable():
     if os.name == 'nt':
diff --git a/scripts/updateDocumentToC.py b/tools/scripts/updateDocumentToC.py
similarity index 100%
rename from scripts/updateDocumentToC.py
rename to tools/scripts/updateDocumentToC.py
diff --git a/scripts/updateWandbox.py b/tools/scripts/updateWandbox.py
similarity index 100%
rename from scripts/updateWandbox.py
rename to tools/scripts/updateWandbox.py