diff --git a/portable/GNUmakefile b/extras/portable/GNUmakefile
similarity index 100%
rename from portable/GNUmakefile
rename to extras/portable/GNUmakefile
diff --git a/portable/README.md b/extras/portable/README.md
similarity index 100%
rename from portable/README.md
rename to extras/portable/README.md
diff --git a/portable/test/bats/bin/bats b/extras/portable/test/bats/bin/bats
similarity index 100%
rename from portable/test/bats/bin/bats
rename to extras/portable/test/bats/bin/bats
diff --git a/portable/test/bats/lib/bats-core/common.bash b/extras/portable/test/bats/lib/bats-core/common.bash
similarity index 100%
rename from portable/test/bats/lib/bats-core/common.bash
rename to extras/portable/test/bats/lib/bats-core/common.bash
diff --git a/portable/test/bats/lib/bats-core/formatter.bash b/extras/portable/test/bats/lib/bats-core/formatter.bash
similarity index 100%
rename from portable/test/bats/lib/bats-core/formatter.bash
rename to extras/portable/test/bats/lib/bats-core/formatter.bash
diff --git a/portable/test/bats/lib/bats-core/preprocessing.bash b/extras/portable/test/bats/lib/bats-core/preprocessing.bash
similarity index 100%
rename from portable/test/bats/lib/bats-core/preprocessing.bash
rename to extras/portable/test/bats/lib/bats-core/preprocessing.bash
diff --git a/portable/test/bats/lib/bats-core/semaphore.bash b/extras/portable/test/bats/lib/bats-core/semaphore.bash
similarity index 100%
rename from portable/test/bats/lib/bats-core/semaphore.bash
rename to extras/portable/test/bats/lib/bats-core/semaphore.bash
diff --git a/portable/test/bats/lib/bats-core/test_functions.bash b/extras/portable/test/bats/lib/bats-core/test_functions.bash
similarity index 100%
rename from portable/test/bats/lib/bats-core/test_functions.bash
rename to extras/portable/test/bats/lib/bats-core/test_functions.bash
diff --git a/portable/test/bats/lib/bats-core/tracing.bash b/extras/portable/test/bats/lib/bats-core/tracing.bash
similarity index 100%
rename from portable/test/bats/lib/bats-core/tracing.bash
rename to extras/portable/test/bats/lib/bats-core/tracing.bash
diff --git a/portable/test/bats/lib/bats-core/validator.bash b/extras/portable/test/bats/lib/bats-core/validator.bash
similarity index 100%
rename from portable/test/bats/lib/bats-core/validator.bash
rename to extras/portable/test/bats/lib/bats-core/validator.bash
diff --git a/portable/test/bats/lib/bats-core/warnings.bash b/extras/portable/test/bats/lib/bats-core/warnings.bash
similarity index 100%
rename from portable/test/bats/lib/bats-core/warnings.bash
rename to extras/portable/test/bats/lib/bats-core/warnings.bash
diff --git a/portable/test/bats/libexec/bats-core/bats b/extras/portable/test/bats/libexec/bats-core/bats
similarity index 100%
rename from portable/test/bats/libexec/bats-core/bats
rename to extras/portable/test/bats/libexec/bats-core/bats
diff --git a/portable/test/bats/libexec/bats-core/bats-exec-file b/extras/portable/test/bats/libexec/bats-core/bats-exec-file
similarity index 100%
rename from portable/test/bats/libexec/bats-core/bats-exec-file
rename to extras/portable/test/bats/libexec/bats-core/bats-exec-file
diff --git a/portable/test/bats/libexec/bats-core/bats-exec-suite b/extras/portable/test/bats/libexec/bats-core/bats-exec-suite
similarity index 100%
rename from portable/test/bats/libexec/bats-core/bats-exec-suite
rename to extras/portable/test/bats/libexec/bats-core/bats-exec-suite
diff --git a/portable/test/bats/libexec/bats-core/bats-exec-test b/extras/portable/test/bats/libexec/bats-core/bats-exec-test
similarity index 100%
rename from portable/test/bats/libexec/bats-core/bats-exec-test
rename to extras/portable/test/bats/libexec/bats-core/bats-exec-test
diff --git a/portable/test/bats/libexec/bats-core/bats-format-cat b/extras/portable/test/bats/libexec/bats-core/bats-format-cat
similarity index 100%
rename from portable/test/bats/libexec/bats-core/bats-format-cat
rename to extras/portable/test/bats/libexec/bats-core/bats-format-cat
diff --git a/portable/test/bats/libexec/bats-core/bats-format-junit b/extras/portable/test/bats/libexec/bats-core/bats-format-junit
similarity index 100%
rename from portable/test/bats/libexec/bats-core/bats-format-junit
rename to extras/portable/test/bats/libexec/bats-core/bats-format-junit
diff --git a/portable/test/bats/libexec/bats-core/bats-format-pretty b/extras/portable/test/bats/libexec/bats-core/bats-format-pretty
similarity index 100%
rename from portable/test/bats/libexec/bats-core/bats-format-pretty
rename to extras/portable/test/bats/libexec/bats-core/bats-format-pretty
diff --git a/portable/test/bats/libexec/bats-core/bats-format-tap b/extras/portable/test/bats/libexec/bats-core/bats-format-tap
similarity index 100%
rename from portable/test/bats/libexec/bats-core/bats-format-tap
rename to extras/portable/test/bats/libexec/bats-core/bats-format-tap
diff --git a/portable/test/bats/libexec/bats-core/bats-format-tap13 b/extras/portable/test/bats/libexec/bats-core/bats-format-tap13
similarity index 100%
rename from portable/test/bats/libexec/bats-core/bats-format-tap13
rename to extras/portable/test/bats/libexec/bats-core/bats-format-tap13
diff --git a/portable/test/bats/libexec/bats-core/bats-preprocess b/extras/portable/test/bats/libexec/bats-core/bats-preprocess
similarity index 100%
rename from portable/test/bats/libexec/bats-core/bats-preprocess
rename to extras/portable/test/bats/libexec/bats-core/bats-preprocess
diff --git a/portable/test/bats_setup b/extras/portable/test/bats_setup
similarity index 100%
rename from portable/test/bats_setup
rename to extras/portable/test/bats_setup
diff --git a/portable/test/check-random-data.bats b/extras/portable/test/check-random-data.bats
similarity index 100%
rename from portable/test/check-random-data.bats
rename to extras/portable/test/check-random-data.bats
diff --git a/portable/test/create-fillrandom.bats b/extras/portable/test/create-fillrandom.bats
similarity index 100%
rename from portable/test/create-fillrandom.bats
rename to extras/portable/test/create-fillrandom.bats
diff --git a/portable/test/create_open_close.bats b/extras/portable/test/create_open_close.bats
similarity index 100%
rename from portable/test/create_open_close.bats
rename to extras/portable/test/create_open_close.bats
diff --git a/portable/test/test_helper/bats-assert/load.bash b/extras/portable/test/test_helper/bats-assert/load.bash
similarity index 100%
rename from portable/test/test_helper/bats-assert/load.bash
rename to extras/portable/test/test_helper/bats-assert/load.bash
diff --git a/portable/test/test_helper/bats-assert/src/assert.bash b/extras/portable/test/test_helper/bats-assert/src/assert.bash
similarity index 100%
rename from portable/test/test_helper/bats-assert/src/assert.bash
rename to extras/portable/test/test_helper/bats-assert/src/assert.bash
diff --git a/portable/test/test_helper/bats-assert/src/assert_equal.bash b/extras/portable/test/test_helper/bats-assert/src/assert_equal.bash
similarity index 100%
rename from portable/test/test_helper/bats-assert/src/assert_equal.bash
rename to extras/portable/test/test_helper/bats-assert/src/assert_equal.bash
diff --git a/portable/test/test_helper/bats-assert/src/assert_failure.bash b/extras/portable/test/test_helper/bats-assert/src/assert_failure.bash
similarity index 100%
rename from portable/test/test_helper/bats-assert/src/assert_failure.bash
rename to extras/portable/test/test_helper/bats-assert/src/assert_failure.bash
diff --git a/portable/test/test_helper/bats-assert/src/assert_line.bash b/extras/portable/test/test_helper/bats-assert/src/assert_line.bash
similarity index 100%
rename from portable/test/test_helper/bats-assert/src/assert_line.bash
rename to extras/portable/test/test_helper/bats-assert/src/assert_line.bash
diff --git a/portable/test/test_helper/bats-assert/src/assert_not_equal.bash b/extras/portable/test/test_helper/bats-assert/src/assert_not_equal.bash
similarity index 100%
rename from portable/test/test_helper/bats-assert/src/assert_not_equal.bash
rename to extras/portable/test/test_helper/bats-assert/src/assert_not_equal.bash
diff --git a/portable/test/test_helper/bats-assert/src/assert_output.bash b/extras/portable/test/test_helper/bats-assert/src/assert_output.bash
similarity index 100%
rename from portable/test/test_helper/bats-assert/src/assert_output.bash
rename to extras/portable/test/test_helper/bats-assert/src/assert_output.bash
diff --git a/portable/test/test_helper/bats-assert/src/assert_regex.bash b/extras/portable/test/test_helper/bats-assert/src/assert_regex.bash
similarity index 100%
rename from portable/test/test_helper/bats-assert/src/assert_regex.bash
rename to extras/portable/test/test_helper/bats-assert/src/assert_regex.bash
diff --git a/portable/test/test_helper/bats-assert/src/assert_success.bash b/extras/portable/test/test_helper/bats-assert/src/assert_success.bash
similarity index 100%
rename from portable/test/test_helper/bats-assert/src/assert_success.bash
rename to extras/portable/test/test_helper/bats-assert/src/assert_success.bash
diff --git a/portable/test/test_helper/bats-assert/src/refute.bash b/extras/portable/test/test_helper/bats-assert/src/refute.bash
similarity index 100%
rename from portable/test/test_helper/bats-assert/src/refute.bash
rename to extras/portable/test/test_helper/bats-assert/src/refute.bash
diff --git a/portable/test/test_helper/bats-assert/src/refute_line.bash b/extras/portable/test/test_helper/bats-assert/src/refute_line.bash
similarity index 100%
rename from portable/test/test_helper/bats-assert/src/refute_line.bash
rename to extras/portable/test/test_helper/bats-assert/src/refute_line.bash
diff --git a/portable/test/test_helper/bats-assert/src/refute_output.bash b/extras/portable/test/test_helper/bats-assert/src/refute_output.bash
similarity index 100%
rename from portable/test/test_helper/bats-assert/src/refute_output.bash
rename to extras/portable/test/test_helper/bats-assert/src/refute_output.bash
diff --git a/portable/test/test_helper/bats-assert/src/refute_regex.bash b/extras/portable/test/test_helper/bats-assert/src/refute_regex.bash
similarity index 100%
rename from portable/test/test_helper/bats-assert/src/refute_regex.bash
rename to extras/portable/test/test_helper/bats-assert/src/refute_regex.bash
diff --git a/portable/test/test_helper/bats-file/load.bash b/extras/portable/test/test_helper/bats-file/load.bash
similarity index 100%
rename from portable/test/test_helper/bats-file/load.bash
rename to extras/portable/test/test_helper/bats-file/load.bash
diff --git a/portable/test/test_helper/bats-file/src/file.bash b/extras/portable/test/test_helper/bats-file/src/file.bash
similarity index 100%
rename from portable/test/test_helper/bats-file/src/file.bash
rename to extras/portable/test/test_helper/bats-file/src/file.bash
diff --git a/portable/test/test_helper/bats-file/src/temp.bash b/extras/portable/test/test_helper/bats-file/src/temp.bash
similarity index 100%
rename from portable/test/test_helper/bats-file/src/temp.bash
rename to extras/portable/test/test_helper/bats-file/src/temp.bash
diff --git a/portable/test/test_helper/bats-support/load.bash b/extras/portable/test/test_helper/bats-support/load.bash
similarity index 100%
rename from portable/test/test_helper/bats-support/load.bash
rename to extras/portable/test/test_helper/bats-support/load.bash
diff --git a/portable/test/test_helper/bats-support/src/error.bash b/extras/portable/test/test_helper/bats-support/src/error.bash
similarity index 100%
rename from portable/test/test_helper/bats-support/src/error.bash
rename to extras/portable/test/test_helper/bats-support/src/error.bash
diff --git a/portable/test/test_helper/bats-support/src/lang.bash b/extras/portable/test/test_helper/bats-support/src/lang.bash
similarity index 100%
rename from portable/test/test_helper/bats-support/src/lang.bash
rename to extras/portable/test/test_helper/bats-support/src/lang.bash
diff --git a/portable/test/test_helper/bats-support/src/output.bash b/extras/portable/test/test_helper/bats-support/src/output.bash
similarity index 100%
rename from portable/test/test_helper/bats-support/src/output.bash
rename to extras/portable/test/test_helper/bats-support/src/output.bash
diff --git a/portable/tomb b/extras/portable/tomb
similarity index 100%
rename from portable/tomb
rename to extras/portable/tomb