diff --git a/.gitignore b/.gitignore
index 1071ea6b..caac5363 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
 /sftp-config.json
 .tags
 .tags_sorted_by_file
-/fuzzing/*_fuzzer
-/fuzzing/*_fuzzer.options
-/fuzzing/*_fuzzer_seed_corpus.zip
+/extras/fuzzing/*_fuzzer
+/extras/fuzzing/*_fuzzer.options
+/extras/fuzzing/*_fuzzer_seed_corpus.zip
 .vs/
diff --git a/.travis.yml b/.travis.yml
index f9fbb1ac..af737c64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -127,6 +127,6 @@ matrix:
 cache:
   directories:
     - "~/.platformio"
-    - "fuzzing/json_corpus"
-    - "fuzzing/msgpack_corpus"
-script: scripts/travis/$SCRIPT.sh
+    - "extras/fuzzing/json_corpus"
+    - "extras/fuzzing/msgpack_corpus"
+script: extras/ci/$SCRIPT.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e026cc13..aebebbc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ HEAD
 
 * Use absolute instead of relative includes (issue #1072)
 * Changed `JsonVariant::as<bool>()` to return `true` for any non-null value (issue #1005)
+* Moved ancillary files to `extras/` (issue #1011)
 
 v6.11.5 (2019-08-23)
 -------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ef4459f..e9802192 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,5 @@ if(${COVERAGE})
 endif()
 
 include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
-add_subdirectory(third-party/catch)
-add_subdirectory(test)
-add_subdirectory(fuzzing)
+add_subdirectory(extras/tests)
+add_subdirectory(extras/fuzzing)
diff --git a/scripts/travis/arduino.sh b/extras/ci/arduino.sh
similarity index 100%
rename from scripts/travis/arduino.sh
rename to extras/ci/arduino.sh
diff --git a/scripts/travis/build.sh b/extras/ci/build.sh
similarity index 100%
rename from scripts/travis/build.sh
rename to extras/ci/build.sh
diff --git a/scripts/travis/coverage.sh b/extras/ci/coverage.sh
similarity index 65%
rename from scripts/travis/coverage.sh
rename to extras/ci/coverage.sh
index f90c0fb7..3e155b92 100755
--- a/scripts/travis/coverage.sh
+++ b/extras/ci/coverage.sh
@@ -5,4 +5,5 @@ make
 make test
 
 pip install --user cpp-coveralls 'requests[security]'
-coveralls --exclude third-party --gcov-options '\-lp'; fi
+pwd
+coveralls --include 'src' --gcov-options '\-lp'
diff --git a/scripts/travis/fuzz.sh b/extras/ci/fuzz.sh
similarity index 95%
rename from scripts/travis/fuzz.sh
rename to extras/ci/fuzz.sh
index 1d4e32d9..ba3385e9 100755
--- a/scripts/travis/fuzz.sh
+++ b/extras/ci/fuzz.sh
@@ -2,7 +2,7 @@
 
 ROOT_DIR=$(dirname $0)/../../
 INCLUDE_DIR=${ROOT_DIR}/src/
-FUZZING_DIR=${ROOT_DIR}/fuzzing/
+FUZZING_DIR=${ROOT_DIR}/extras/fuzzing/
 CXXFLAGS="-g -fprofile-instr-generate -fcoverage-mapping -fsanitize=address,undefined,fuzzer -fno-sanitize-recover=all"
 
 fuzz() {
diff --git a/scripts/travis/platformio.sh b/extras/ci/platformio.sh
similarity index 96%
rename from scripts/travis/platformio.sh
rename to extras/ci/platformio.sh
index 51826252..905e1bb1 100755
--- a/scripts/travis/platformio.sh
+++ b/extras/ci/platformio.sh
@@ -2,8 +2,6 @@
 
 pip install --user platformio
 
-rm -r test
-
 case $BOARD in
 uno)
   platformio lib install 868 # SD library
diff --git a/scripts/travis/test.sh b/extras/ci/test.sh
similarity index 100%
rename from scripts/travis/test.sh
rename to extras/ci/test.sh
diff --git a/fuzzing/CMakeLists.txt b/extras/fuzzing/CMakeLists.txt
similarity index 100%
rename from fuzzing/CMakeLists.txt
rename to extras/fuzzing/CMakeLists.txt
diff --git a/fuzzing/Makefile b/extras/fuzzing/Makefile
similarity index 100%
rename from fuzzing/Makefile
rename to extras/fuzzing/Makefile
diff --git a/fuzzing/fuzzer_main.cpp b/extras/fuzzing/fuzzer_main.cpp
similarity index 100%
rename from fuzzing/fuzzer_main.cpp
rename to extras/fuzzing/fuzzer_main.cpp
diff --git a/fuzzing/json_corpus/.gitignore b/extras/fuzzing/json_corpus/.gitignore
similarity index 100%
rename from fuzzing/json_corpus/.gitignore
rename to extras/fuzzing/json_corpus/.gitignore
diff --git a/fuzzing/json_fuzzer.cpp b/extras/fuzzing/json_fuzzer.cpp
similarity index 100%
rename from fuzzing/json_fuzzer.cpp
rename to extras/fuzzing/json_fuzzer.cpp
diff --git a/fuzzing/json_seed_corpus/Comments.json b/extras/fuzzing/json_seed_corpus/Comments.json
similarity index 100%
rename from fuzzing/json_seed_corpus/Comments.json
rename to extras/fuzzing/json_seed_corpus/Comments.json
diff --git a/fuzzing/json_seed_corpus/EmptyArray.json b/extras/fuzzing/json_seed_corpus/EmptyArray.json
similarity index 100%
rename from fuzzing/json_seed_corpus/EmptyArray.json
rename to extras/fuzzing/json_seed_corpus/EmptyArray.json
diff --git a/fuzzing/json_seed_corpus/EmptyObject.json b/extras/fuzzing/json_seed_corpus/EmptyObject.json
similarity index 100%
rename from fuzzing/json_seed_corpus/EmptyObject.json
rename to extras/fuzzing/json_seed_corpus/EmptyObject.json
diff --git a/fuzzing/json_seed_corpus/ExcessiveNesting.json b/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json
similarity index 100%
rename from fuzzing/json_seed_corpus/ExcessiveNesting.json
rename to extras/fuzzing/json_seed_corpus/ExcessiveNesting.json
diff --git a/fuzzing/json_seed_corpus/IntegerOverflow.json b/extras/fuzzing/json_seed_corpus/IntegerOverflow.json
similarity index 100%
rename from fuzzing/json_seed_corpus/IntegerOverflow.json
rename to extras/fuzzing/json_seed_corpus/IntegerOverflow.json
diff --git a/fuzzing/json_seed_corpus/Numbers.json b/extras/fuzzing/json_seed_corpus/Numbers.json
similarity index 100%
rename from fuzzing/json_seed_corpus/Numbers.json
rename to extras/fuzzing/json_seed_corpus/Numbers.json
diff --git a/fuzzing/json_seed_corpus/OpenWeatherMap.json b/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json
similarity index 100%
rename from fuzzing/json_seed_corpus/OpenWeatherMap.json
rename to extras/fuzzing/json_seed_corpus/OpenWeatherMap.json
diff --git a/fuzzing/json_seed_corpus/Strings.json b/extras/fuzzing/json_seed_corpus/Strings.json
similarity index 100%
rename from fuzzing/json_seed_corpus/Strings.json
rename to extras/fuzzing/json_seed_corpus/Strings.json
diff --git a/fuzzing/json_seed_corpus/WeatherUnderground.json b/extras/fuzzing/json_seed_corpus/WeatherUnderground.json
similarity index 100%
rename from fuzzing/json_seed_corpus/WeatherUnderground.json
rename to extras/fuzzing/json_seed_corpus/WeatherUnderground.json
diff --git a/fuzzing/msgpack_corpus/.gitignore b/extras/fuzzing/msgpack_corpus/.gitignore
similarity index 100%
rename from fuzzing/msgpack_corpus/.gitignore
rename to extras/fuzzing/msgpack_corpus/.gitignore
diff --git a/fuzzing/msgpack_fuzzer.cpp b/extras/fuzzing/msgpack_fuzzer.cpp
similarity index 100%
rename from fuzzing/msgpack_fuzzer.cpp
rename to extras/fuzzing/msgpack_fuzzer.cpp
diff --git a/fuzzing/msgpack_seed_corpus/array16 b/extras/fuzzing/msgpack_seed_corpus/array16
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/array16
rename to extras/fuzzing/msgpack_seed_corpus/array16
diff --git a/fuzzing/msgpack_seed_corpus/array32 b/extras/fuzzing/msgpack_seed_corpus/array32
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/array32
rename to extras/fuzzing/msgpack_seed_corpus/array32
diff --git a/fuzzing/msgpack_seed_corpus/false b/extras/fuzzing/msgpack_seed_corpus/false
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/false
rename to extras/fuzzing/msgpack_seed_corpus/false
diff --git a/fuzzing/msgpack_seed_corpus/fixarray b/extras/fuzzing/msgpack_seed_corpus/fixarray
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/fixarray
rename to extras/fuzzing/msgpack_seed_corpus/fixarray
diff --git a/fuzzing/msgpack_seed_corpus/fixint_negative b/extras/fuzzing/msgpack_seed_corpus/fixint_negative
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/fixint_negative
rename to extras/fuzzing/msgpack_seed_corpus/fixint_negative
diff --git a/fuzzing/msgpack_seed_corpus/fixint_positive b/extras/fuzzing/msgpack_seed_corpus/fixint_positive
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/fixint_positive
rename to extras/fuzzing/msgpack_seed_corpus/fixint_positive
diff --git a/fuzzing/msgpack_seed_corpus/fixmap b/extras/fuzzing/msgpack_seed_corpus/fixmap
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/fixmap
rename to extras/fuzzing/msgpack_seed_corpus/fixmap
diff --git a/fuzzing/msgpack_seed_corpus/fixstr b/extras/fuzzing/msgpack_seed_corpus/fixstr
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/fixstr
rename to extras/fuzzing/msgpack_seed_corpus/fixstr
diff --git a/fuzzing/msgpack_seed_corpus/float32 b/extras/fuzzing/msgpack_seed_corpus/float32
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/float32
rename to extras/fuzzing/msgpack_seed_corpus/float32
diff --git a/fuzzing/msgpack_seed_corpus/float64 b/extras/fuzzing/msgpack_seed_corpus/float64
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/float64
rename to extras/fuzzing/msgpack_seed_corpus/float64
diff --git a/fuzzing/msgpack_seed_corpus/int16 b/extras/fuzzing/msgpack_seed_corpus/int16
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/int16
rename to extras/fuzzing/msgpack_seed_corpus/int16
diff --git a/fuzzing/msgpack_seed_corpus/int32 b/extras/fuzzing/msgpack_seed_corpus/int32
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/int32
rename to extras/fuzzing/msgpack_seed_corpus/int32
diff --git a/fuzzing/msgpack_seed_corpus/int64 b/extras/fuzzing/msgpack_seed_corpus/int64
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/int64
rename to extras/fuzzing/msgpack_seed_corpus/int64
diff --git a/fuzzing/msgpack_seed_corpus/int8 b/extras/fuzzing/msgpack_seed_corpus/int8
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/int8
rename to extras/fuzzing/msgpack_seed_corpus/int8
diff --git a/fuzzing/msgpack_seed_corpus/map16 b/extras/fuzzing/msgpack_seed_corpus/map16
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/map16
rename to extras/fuzzing/msgpack_seed_corpus/map16
diff --git a/fuzzing/msgpack_seed_corpus/map32 b/extras/fuzzing/msgpack_seed_corpus/map32
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/map32
rename to extras/fuzzing/msgpack_seed_corpus/map32
diff --git a/fuzzing/msgpack_seed_corpus/nil b/extras/fuzzing/msgpack_seed_corpus/nil
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/nil
rename to extras/fuzzing/msgpack_seed_corpus/nil
diff --git a/fuzzing/msgpack_seed_corpus/str16 b/extras/fuzzing/msgpack_seed_corpus/str16
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/str16
rename to extras/fuzzing/msgpack_seed_corpus/str16
diff --git a/fuzzing/msgpack_seed_corpus/str32 b/extras/fuzzing/msgpack_seed_corpus/str32
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/str32
rename to extras/fuzzing/msgpack_seed_corpus/str32
diff --git a/fuzzing/msgpack_seed_corpus/str8 b/extras/fuzzing/msgpack_seed_corpus/str8
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/str8
rename to extras/fuzzing/msgpack_seed_corpus/str8
diff --git a/fuzzing/msgpack_seed_corpus/true b/extras/fuzzing/msgpack_seed_corpus/true
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/true
rename to extras/fuzzing/msgpack_seed_corpus/true
diff --git a/fuzzing/msgpack_seed_corpus/uint16 b/extras/fuzzing/msgpack_seed_corpus/uint16
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/uint16
rename to extras/fuzzing/msgpack_seed_corpus/uint16
diff --git a/fuzzing/msgpack_seed_corpus/uint32 b/extras/fuzzing/msgpack_seed_corpus/uint32
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/uint32
rename to extras/fuzzing/msgpack_seed_corpus/uint32
diff --git a/fuzzing/msgpack_seed_corpus/uint64 b/extras/fuzzing/msgpack_seed_corpus/uint64
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/uint64
rename to extras/fuzzing/msgpack_seed_corpus/uint64
diff --git a/fuzzing/msgpack_seed_corpus/uint8 b/extras/fuzzing/msgpack_seed_corpus/uint8
similarity index 100%
rename from fuzzing/msgpack_seed_corpus/uint8
rename to extras/fuzzing/msgpack_seed_corpus/uint8
diff --git a/scripts/build-arduino-package.sh b/extras/scripts/build-arduino-package.sh
similarity index 92%
rename from scripts/build-arduino-package.sh
rename to extras/scripts/build-arduino-package.sh
index 6976bcd3..f79abe0f 100755
--- a/scripts/build-arduino-package.sh
+++ b/extras/scripts/build-arduino-package.sh
@@ -3,7 +3,7 @@
 TAG=$(git describe)
 OUTPUT="ArduinoJson-$TAG.zip"
 
-cd $(dirname $0)/../..
+cd $(dirname $0)/../../..
 
 # remove existing file
 rm -f $OUTPUT
diff --git a/scripts/build-single-header.sh b/extras/scripts/build-single-header.sh
old mode 100644
new mode 100755
similarity index 97%
rename from scripts/build-single-header.sh
rename to extras/scripts/build-single-header.sh
index 89f3baa5..d043406a
--- a/scripts/build-single-header.sh
+++ b/extras/scripts/build-single-header.sh
@@ -7,7 +7,7 @@ RE_RELATIVE_INCLUDE='^#include[[:space:]]*"(.*)"'
 RE_ABSOLUTE_INCLUDE='^#include[[:space:]]*<(ArduinoJson/.*)>'
 RE_SYSTEM_INCLUDE='^#include[[:space:]]*<(.*)>'
 RE_EMPTY='^(#pragma[[:space:]]+once)?[[:space:]]*(//.*)?$'
-SRC_DIRECTORY="$(realpath "$(dirname $0)/../src")"
+SRC_DIRECTORY="$(realpath "$(dirname $0)/../../src")"
 
 
 declare -A INCLUDED
diff --git a/scripts/create-build-envs.sh b/extras/scripts/create-build-envs.sh
similarity index 95%
rename from scripts/create-build-envs.sh
rename to extras/scripts/create-build-envs.sh
index d5750a40..3efee2f9 100755
--- a/scripts/create-build-envs.sh
+++ b/extras/scripts/create-build-envs.sh
@@ -2,7 +2,7 @@
 
 export PATH="$PATH:/Applications/CMake.app/Contents/bin/"
 
-cd $(dirname $0)/..
+cd $(dirname $0)/../..
 ROOT=$(pwd)
 
 mkdir "build"
diff --git a/scripts/publish-particle-library.sh b/extras/scripts/publish-particle-library.sh
old mode 100644
new mode 100755
similarity index 92%
rename from scripts/publish-particle-library.sh
rename to extras/scripts/publish-particle-library.sh
index e37e7965..62c3140f
--- a/scripts/publish-particle-library.sh
+++ b/extras/scripts/publish-particle-library.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-SOURCE_DIR="$(dirname "$0")/.."
+SOURCE_DIR="$(dirname "$0")/../.."
 WORK_DIR=$(mktemp -d)
 trap 'rm -rf "$WORK_DIR"' EXIT
 
diff --git a/scripts/publish.sh b/extras/scripts/publish.sh
old mode 100644
new mode 100755
similarity index 98%
rename from scripts/publish.sh
rename to extras/scripts/publish.sh
index 2d2f0693..4d8392e9
--- a/scripts/publish.sh
+++ b/extras/scripts/publish.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-cd "$(dirname "$0")/.."
+cd "$(dirname "$0")/../.."
 
 VERSION="$1"
 DATE=$(date +%F)
diff --git a/scripts/wandbox/JsonGeneratorExample.cpp b/extras/scripts/wandbox/JsonGeneratorExample.cpp
similarity index 100%
rename from scripts/wandbox/JsonGeneratorExample.cpp
rename to extras/scripts/wandbox/JsonGeneratorExample.cpp
diff --git a/scripts/wandbox/JsonParserExample.cpp b/extras/scripts/wandbox/JsonParserExample.cpp
similarity index 100%
rename from scripts/wandbox/JsonParserExample.cpp
rename to extras/scripts/wandbox/JsonParserExample.cpp
diff --git a/scripts/wandbox/MsgPackParserExample.cpp b/extras/scripts/wandbox/MsgPackParserExample.cpp
similarity index 100%
rename from scripts/wandbox/MsgPackParserExample.cpp
rename to extras/scripts/wandbox/MsgPackParserExample.cpp
diff --git a/scripts/wandbox/publish.sh b/extras/scripts/wandbox/publish.sh
old mode 100644
new mode 100755
similarity index 100%
rename from scripts/wandbox/publish.sh
rename to extras/scripts/wandbox/publish.sh
diff --git a/test/CMakeLists.txt b/extras/tests/CMakeLists.txt
similarity index 98%
rename from test/CMakeLists.txt
rename to extras/tests/CMakeLists.txt
index ff374b6e..2d975584 100644
--- a/test/CMakeLists.txt
+++ b/extras/tests/CMakeLists.txt
@@ -2,6 +2,8 @@
 # Copyright Benoit Blanchon 2014-2019
 # MIT License
 
+add_subdirectory(catch)
+
 if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
 	add_compile_options(
 		-pedantic
diff --git a/test/ElementProxy/CMakeLists.txt b/extras/tests/ElementProxy/CMakeLists.txt
similarity index 100%
rename from test/ElementProxy/CMakeLists.txt
rename to extras/tests/ElementProxy/CMakeLists.txt
diff --git a/test/ElementProxy/add.cpp b/extras/tests/ElementProxy/add.cpp
similarity index 100%
rename from test/ElementProxy/add.cpp
rename to extras/tests/ElementProxy/add.cpp
diff --git a/test/ElementProxy/clear.cpp b/extras/tests/ElementProxy/clear.cpp
similarity index 100%
rename from test/ElementProxy/clear.cpp
rename to extras/tests/ElementProxy/clear.cpp
diff --git a/test/ElementProxy/compare.cpp b/extras/tests/ElementProxy/compare.cpp
similarity index 100%
rename from test/ElementProxy/compare.cpp
rename to extras/tests/ElementProxy/compare.cpp
diff --git a/test/ElementProxy/remove.cpp b/extras/tests/ElementProxy/remove.cpp
similarity index 100%
rename from test/ElementProxy/remove.cpp
rename to extras/tests/ElementProxy/remove.cpp
diff --git a/test/ElementProxy/set.cpp b/extras/tests/ElementProxy/set.cpp
similarity index 100%
rename from test/ElementProxy/set.cpp
rename to extras/tests/ElementProxy/set.cpp
diff --git a/test/ElementProxy/size.cpp b/extras/tests/ElementProxy/size.cpp
similarity index 100%
rename from test/ElementProxy/size.cpp
rename to extras/tests/ElementProxy/size.cpp
diff --git a/test/IntegrationTests/CMakeLists.txt b/extras/tests/IntegrationTests/CMakeLists.txt
similarity index 100%
rename from test/IntegrationTests/CMakeLists.txt
rename to extras/tests/IntegrationTests/CMakeLists.txt
diff --git a/test/IntegrationTests/gbathree.cpp b/extras/tests/IntegrationTests/gbathree.cpp
similarity index 100%
rename from test/IntegrationTests/gbathree.cpp
rename to extras/tests/IntegrationTests/gbathree.cpp
diff --git a/test/IntegrationTests/issue772.cpp b/extras/tests/IntegrationTests/issue772.cpp
similarity index 100%
rename from test/IntegrationTests/issue772.cpp
rename to extras/tests/IntegrationTests/issue772.cpp
diff --git a/test/IntegrationTests/round_trip.cpp b/extras/tests/IntegrationTests/round_trip.cpp
similarity index 100%
rename from test/IntegrationTests/round_trip.cpp
rename to extras/tests/IntegrationTests/round_trip.cpp
diff --git a/test/JsonArray/CMakeLists.txt b/extras/tests/JsonArray/CMakeLists.txt
similarity index 100%
rename from test/JsonArray/CMakeLists.txt
rename to extras/tests/JsonArray/CMakeLists.txt
diff --git a/test/JsonArray/add.cpp b/extras/tests/JsonArray/add.cpp
similarity index 100%
rename from test/JsonArray/add.cpp
rename to extras/tests/JsonArray/add.cpp
diff --git a/test/JsonArray/copyArray.cpp b/extras/tests/JsonArray/copyArray.cpp
similarity index 100%
rename from test/JsonArray/copyArray.cpp
rename to extras/tests/JsonArray/copyArray.cpp
diff --git a/test/JsonArray/createNested.cpp b/extras/tests/JsonArray/createNested.cpp
similarity index 100%
rename from test/JsonArray/createNested.cpp
rename to extras/tests/JsonArray/createNested.cpp
diff --git a/test/JsonArray/equals.cpp b/extras/tests/JsonArray/equals.cpp
similarity index 100%
rename from test/JsonArray/equals.cpp
rename to extras/tests/JsonArray/equals.cpp
diff --git a/test/JsonArray/get.cpp b/extras/tests/JsonArray/get.cpp
similarity index 100%
rename from test/JsonArray/get.cpp
rename to extras/tests/JsonArray/get.cpp
diff --git a/test/JsonArray/isNull.cpp b/extras/tests/JsonArray/isNull.cpp
similarity index 100%
rename from test/JsonArray/isNull.cpp
rename to extras/tests/JsonArray/isNull.cpp
diff --git a/test/JsonArray/iterator.cpp b/extras/tests/JsonArray/iterator.cpp
similarity index 100%
rename from test/JsonArray/iterator.cpp
rename to extras/tests/JsonArray/iterator.cpp
diff --git a/test/JsonArray/memoryUsage.cpp b/extras/tests/JsonArray/memoryUsage.cpp
similarity index 100%
rename from test/JsonArray/memoryUsage.cpp
rename to extras/tests/JsonArray/memoryUsage.cpp
diff --git a/test/JsonArray/nesting.cpp b/extras/tests/JsonArray/nesting.cpp
similarity index 100%
rename from test/JsonArray/nesting.cpp
rename to extras/tests/JsonArray/nesting.cpp
diff --git a/test/JsonArray/remove.cpp b/extras/tests/JsonArray/remove.cpp
similarity index 100%
rename from test/JsonArray/remove.cpp
rename to extras/tests/JsonArray/remove.cpp
diff --git a/test/JsonArray/size.cpp b/extras/tests/JsonArray/size.cpp
similarity index 100%
rename from test/JsonArray/size.cpp
rename to extras/tests/JsonArray/size.cpp
diff --git a/test/JsonArray/std_string.cpp b/extras/tests/JsonArray/std_string.cpp
similarity index 100%
rename from test/JsonArray/std_string.cpp
rename to extras/tests/JsonArray/std_string.cpp
diff --git a/test/JsonArray/subscript.cpp b/extras/tests/JsonArray/subscript.cpp
similarity index 100%
rename from test/JsonArray/subscript.cpp
rename to extras/tests/JsonArray/subscript.cpp
diff --git a/test/JsonArray/undefined.cpp b/extras/tests/JsonArray/undefined.cpp
similarity index 100%
rename from test/JsonArray/undefined.cpp
rename to extras/tests/JsonArray/undefined.cpp
diff --git a/test/JsonDeserializer/CMakeLists.txt b/extras/tests/JsonDeserializer/CMakeLists.txt
similarity index 100%
rename from test/JsonDeserializer/CMakeLists.txt
rename to extras/tests/JsonDeserializer/CMakeLists.txt
diff --git a/test/JsonDeserializer/DeserializationError.cpp b/extras/tests/JsonDeserializer/DeserializationError.cpp
similarity index 100%
rename from test/JsonDeserializer/DeserializationError.cpp
rename to extras/tests/JsonDeserializer/DeserializationError.cpp
diff --git a/test/JsonDeserializer/array.cpp b/extras/tests/JsonDeserializer/array.cpp
similarity index 100%
rename from test/JsonDeserializer/array.cpp
rename to extras/tests/JsonDeserializer/array.cpp
diff --git a/test/JsonDeserializer/array_static.cpp b/extras/tests/JsonDeserializer/array_static.cpp
similarity index 100%
rename from test/JsonDeserializer/array_static.cpp
rename to extras/tests/JsonDeserializer/array_static.cpp
diff --git a/test/JsonDeserializer/incomplete_input.cpp b/extras/tests/JsonDeserializer/incomplete_input.cpp
similarity index 100%
rename from test/JsonDeserializer/incomplete_input.cpp
rename to extras/tests/JsonDeserializer/incomplete_input.cpp
diff --git a/test/JsonDeserializer/input_types.cpp b/extras/tests/JsonDeserializer/input_types.cpp
similarity index 100%
rename from test/JsonDeserializer/input_types.cpp
rename to extras/tests/JsonDeserializer/input_types.cpp
diff --git a/test/JsonDeserializer/invalid_input.cpp b/extras/tests/JsonDeserializer/invalid_input.cpp
similarity index 100%
rename from test/JsonDeserializer/invalid_input.cpp
rename to extras/tests/JsonDeserializer/invalid_input.cpp
diff --git a/test/JsonDeserializer/misc.cpp b/extras/tests/JsonDeserializer/misc.cpp
similarity index 100%
rename from test/JsonDeserializer/misc.cpp
rename to extras/tests/JsonDeserializer/misc.cpp
diff --git a/test/JsonDeserializer/nestingLimit.cpp b/extras/tests/JsonDeserializer/nestingLimit.cpp
similarity index 100%
rename from test/JsonDeserializer/nestingLimit.cpp
rename to extras/tests/JsonDeserializer/nestingLimit.cpp
diff --git a/test/JsonDeserializer/number.cpp b/extras/tests/JsonDeserializer/number.cpp
similarity index 100%
rename from test/JsonDeserializer/number.cpp
rename to extras/tests/JsonDeserializer/number.cpp
diff --git a/test/JsonDeserializer/object.cpp b/extras/tests/JsonDeserializer/object.cpp
similarity index 100%
rename from test/JsonDeserializer/object.cpp
rename to extras/tests/JsonDeserializer/object.cpp
diff --git a/test/JsonDeserializer/object_static.cpp b/extras/tests/JsonDeserializer/object_static.cpp
similarity index 100%
rename from test/JsonDeserializer/object_static.cpp
rename to extras/tests/JsonDeserializer/object_static.cpp
diff --git a/test/JsonDeserializer/string.cpp b/extras/tests/JsonDeserializer/string.cpp
similarity index 100%
rename from test/JsonDeserializer/string.cpp
rename to extras/tests/JsonDeserializer/string.cpp
diff --git a/test/JsonDocument/BasicJsonDocument.cpp b/extras/tests/JsonDocument/BasicJsonDocument.cpp
similarity index 100%
rename from test/JsonDocument/BasicJsonDocument.cpp
rename to extras/tests/JsonDocument/BasicJsonDocument.cpp
diff --git a/test/JsonDocument/CMakeLists.txt b/extras/tests/JsonDocument/CMakeLists.txt
similarity index 100%
rename from test/JsonDocument/CMakeLists.txt
rename to extras/tests/JsonDocument/CMakeLists.txt
diff --git a/test/JsonDocument/DynamicJsonDocument.cpp b/extras/tests/JsonDocument/DynamicJsonDocument.cpp
similarity index 100%
rename from test/JsonDocument/DynamicJsonDocument.cpp
rename to extras/tests/JsonDocument/DynamicJsonDocument.cpp
diff --git a/test/JsonDocument/StaticJsonDocument.cpp b/extras/tests/JsonDocument/StaticJsonDocument.cpp
similarity index 100%
rename from test/JsonDocument/StaticJsonDocument.cpp
rename to extras/tests/JsonDocument/StaticJsonDocument.cpp
diff --git a/test/JsonDocument/add.cpp b/extras/tests/JsonDocument/add.cpp
similarity index 100%
rename from test/JsonDocument/add.cpp
rename to extras/tests/JsonDocument/add.cpp
diff --git a/test/JsonDocument/compare.cpp b/extras/tests/JsonDocument/compare.cpp
similarity index 100%
rename from test/JsonDocument/compare.cpp
rename to extras/tests/JsonDocument/compare.cpp
diff --git a/test/JsonDocument/containsKey.cpp b/extras/tests/JsonDocument/containsKey.cpp
similarity index 100%
rename from test/JsonDocument/containsKey.cpp
rename to extras/tests/JsonDocument/containsKey.cpp
diff --git a/test/JsonDocument/createNested.cpp b/extras/tests/JsonDocument/createNested.cpp
similarity index 100%
rename from test/JsonDocument/createNested.cpp
rename to extras/tests/JsonDocument/createNested.cpp
diff --git a/test/JsonDocument/isNull.cpp b/extras/tests/JsonDocument/isNull.cpp
similarity index 100%
rename from test/JsonDocument/isNull.cpp
rename to extras/tests/JsonDocument/isNull.cpp
diff --git a/test/JsonDocument/nesting.cpp b/extras/tests/JsonDocument/nesting.cpp
similarity index 100%
rename from test/JsonDocument/nesting.cpp
rename to extras/tests/JsonDocument/nesting.cpp
diff --git a/test/JsonDocument/remove.cpp b/extras/tests/JsonDocument/remove.cpp
similarity index 100%
rename from test/JsonDocument/remove.cpp
rename to extras/tests/JsonDocument/remove.cpp
diff --git a/test/JsonDocument/size.cpp b/extras/tests/JsonDocument/size.cpp
similarity index 100%
rename from test/JsonDocument/size.cpp
rename to extras/tests/JsonDocument/size.cpp
diff --git a/test/JsonDocument/subscript.cpp b/extras/tests/JsonDocument/subscript.cpp
similarity index 100%
rename from test/JsonDocument/subscript.cpp
rename to extras/tests/JsonDocument/subscript.cpp
diff --git a/test/JsonObject/CMakeLists.txt b/extras/tests/JsonObject/CMakeLists.txt
similarity index 100%
rename from test/JsonObject/CMakeLists.txt
rename to extras/tests/JsonObject/CMakeLists.txt
diff --git a/test/JsonObject/containsKey.cpp b/extras/tests/JsonObject/containsKey.cpp
similarity index 100%
rename from test/JsonObject/containsKey.cpp
rename to extras/tests/JsonObject/containsKey.cpp
diff --git a/test/JsonObject/copy.cpp b/extras/tests/JsonObject/copy.cpp
similarity index 100%
rename from test/JsonObject/copy.cpp
rename to extras/tests/JsonObject/copy.cpp
diff --git a/test/JsonObject/createNestedArray.cpp b/extras/tests/JsonObject/createNestedArray.cpp
similarity index 100%
rename from test/JsonObject/createNestedArray.cpp
rename to extras/tests/JsonObject/createNestedArray.cpp
diff --git a/test/JsonObject/createNestedObject.cpp b/extras/tests/JsonObject/createNestedObject.cpp
similarity index 100%
rename from test/JsonObject/createNestedObject.cpp
rename to extras/tests/JsonObject/createNestedObject.cpp
diff --git a/test/JsonObject/equals.cpp b/extras/tests/JsonObject/equals.cpp
similarity index 100%
rename from test/JsonObject/equals.cpp
rename to extras/tests/JsonObject/equals.cpp
diff --git a/test/JsonObject/invalid.cpp b/extras/tests/JsonObject/invalid.cpp
similarity index 100%
rename from test/JsonObject/invalid.cpp
rename to extras/tests/JsonObject/invalid.cpp
diff --git a/test/JsonObject/isNull.cpp b/extras/tests/JsonObject/isNull.cpp
similarity index 100%
rename from test/JsonObject/isNull.cpp
rename to extras/tests/JsonObject/isNull.cpp
diff --git a/test/JsonObject/iterator.cpp b/extras/tests/JsonObject/iterator.cpp
similarity index 100%
rename from test/JsonObject/iterator.cpp
rename to extras/tests/JsonObject/iterator.cpp
diff --git a/test/JsonObject/memoryUsage.cpp b/extras/tests/JsonObject/memoryUsage.cpp
similarity index 100%
rename from test/JsonObject/memoryUsage.cpp
rename to extras/tests/JsonObject/memoryUsage.cpp
diff --git a/test/JsonObject/nesting.cpp b/extras/tests/JsonObject/nesting.cpp
similarity index 100%
rename from test/JsonObject/nesting.cpp
rename to extras/tests/JsonObject/nesting.cpp
diff --git a/test/JsonObject/remove.cpp b/extras/tests/JsonObject/remove.cpp
similarity index 100%
rename from test/JsonObject/remove.cpp
rename to extras/tests/JsonObject/remove.cpp
diff --git a/test/JsonObject/size.cpp b/extras/tests/JsonObject/size.cpp
similarity index 100%
rename from test/JsonObject/size.cpp
rename to extras/tests/JsonObject/size.cpp
diff --git a/test/JsonObject/std_string.cpp b/extras/tests/JsonObject/std_string.cpp
similarity index 100%
rename from test/JsonObject/std_string.cpp
rename to extras/tests/JsonObject/std_string.cpp
diff --git a/test/JsonObject/subscript.cpp b/extras/tests/JsonObject/subscript.cpp
similarity index 100%
rename from test/JsonObject/subscript.cpp
rename to extras/tests/JsonObject/subscript.cpp
diff --git a/test/JsonSerializer/CMakeLists.txt b/extras/tests/JsonSerializer/CMakeLists.txt
similarity index 100%
rename from test/JsonSerializer/CMakeLists.txt
rename to extras/tests/JsonSerializer/CMakeLists.txt
diff --git a/test/JsonSerializer/JsonArray.cpp b/extras/tests/JsonSerializer/JsonArray.cpp
similarity index 100%
rename from test/JsonSerializer/JsonArray.cpp
rename to extras/tests/JsonSerializer/JsonArray.cpp
diff --git a/test/JsonSerializer/JsonArrayPretty.cpp b/extras/tests/JsonSerializer/JsonArrayPretty.cpp
similarity index 100%
rename from test/JsonSerializer/JsonArrayPretty.cpp
rename to extras/tests/JsonSerializer/JsonArrayPretty.cpp
diff --git a/test/JsonSerializer/JsonObject.cpp b/extras/tests/JsonSerializer/JsonObject.cpp
similarity index 100%
rename from test/JsonSerializer/JsonObject.cpp
rename to extras/tests/JsonSerializer/JsonObject.cpp
diff --git a/test/JsonSerializer/JsonObjectPretty.cpp b/extras/tests/JsonSerializer/JsonObjectPretty.cpp
similarity index 100%
rename from test/JsonSerializer/JsonObjectPretty.cpp
rename to extras/tests/JsonSerializer/JsonObjectPretty.cpp
diff --git a/test/JsonSerializer/JsonVariant.cpp b/extras/tests/JsonSerializer/JsonVariant.cpp
similarity index 100%
rename from test/JsonSerializer/JsonVariant.cpp
rename to extras/tests/JsonSerializer/JsonVariant.cpp
diff --git a/test/JsonSerializer/misc.cpp b/extras/tests/JsonSerializer/misc.cpp
similarity index 100%
rename from test/JsonSerializer/misc.cpp
rename to extras/tests/JsonSerializer/misc.cpp
diff --git a/test/JsonSerializer/std_stream.cpp b/extras/tests/JsonSerializer/std_stream.cpp
similarity index 100%
rename from test/JsonSerializer/std_stream.cpp
rename to extras/tests/JsonSerializer/std_stream.cpp
diff --git a/test/JsonSerializer/std_string.cpp b/extras/tests/JsonSerializer/std_string.cpp
similarity index 100%
rename from test/JsonSerializer/std_string.cpp
rename to extras/tests/JsonSerializer/std_string.cpp
diff --git a/test/JsonVariant/CMakeLists.txt b/extras/tests/JsonVariant/CMakeLists.txt
similarity index 100%
rename from test/JsonVariant/CMakeLists.txt
rename to extras/tests/JsonVariant/CMakeLists.txt
diff --git a/test/JsonVariant/add.cpp b/extras/tests/JsonVariant/add.cpp
similarity index 100%
rename from test/JsonVariant/add.cpp
rename to extras/tests/JsonVariant/add.cpp
diff --git a/test/JsonVariant/as.cpp b/extras/tests/JsonVariant/as.cpp
similarity index 100%
rename from test/JsonVariant/as.cpp
rename to extras/tests/JsonVariant/as.cpp
diff --git a/test/JsonVariant/clear.cpp b/extras/tests/JsonVariant/clear.cpp
similarity index 100%
rename from test/JsonVariant/clear.cpp
rename to extras/tests/JsonVariant/clear.cpp
diff --git a/test/JsonVariant/compare.cpp b/extras/tests/JsonVariant/compare.cpp
similarity index 100%
rename from test/JsonVariant/compare.cpp
rename to extras/tests/JsonVariant/compare.cpp
diff --git a/test/JsonVariant/containsKey.cpp b/extras/tests/JsonVariant/containsKey.cpp
similarity index 100%
rename from test/JsonVariant/containsKey.cpp
rename to extras/tests/JsonVariant/containsKey.cpp
diff --git a/test/JsonVariant/copy.cpp b/extras/tests/JsonVariant/copy.cpp
similarity index 100%
rename from test/JsonVariant/copy.cpp
rename to extras/tests/JsonVariant/copy.cpp
diff --git a/test/JsonVariant/createNested.cpp b/extras/tests/JsonVariant/createNested.cpp
similarity index 100%
rename from test/JsonVariant/createNested.cpp
rename to extras/tests/JsonVariant/createNested.cpp
diff --git a/test/JsonVariant/is.cpp b/extras/tests/JsonVariant/is.cpp
similarity index 100%
rename from test/JsonVariant/is.cpp
rename to extras/tests/JsonVariant/is.cpp
diff --git a/test/JsonVariant/isnull.cpp b/extras/tests/JsonVariant/isnull.cpp
similarity index 100%
rename from test/JsonVariant/isnull.cpp
rename to extras/tests/JsonVariant/isnull.cpp
diff --git a/test/JsonVariant/memoryUsage.cpp b/extras/tests/JsonVariant/memoryUsage.cpp
similarity index 100%
rename from test/JsonVariant/memoryUsage.cpp
rename to extras/tests/JsonVariant/memoryUsage.cpp
diff --git a/test/JsonVariant/misc.cpp b/extras/tests/JsonVariant/misc.cpp
similarity index 100%
rename from test/JsonVariant/misc.cpp
rename to extras/tests/JsonVariant/misc.cpp
diff --git a/test/JsonVariant/nesting.cpp b/extras/tests/JsonVariant/nesting.cpp
similarity index 100%
rename from test/JsonVariant/nesting.cpp
rename to extras/tests/JsonVariant/nesting.cpp
diff --git a/test/JsonVariant/or.cpp b/extras/tests/JsonVariant/or.cpp
similarity index 100%
rename from test/JsonVariant/or.cpp
rename to extras/tests/JsonVariant/or.cpp
diff --git a/test/JsonVariant/overflow.cpp b/extras/tests/JsonVariant/overflow.cpp
similarity index 100%
rename from test/JsonVariant/overflow.cpp
rename to extras/tests/JsonVariant/overflow.cpp
diff --git a/test/JsonVariant/remove.cpp b/extras/tests/JsonVariant/remove.cpp
similarity index 100%
rename from test/JsonVariant/remove.cpp
rename to extras/tests/JsonVariant/remove.cpp
diff --git a/test/JsonVariant/set.cpp b/extras/tests/JsonVariant/set.cpp
similarity index 100%
rename from test/JsonVariant/set.cpp
rename to extras/tests/JsonVariant/set.cpp
diff --git a/test/JsonVariant/subscript.cpp b/extras/tests/JsonVariant/subscript.cpp
similarity index 100%
rename from test/JsonVariant/subscript.cpp
rename to extras/tests/JsonVariant/subscript.cpp
diff --git a/test/JsonVariant/types.cpp b/extras/tests/JsonVariant/types.cpp
similarity index 100%
rename from test/JsonVariant/types.cpp
rename to extras/tests/JsonVariant/types.cpp
diff --git a/test/JsonVariant/undefined.cpp b/extras/tests/JsonVariant/undefined.cpp
similarity index 100%
rename from test/JsonVariant/undefined.cpp
rename to extras/tests/JsonVariant/undefined.cpp
diff --git a/test/MemberProxy/CMakeLists.txt b/extras/tests/MemberProxy/CMakeLists.txt
similarity index 100%
rename from test/MemberProxy/CMakeLists.txt
rename to extras/tests/MemberProxy/CMakeLists.txt
diff --git a/test/MemberProxy/add.cpp b/extras/tests/MemberProxy/add.cpp
similarity index 100%
rename from test/MemberProxy/add.cpp
rename to extras/tests/MemberProxy/add.cpp
diff --git a/test/MemberProxy/clear.cpp b/extras/tests/MemberProxy/clear.cpp
similarity index 100%
rename from test/MemberProxy/clear.cpp
rename to extras/tests/MemberProxy/clear.cpp
diff --git a/test/MemberProxy/compare.cpp b/extras/tests/MemberProxy/compare.cpp
similarity index 100%
rename from test/MemberProxy/compare.cpp
rename to extras/tests/MemberProxy/compare.cpp
diff --git a/test/MemberProxy/containsKey.cpp b/extras/tests/MemberProxy/containsKey.cpp
similarity index 100%
rename from test/MemberProxy/containsKey.cpp
rename to extras/tests/MemberProxy/containsKey.cpp
diff --git a/test/MemberProxy/remove.cpp b/extras/tests/MemberProxy/remove.cpp
similarity index 100%
rename from test/MemberProxy/remove.cpp
rename to extras/tests/MemberProxy/remove.cpp
diff --git a/test/MemberProxy/set.cpp b/extras/tests/MemberProxy/set.cpp
similarity index 100%
rename from test/MemberProxy/set.cpp
rename to extras/tests/MemberProxy/set.cpp
diff --git a/test/MemberProxy/size.cpp b/extras/tests/MemberProxy/size.cpp
similarity index 100%
rename from test/MemberProxy/size.cpp
rename to extras/tests/MemberProxy/size.cpp
diff --git a/test/MemberProxy/subscript.cpp b/extras/tests/MemberProxy/subscript.cpp
similarity index 100%
rename from test/MemberProxy/subscript.cpp
rename to extras/tests/MemberProxy/subscript.cpp
diff --git a/test/MemoryPool/CMakeLists.txt b/extras/tests/MemoryPool/CMakeLists.txt
similarity index 100%
rename from test/MemoryPool/CMakeLists.txt
rename to extras/tests/MemoryPool/CMakeLists.txt
diff --git a/test/MemoryPool/StringBuilder.cpp b/extras/tests/MemoryPool/StringBuilder.cpp
similarity index 100%
rename from test/MemoryPool/StringBuilder.cpp
rename to extras/tests/MemoryPool/StringBuilder.cpp
diff --git a/test/MemoryPool/allocString.cpp b/extras/tests/MemoryPool/allocString.cpp
similarity index 100%
rename from test/MemoryPool/allocString.cpp
rename to extras/tests/MemoryPool/allocString.cpp
diff --git a/test/MemoryPool/allocVariant.cpp b/extras/tests/MemoryPool/allocVariant.cpp
similarity index 100%
rename from test/MemoryPool/allocVariant.cpp
rename to extras/tests/MemoryPool/allocVariant.cpp
diff --git a/test/MemoryPool/clear.cpp b/extras/tests/MemoryPool/clear.cpp
similarity index 100%
rename from test/MemoryPool/clear.cpp
rename to extras/tests/MemoryPool/clear.cpp
diff --git a/test/MemoryPool/size.cpp b/extras/tests/MemoryPool/size.cpp
similarity index 100%
rename from test/MemoryPool/size.cpp
rename to extras/tests/MemoryPool/size.cpp
diff --git a/test/Misc/CMakeLists.txt b/extras/tests/Misc/CMakeLists.txt
similarity index 100%
rename from test/Misc/CMakeLists.txt
rename to extras/tests/Misc/CMakeLists.txt
diff --git a/test/Misc/FloatParts.cpp b/extras/tests/Misc/FloatParts.cpp
similarity index 100%
rename from test/Misc/FloatParts.cpp
rename to extras/tests/Misc/FloatParts.cpp
diff --git a/test/Misc/Issue978.cpp b/extras/tests/Misc/Issue978.cpp
similarity index 100%
rename from test/Misc/Issue978.cpp
rename to extras/tests/Misc/Issue978.cpp
diff --git a/test/Misc/StreamReader.cpp b/extras/tests/Misc/StreamReader.cpp
similarity index 100%
rename from test/Misc/StreamReader.cpp
rename to extras/tests/Misc/StreamReader.cpp
diff --git a/test/Misc/StringAdapters.cpp b/extras/tests/Misc/StringAdapters.cpp
similarity index 100%
rename from test/Misc/StringAdapters.cpp
rename to extras/tests/Misc/StringAdapters.cpp
diff --git a/test/Misc/StringWriter.cpp b/extras/tests/Misc/StringWriter.cpp
similarity index 100%
rename from test/Misc/StringWriter.cpp
rename to extras/tests/Misc/StringWriter.cpp
diff --git a/test/Misc/TypeTraits.cpp b/extras/tests/Misc/TypeTraits.cpp
similarity index 100%
rename from test/Misc/TypeTraits.cpp
rename to extras/tests/Misc/TypeTraits.cpp
diff --git a/test/Misc/conflicts.cpp b/extras/tests/Misc/conflicts.cpp
similarity index 100%
rename from test/Misc/conflicts.cpp
rename to extras/tests/Misc/conflicts.cpp
diff --git a/test/Misc/custom_string.hpp b/extras/tests/Misc/custom_string.hpp
similarity index 100%
rename from test/Misc/custom_string.hpp
rename to extras/tests/Misc/custom_string.hpp
diff --git a/test/Misc/unsigned_char.cpp b/extras/tests/Misc/unsigned_char.cpp
similarity index 100%
rename from test/Misc/unsigned_char.cpp
rename to extras/tests/Misc/unsigned_char.cpp
diff --git a/test/Misc/version.cpp b/extras/tests/Misc/version.cpp
similarity index 100%
rename from test/Misc/version.cpp
rename to extras/tests/Misc/version.cpp
diff --git a/test/MixedConfiguration/CMakeLists.txt b/extras/tests/MixedConfiguration/CMakeLists.txt
similarity index 100%
rename from test/MixedConfiguration/CMakeLists.txt
rename to extras/tests/MixedConfiguration/CMakeLists.txt
diff --git a/test/MixedConfiguration/cpp11.cpp b/extras/tests/MixedConfiguration/cpp11.cpp
similarity index 100%
rename from test/MixedConfiguration/cpp11.cpp
rename to extras/tests/MixedConfiguration/cpp11.cpp
diff --git a/test/MixedConfiguration/decode_unicode_0.cpp b/extras/tests/MixedConfiguration/decode_unicode_0.cpp
similarity index 100%
rename from test/MixedConfiguration/decode_unicode_0.cpp
rename to extras/tests/MixedConfiguration/decode_unicode_0.cpp
diff --git a/test/MixedConfiguration/decode_unicode_1.cpp b/extras/tests/MixedConfiguration/decode_unicode_1.cpp
similarity index 100%
rename from test/MixedConfiguration/decode_unicode_1.cpp
rename to extras/tests/MixedConfiguration/decode_unicode_1.cpp
diff --git a/test/MixedConfiguration/enable_infinity_0.cpp b/extras/tests/MixedConfiguration/enable_infinity_0.cpp
similarity index 100%
rename from test/MixedConfiguration/enable_infinity_0.cpp
rename to extras/tests/MixedConfiguration/enable_infinity_0.cpp
diff --git a/test/MixedConfiguration/enable_infinity_1.cpp b/extras/tests/MixedConfiguration/enable_infinity_1.cpp
similarity index 100%
rename from test/MixedConfiguration/enable_infinity_1.cpp
rename to extras/tests/MixedConfiguration/enable_infinity_1.cpp
diff --git a/test/MixedConfiguration/enable_nan_0.cpp b/extras/tests/MixedConfiguration/enable_nan_0.cpp
similarity index 100%
rename from test/MixedConfiguration/enable_nan_0.cpp
rename to extras/tests/MixedConfiguration/enable_nan_0.cpp
diff --git a/test/MixedConfiguration/enable_nan_1.cpp b/extras/tests/MixedConfiguration/enable_nan_1.cpp
similarity index 100%
rename from test/MixedConfiguration/enable_nan_1.cpp
rename to extras/tests/MixedConfiguration/enable_nan_1.cpp
diff --git a/test/MixedConfiguration/enable_progmem_1.cpp b/extras/tests/MixedConfiguration/enable_progmem_1.cpp
similarity index 100%
rename from test/MixedConfiguration/enable_progmem_1.cpp
rename to extras/tests/MixedConfiguration/enable_progmem_1.cpp
diff --git a/test/MixedConfiguration/progmem_emulation.hpp b/extras/tests/MixedConfiguration/progmem_emulation.hpp
similarity index 100%
rename from test/MixedConfiguration/progmem_emulation.hpp
rename to extras/tests/MixedConfiguration/progmem_emulation.hpp
diff --git a/test/MixedConfiguration/use_double_0.cpp b/extras/tests/MixedConfiguration/use_double_0.cpp
similarity index 100%
rename from test/MixedConfiguration/use_double_0.cpp
rename to extras/tests/MixedConfiguration/use_double_0.cpp
diff --git a/test/MixedConfiguration/use_double_1.cpp b/extras/tests/MixedConfiguration/use_double_1.cpp
similarity index 100%
rename from test/MixedConfiguration/use_double_1.cpp
rename to extras/tests/MixedConfiguration/use_double_1.cpp
diff --git a/test/MixedConfiguration/use_long_long_0.cpp b/extras/tests/MixedConfiguration/use_long_long_0.cpp
similarity index 100%
rename from test/MixedConfiguration/use_long_long_0.cpp
rename to extras/tests/MixedConfiguration/use_long_long_0.cpp
diff --git a/test/MixedConfiguration/use_long_long_1.cpp b/extras/tests/MixedConfiguration/use_long_long_1.cpp
similarity index 100%
rename from test/MixedConfiguration/use_long_long_1.cpp
rename to extras/tests/MixedConfiguration/use_long_long_1.cpp
diff --git a/test/MsgPackDeserializer/CMakeLists.txt b/extras/tests/MsgPackDeserializer/CMakeLists.txt
similarity index 100%
rename from test/MsgPackDeserializer/CMakeLists.txt
rename to extras/tests/MsgPackDeserializer/CMakeLists.txt
diff --git a/test/MsgPackDeserializer/deserializeArray.cpp b/extras/tests/MsgPackDeserializer/deserializeArray.cpp
similarity index 100%
rename from test/MsgPackDeserializer/deserializeArray.cpp
rename to extras/tests/MsgPackDeserializer/deserializeArray.cpp
diff --git a/test/MsgPackDeserializer/deserializeObject.cpp b/extras/tests/MsgPackDeserializer/deserializeObject.cpp
similarity index 100%
rename from test/MsgPackDeserializer/deserializeObject.cpp
rename to extras/tests/MsgPackDeserializer/deserializeObject.cpp
diff --git a/test/MsgPackDeserializer/deserializeStaticVariant.cpp b/extras/tests/MsgPackDeserializer/deserializeStaticVariant.cpp
similarity index 100%
rename from test/MsgPackDeserializer/deserializeStaticVariant.cpp
rename to extras/tests/MsgPackDeserializer/deserializeStaticVariant.cpp
diff --git a/test/MsgPackDeserializer/deserializeVariant.cpp b/extras/tests/MsgPackDeserializer/deserializeVariant.cpp
similarity index 100%
rename from test/MsgPackDeserializer/deserializeVariant.cpp
rename to extras/tests/MsgPackDeserializer/deserializeVariant.cpp
diff --git a/test/MsgPackDeserializer/doubleToFloat.cpp b/extras/tests/MsgPackDeserializer/doubleToFloat.cpp
similarity index 100%
rename from test/MsgPackDeserializer/doubleToFloat.cpp
rename to extras/tests/MsgPackDeserializer/doubleToFloat.cpp
diff --git a/test/MsgPackDeserializer/incompleteInput.cpp b/extras/tests/MsgPackDeserializer/incompleteInput.cpp
similarity index 100%
rename from test/MsgPackDeserializer/incompleteInput.cpp
rename to extras/tests/MsgPackDeserializer/incompleteInput.cpp
diff --git a/test/MsgPackDeserializer/input_types.cpp b/extras/tests/MsgPackDeserializer/input_types.cpp
similarity index 100%
rename from test/MsgPackDeserializer/input_types.cpp
rename to extras/tests/MsgPackDeserializer/input_types.cpp
diff --git a/test/MsgPackDeserializer/nestingLimit.cpp b/extras/tests/MsgPackDeserializer/nestingLimit.cpp
similarity index 100%
rename from test/MsgPackDeserializer/nestingLimit.cpp
rename to extras/tests/MsgPackDeserializer/nestingLimit.cpp
diff --git a/test/MsgPackDeserializer/notSupported.cpp b/extras/tests/MsgPackDeserializer/notSupported.cpp
similarity index 100%
rename from test/MsgPackDeserializer/notSupported.cpp
rename to extras/tests/MsgPackDeserializer/notSupported.cpp
diff --git a/test/MsgPackSerializer/CMakeLists.txt b/extras/tests/MsgPackSerializer/CMakeLists.txt
similarity index 100%
rename from test/MsgPackSerializer/CMakeLists.txt
rename to extras/tests/MsgPackSerializer/CMakeLists.txt
diff --git a/test/MsgPackSerializer/destination_types.cpp b/extras/tests/MsgPackSerializer/destination_types.cpp
similarity index 100%
rename from test/MsgPackSerializer/destination_types.cpp
rename to extras/tests/MsgPackSerializer/destination_types.cpp
diff --git a/test/MsgPackSerializer/measure.cpp b/extras/tests/MsgPackSerializer/measure.cpp
similarity index 100%
rename from test/MsgPackSerializer/measure.cpp
rename to extras/tests/MsgPackSerializer/measure.cpp
diff --git a/test/MsgPackSerializer/misc.cpp b/extras/tests/MsgPackSerializer/misc.cpp
similarity index 100%
rename from test/MsgPackSerializer/misc.cpp
rename to extras/tests/MsgPackSerializer/misc.cpp
diff --git a/test/MsgPackSerializer/serializeArray.cpp b/extras/tests/MsgPackSerializer/serializeArray.cpp
similarity index 100%
rename from test/MsgPackSerializer/serializeArray.cpp
rename to extras/tests/MsgPackSerializer/serializeArray.cpp
diff --git a/test/MsgPackSerializer/serializeObject.cpp b/extras/tests/MsgPackSerializer/serializeObject.cpp
similarity index 100%
rename from test/MsgPackSerializer/serializeObject.cpp
rename to extras/tests/MsgPackSerializer/serializeObject.cpp
diff --git a/test/MsgPackSerializer/serializeVariant.cpp b/extras/tests/MsgPackSerializer/serializeVariant.cpp
similarity index 100%
rename from test/MsgPackSerializer/serializeVariant.cpp
rename to extras/tests/MsgPackSerializer/serializeVariant.cpp
diff --git a/test/Numbers/CMakeLists.txt b/extras/tests/Numbers/CMakeLists.txt
similarity index 100%
rename from test/Numbers/CMakeLists.txt
rename to extras/tests/Numbers/CMakeLists.txt
diff --git a/test/Numbers/parseFloat.cpp b/extras/tests/Numbers/parseFloat.cpp
similarity index 100%
rename from test/Numbers/parseFloat.cpp
rename to extras/tests/Numbers/parseFloat.cpp
diff --git a/test/Numbers/parseInteger.cpp b/extras/tests/Numbers/parseInteger.cpp
similarity index 100%
rename from test/Numbers/parseInteger.cpp
rename to extras/tests/Numbers/parseInteger.cpp
diff --git a/test/Numbers/parseNumber.cpp b/extras/tests/Numbers/parseNumber.cpp
similarity index 100%
rename from test/Numbers/parseNumber.cpp
rename to extras/tests/Numbers/parseNumber.cpp
diff --git a/test/TextFormatter/CMakeLists.txt b/extras/tests/TextFormatter/CMakeLists.txt
similarity index 100%
rename from test/TextFormatter/CMakeLists.txt
rename to extras/tests/TextFormatter/CMakeLists.txt
diff --git a/test/TextFormatter/writeFloat.cpp b/extras/tests/TextFormatter/writeFloat.cpp
similarity index 100%
rename from test/TextFormatter/writeFloat.cpp
rename to extras/tests/TextFormatter/writeFloat.cpp
diff --git a/test/TextFormatter/writeString.cpp b/extras/tests/TextFormatter/writeString.cpp
similarity index 100%
rename from test/TextFormatter/writeString.cpp
rename to extras/tests/TextFormatter/writeString.cpp
diff --git a/third-party/catch/CMakeLists.txt b/extras/tests/catch/CMakeLists.txt
similarity index 100%
rename from third-party/catch/CMakeLists.txt
rename to extras/tests/catch/CMakeLists.txt
diff --git a/third-party/catch/catch.cpp b/extras/tests/catch/catch.cpp
similarity index 100%
rename from third-party/catch/catch.cpp
rename to extras/tests/catch/catch.cpp
diff --git a/third-party/catch/catch.hpp b/extras/tests/catch/catch.hpp
similarity index 100%
rename from third-party/catch/catch.hpp
rename to extras/tests/catch/catch.hpp
diff --git a/scripts/oss-fuzz/.gitignore b/scripts/oss-fuzz/.gitignore
deleted file mode 100644
index d50ee772..00000000
--- a/scripts/oss-fuzz/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/.vagrant/
-*.log
diff --git a/scripts/oss-fuzz/Vagrantfile b/scripts/oss-fuzz/Vagrantfile
deleted file mode 100644
index 85d0733f..00000000
--- a/scripts/oss-fuzz/Vagrantfile
+++ /dev/null
@@ -1,34 +0,0 @@
-# A virtual machine to run https://github.com/google/oss-fuzz
-Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/xenial64"
-
-  config.vm.synced_folder "../..", "/host/ArduinoJson"
-  config.vm.synced_folder "E:\\Git\\oss-fuzz", "/host/oss-fuzz"
-
-  config.vm.network "forwarded_port", guest: 8001, host: 8001
-
-  config.vm.provider "virtualbox" do |v|
-    v.memory = 2048
-    v.cpus = 2
-  end
-
-  config.vm.provision "shell", privileged: false, inline: <<-SHELL
-    set -x
-
-    sudo apt-get update
-    sudo apt-get install -y make git docker.io zip
-    sudo groupadd docker
-    sudo usermod -aG docker $USER
-
-    git clone https://github.com/google/fuzzer-test-suite.git FTS
-    ./FTS/tutorial/install-deps.sh  # Get deps
-    ./FTS/tutorial/install-clang.sh # Get fresh clang binaries
-
-    echo "export PROJECT_NAME='arduinojson'" >> $HOME/.profile
-    echo "export CC='clang'" >> $HOME/.profile
-    echo "export CXX='clang++'" >> $HOME/.profile
-    echo "export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/" >> $HOME/.profile
-
-    echo "Run /host/ArduinoJson/fuzzing/fuzz.sh" | sudo tee /etc/motd
-  SHELL
-end