diff --git a/auxil/zeek-aux/testing/Baseline/update-changes.replace-version-in-c-header/header.h b/testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-c-header/header.h
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/update-changes.replace-version-in-c-header/header.h
rename to testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-c-header/header.h
diff --git a/auxil/zeek-aux/testing/Baseline/update-changes.replace-version-in-python-package/__init__.py b/testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-python-package/__init__.py
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/update-changes.replace-version-in-python-package/__init__.py
rename to testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-python-package/__init__.py
diff --git a/auxil/zeek-aux/testing/Baseline/update-changes.replace-version-in-rst/test.rst b/testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-rst/test.rst
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/update-changes.replace-version-in-rst/test.rst
rename to testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-rst/test.rst
diff --git a/auxil/zeek-aux/testing/Baseline/update-changes.replace-version-in-script/test.pl b/testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-script/test.pl
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/update-changes.replace-version-in-script/test.pl
rename to testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-script/test.pl
diff --git a/auxil/zeek-aux/testing/Baseline/update-changes.replace-version-in-setup-py/setup.py b/testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-setup-py/setup.py
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/update-changes.replace-version-in-setup-py/setup.py
rename to testing/btest/Baseline/zeek-aux.update-changes.replace-version-in-setup-py/setup.py
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/missing-fields-header b/testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/missing-fields-header
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/missing-fields-header
rename to testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/missing-fields-header
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/missing-sep-header b/testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/missing-sep-header
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/missing-sep-header
rename to testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/missing-sep-header
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/missing-separator b/testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/missing-separator
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/missing-separator
rename to testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/missing-separator
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/no-header-column b/testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/no-header-column
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/no-header-column
rename to testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/no-header-column
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/no-header-not-column b/testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/no-header-not-column
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/no-header-not-column
rename to testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/no-header-not-column
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/no-header-show b/testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/no-header-show
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/no-header-show
rename to testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/no-header-show
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/null-separator b/testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/null-separator
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.bad-logs/null-separator
rename to testing/btest/Baseline/zeek-aux.zeek-cut.bad-logs/null-separator
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.columns/all b/testing/btest/Baseline/zeek-aux.zeek-cut.columns/all
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.columns/all
rename to testing/btest/Baseline/zeek-aux.zeek-cut.columns/all
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.columns/different-col-order b/testing/btest/Baseline/zeek-aux.zeek-cut.columns/different-col-order
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.columns/different-col-order
rename to testing/btest/Baseline/zeek-aux.zeek-cut.columns/different-col-order
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.columns/nondefault-separator b/testing/btest/Baseline/zeek-aux.zeek-cut.columns/nondefault-separator
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.columns/nondefault-separator
rename to testing/btest/Baseline/zeek-aux.zeek-cut.columns/nondefault-separator
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.columns/one b/testing/btest/Baseline/zeek-aux.zeek-cut.columns/one
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.columns/one
rename to testing/btest/Baseline/zeek-aux.zeek-cut.columns/one
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.columns/one-nonexistent-1 b/testing/btest/Baseline/zeek-aux.zeek-cut.columns/one-nonexistent-1
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.columns/one-nonexistent-1
rename to testing/btest/Baseline/zeek-aux.zeek-cut.columns/one-nonexistent-1
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.columns/one-nonexistent-2 b/testing/btest/Baseline/zeek-aux.zeek-cut.columns/one-nonexistent-2
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.columns/one-nonexistent-2
rename to testing/btest/Baseline/zeek-aux.zeek-cut.columns/one-nonexistent-2
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.columns/only b/testing/btest/Baseline/zeek-aux.zeek-cut.columns/only
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.columns/only
rename to testing/btest/Baseline/zeek-aux.zeek-cut.columns/only
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.columns/swap-order b/testing/btest/Baseline/zeek-aux.zeek-cut.columns/swap-order
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.columns/swap-order
rename to testing/btest/Baseline/zeek-aux.zeek-cut.columns/swap-order
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.help/show-help b/testing/btest/Baseline/zeek-aux.zeek-cut.help/show-help
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.help/show-help
rename to testing/btest/Baseline/zeek-aux.zeek-cut.help/show-help
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/both-c-m-opts-m b/testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/both-c-m-opts-m
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/both-c-m-opts-m
rename to testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/both-c-m-opts-m
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/both-m-c-opts-c b/testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/both-m-c-opts-c
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/both-m-c-opts-c
rename to testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/both-m-c-opts-c
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/both-m-opts-all b/testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/both-m-opts-all
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/both-m-opts-all
rename to testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/both-m-opts-all
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/both-m-opts-one b/testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/both-m-opts-one
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/both-m-opts-one
rename to testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/both-m-opts-one
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/different-col-order b/testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/different-col-order
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/different-col-order
rename to testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/different-col-order
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/different-col-order-some b/testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/different-col-order-some
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/different-col-order-some
rename to testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/different-col-order-some
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/nondefault-separator b/testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/nondefault-separator
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/nondefault-separator
rename to testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/nondefault-separator
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/one-all-nocols b/testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/one-all-nocols
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/one-all-nocols
rename to testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/one-all-nocols
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/two-1st-withcols b/testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/two-1st-withcols
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/two-1st-withcols
rename to testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/two-1st-withcols
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/two-1st-withcols-custom-sep b/testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/two-1st-withcols-custom-sep
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/two-1st-withcols-custom-sep
rename to testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/two-1st-withcols-custom-sep
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/two-all-withcols b/testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/two-all-withcols
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/two-all-withcols
rename to testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/two-all-withcols
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/two-all-withcols-custom-sep b/testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/two-all-withcols-custom-sep
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.minimal-view/two-all-withcols-custom-sep
rename to testing/btest/Baseline/zeek-aux.zeek-cut.minimal-view/two-all-withcols-custom-sep
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.no-options/no-opts b/testing/btest/Baseline/zeek-aux.zeek-cut.no-options/no-opts
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.no-options/no-opts
rename to testing/btest/Baseline/zeek-aux.zeek-cut.no-options/no-opts
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.no-options/tsv b/testing/btest/Baseline/zeek-aux.zeek-cut.no-options/tsv
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.no-options/tsv
rename to testing/btest/Baseline/zeek-aux.zeek-cut.no-options/tsv
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/different-col-order b/testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/different-col-order
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/different-col-order
rename to testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/different-col-order
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-all b/testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-all
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-all
rename to testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-all
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-none b/testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-none
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-none
rename to testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-none
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-one b/testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-one
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-one
rename to testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-one
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-one-nonexistent b/testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-one-nonexistent
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-one-nonexistent
rename to testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-one-nonexistent
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-one-show-header b/testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-one-show-header
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-one-show-header
rename to testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-one-show-header
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-one-twice b/testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-one-twice
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-one-twice
rename to testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-one-twice
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-only b/testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-only
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-only
rename to testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-only
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-two-swapped b/testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-two-swapped
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.not-columns/not-two-swapped
rename to testing/btest/Baseline/zeek-aux.zeek-cut.not-columns/not-two-swapped
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.ofs/nondefault-separator b/testing/btest/Baseline/zeek-aux.zeek-cut.ofs/nondefault-separator
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.ofs/nondefault-separator
rename to testing/btest/Baseline/zeek-aux.zeek-cut.ofs/nondefault-separator
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.ofs/only-column b/testing/btest/Baseline/zeek-aux.zeek-cut.ofs/only-column
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.ofs/only-column
rename to testing/btest/Baseline/zeek-aux.zeek-cut.ofs/only-column
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.ofs/show-header b/testing/btest/Baseline/zeek-aux.zeek-cut.ofs/show-header
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.ofs/show-header
rename to testing/btest/Baseline/zeek-aux.zeek-cut.ofs/show-header
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.ofs/some-columns b/testing/btest/Baseline/zeek-aux.zeek-cut.ofs/some-columns
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.ofs/some-columns
rename to testing/btest/Baseline/zeek-aux.zeek-cut.ofs/some-columns
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/both-c-opts-all b/testing/btest/Baseline/zeek-aux.zeek-cut.show-header/both-c-opts-all
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/both-c-opts-all
rename to testing/btest/Baseline/zeek-aux.zeek-cut.show-header/both-c-opts-all
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/both-c-opts-one b/testing/btest/Baseline/zeek-aux.zeek-cut.show-header/both-c-opts-one
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/both-c-opts-one
rename to testing/btest/Baseline/zeek-aux.zeek-cut.show-header/both-c-opts-one
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/different-col-order b/testing/btest/Baseline/zeek-aux.zeek-cut.show-header/different-col-order
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/different-col-order
rename to testing/btest/Baseline/zeek-aux.zeek-cut.show-header/different-col-order
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/different-col-order-some b/testing/btest/Baseline/zeek-aux.zeek-cut.show-header/different-col-order-some
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/different-col-order-some
rename to testing/btest/Baseline/zeek-aux.zeek-cut.show-header/different-col-order-some
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/nondefault-separator b/testing/btest/Baseline/zeek-aux.zeek-cut.show-header/nondefault-separator
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/nondefault-separator
rename to testing/btest/Baseline/zeek-aux.zeek-cut.show-header/nondefault-separator
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/one-1st-nocols b/testing/btest/Baseline/zeek-aux.zeek-cut.show-header/one-1st-nocols
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/one-1st-nocols
rename to testing/btest/Baseline/zeek-aux.zeek-cut.show-header/one-1st-nocols
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/one-all-nocols b/testing/btest/Baseline/zeek-aux.zeek-cut.show-header/one-all-nocols
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/one-all-nocols
rename to testing/btest/Baseline/zeek-aux.zeek-cut.show-header/one-all-nocols
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/two-1st-withcols b/testing/btest/Baseline/zeek-aux.zeek-cut.show-header/two-1st-withcols
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/two-1st-withcols
rename to testing/btest/Baseline/zeek-aux.zeek-cut.show-header/two-1st-withcols
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/two-all-withcols b/testing/btest/Baseline/zeek-aux.zeek-cut.show-header/two-all-withcols
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.show-header/two-all-withcols
rename to testing/btest/Baseline/zeek-aux.zeek-cut.show-header/two-all-withcols
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-bad-logs/invalid-time-field b/testing/btest/Baseline/zeek-aux.zeek-cut.time-bad-logs/invalid-time-field
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-bad-logs/invalid-time-field
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-bad-logs/invalid-time-field
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-bad-logs/invalid-time-field.err b/testing/btest/Baseline/zeek-aux.zeek-cut.time-bad-logs/invalid-time-field.err
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-bad-logs/invalid-time-field.err
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-bad-logs/invalid-time-field.err
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-bad-logs/missing-types-header b/testing/btest/Baseline/zeek-aux.zeek-cut.time-bad-logs/missing-types-header
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-bad-logs/missing-types-header
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-bad-logs/missing-types-header
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-bad-logs/no-header-time b/testing/btest/Baseline/zeek-aux.zeek-cut.time-bad-logs/no-header-time
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-bad-logs/no-header-time
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-bad-logs/no-header-time
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/both-1 b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/both-1
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/both-1
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/both-1
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/both-2 b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/both-2
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/both-2
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/both-2
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/different-col-order b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/different-col-order
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/different-col-order
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/different-col-order
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/local b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/local
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/local
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/local
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/missing-header b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/missing-header
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/missing-header
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/missing-header
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/multiple-times b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/multiple-times
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/multiple-times
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/multiple-times
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/no-timestamps b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/no-timestamps
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/no-timestamps
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/no-timestamps
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/time-last-col b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/time-last-col
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/time-last-col
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/time-last-col
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/utc b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/utc
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/utc
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/utc
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/zero b/testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/zero
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-conversion/zero
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-conversion/zero
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt-env/env-local b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-local
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt-env/env-local
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-local
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt-env/env-local-fmt b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-local-fmt
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt-env/env-local-fmt
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-local-fmt
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt-env/env-utc b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-utc
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt-env/env-utc
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-utc
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt-env/env-utc-fmt b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-utc-fmt
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt-env/env-utc-fmt
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt-env/env-utc-fmt
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt/local-fmt b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/local-fmt
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt/local-fmt
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/local-fmt
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt/local-fmt-utc b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/local-fmt-utc
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt/local-fmt-utc
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/local-fmt-utc
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt/local-utc-fmt b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/local-utc-fmt
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt/local-utc-fmt
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/local-utc-fmt
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt/utc-fmt b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-fmt
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt/utc-fmt
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-fmt
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt/utc-fmt-local b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-fmt-local
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt/utc-fmt-local
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-fmt-local
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt/utc-local-fmt b/testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-local-fmt
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-fmt/utc-local-fmt
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-fmt/utc-local-fmt
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/different-col-order b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/different-col-order
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/different-col-order
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-header/different-col-order
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/different-field-separator b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/different-field-separator
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/different-field-separator
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-header/different-field-separator
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/missing-ts-one-file b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/missing-ts-one-file
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/missing-ts-one-file
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-header/missing-ts-one-file
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/multiple-times b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/multiple-times
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/multiple-times
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-header/multiple-times
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/nondefault-separator b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/nondefault-separator
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/nondefault-separator
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-header/nondefault-separator
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/ts-twice b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/ts-twice
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/ts-twice
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-header/ts-twice
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/utc-fmt b/testing/btest/Baseline/zeek-aux.zeek-cut.time-header/utc-fmt
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-header/utc-fmt
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-header/utc-fmt
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-optional/out b/testing/btest/Baseline/zeek-aux.zeek-cut.time-optional/out
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-optional/out
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-optional/out
diff --git a/auxil/zeek-aux/testing/Baseline/zeek-cut.time-optional/out2 b/testing/btest/Baseline/zeek-aux.zeek-cut.time-optional/out2
similarity index 100%
rename from auxil/zeek-aux/testing/Baseline/zeek-cut.time-optional/out2
rename to testing/btest/Baseline/zeek-aux.zeek-cut.time-optional/out2
diff --git a/auxil/zeek-aux/testing/Logs/conn-tsv.log b/testing/btest/Files/zeek-aux-Logs/conn-tsv.log
similarity index 100%
rename from auxil/zeek-aux/testing/Logs/conn-tsv.log
rename to testing/btest/Files/zeek-aux-Logs/conn-tsv.log
diff --git a/auxil/zeek-aux/testing/Logs/conn.log b/testing/btest/Files/zeek-aux-Logs/conn.log
similarity index 100%
rename from auxil/zeek-aux/testing/Logs/conn.log
rename to testing/btest/Files/zeek-aux-Logs/conn.log
diff --git a/auxil/zeek-aux/testing/Logs/conncomma.log b/testing/btest/Files/zeek-aux-Logs/conncomma.log
similarity index 100%
rename from auxil/zeek-aux/testing/Logs/conncomma.log
rename to testing/btest/Files/zeek-aux-Logs/conncomma.log
diff --git a/auxil/zeek-aux/testing/Logs/conntimelast.log b/testing/btest/Files/zeek-aux-Logs/conntimelast.log
similarity index 100%
rename from auxil/zeek-aux/testing/Logs/conntimelast.log
rename to testing/btest/Files/zeek-aux-Logs/conntimelast.log
diff --git a/auxil/zeek-aux/testing/Logs/invalid-time.log b/testing/btest/Files/zeek-aux-Logs/invalid-time.log
similarity index 100%
rename from auxil/zeek-aux/testing/Logs/invalid-time.log
rename to testing/btest/Files/zeek-aux-Logs/invalid-time.log
diff --git a/auxil/zeek-aux/testing/Logs/missing-separator.log b/testing/btest/Files/zeek-aux-Logs/missing-separator.log
similarity index 100%
rename from auxil/zeek-aux/testing/Logs/missing-separator.log
rename to testing/btest/Files/zeek-aux-Logs/missing-separator.log
diff --git a/auxil/zeek-aux/testing/Logs/multiple-times.log b/testing/btest/Files/zeek-aux-Logs/multiple-times.log
similarity index 100%
rename from auxil/zeek-aux/testing/Logs/multiple-times.log
rename to testing/btest/Files/zeek-aux-Logs/multiple-times.log
diff --git a/auxil/zeek-aux/testing/Logs/null-separator.log b/testing/btest/Files/zeek-aux-Logs/null-separator.log
similarity index 100%
rename from auxil/zeek-aux/testing/Logs/null-separator.log
rename to testing/btest/Files/zeek-aux-Logs/null-separator.log
diff --git a/auxil/zeek-aux/testing/Logs/onecolumn.log b/testing/btest/Files/zeek-aux-Logs/onecolumn.log
similarity index 100%
rename from auxil/zeek-aux/testing/Logs/onecolumn.log
rename to testing/btest/Files/zeek-aux-Logs/onecolumn.log
diff --git a/auxil/zeek-aux/testing/Logs/test.log b/testing/btest/Files/zeek-aux-Logs/test.log
similarity index 100%
rename from auxil/zeek-aux/testing/Logs/test.log
rename to testing/btest/Files/zeek-aux-Logs/test.log
diff --git a/auxil/zeek-aux/testing/Logs/time-optional.log b/testing/btest/Files/zeek-aux-Logs/time-optional.log
similarity index 100%
rename from auxil/zeek-aux/testing/Logs/time-optional.log
rename to testing/btest/Files/zeek-aux-Logs/time-optional.log
diff --git a/auxil/zeek-aux/testing/Logs/unset-field.log b/testing/btest/Files/zeek-aux-Logs/unset-field.log
similarity index 100%
rename from auxil/zeek-aux/testing/Logs/unset-field.log
rename to testing/btest/Files/zeek-aux-Logs/unset-field.log
diff --git a/auxil/zeek-aux/testing/Logs/zerotime.log b/testing/btest/Files/zeek-aux-Logs/zerotime.log
similarity index 100%
rename from auxil/zeek-aux/testing/Logs/zerotime.log
rename to testing/btest/Files/zeek-aux-Logs/zerotime.log
diff --git a/auxil/zeek-aux/testing/update-changes/changes-up-to-date.sh b/testing/btest/zeek-aux/update-changes/changes-up-to-date.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/changes-up-to-date.sh
rename to testing/btest/zeek-aux/update-changes/changes-up-to-date.sh
diff --git a/auxil/zeek-aux/testing/update-changes/initialize-from-prompt.sh b/testing/btest/zeek-aux/update-changes/initialize-from-prompt.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/initialize-from-prompt.sh
rename to testing/btest/zeek-aux/update-changes/initialize-from-prompt.sh
diff --git a/auxil/zeek-aux/testing/update-changes/initialize-from-tag.sh b/testing/btest/zeek-aux/update-changes/initialize-from-tag.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/initialize-from-tag.sh
rename to testing/btest/zeek-aux/update-changes/initialize-from-tag.sh
diff --git a/auxil/zeek-aux/testing/update-changes/initialize-from-version.sh b/testing/btest/zeek-aux/update-changes/initialize-from-version.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/initialize-from-version.sh
rename to testing/btest/zeek-aux/update-changes/initialize-from-version.sh
diff --git a/auxil/zeek-aux/testing/update-changes/replace-version-in-c-header.sh b/testing/btest/zeek-aux/update-changes/replace-version-in-c-header.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/replace-version-in-c-header.sh
rename to testing/btest/zeek-aux/update-changes/replace-version-in-c-header.sh
diff --git a/auxil/zeek-aux/testing/update-changes/replace-version-in-python-package.sh b/testing/btest/zeek-aux/update-changes/replace-version-in-python-package.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/replace-version-in-python-package.sh
rename to testing/btest/zeek-aux/update-changes/replace-version-in-python-package.sh
diff --git a/auxil/zeek-aux/testing/update-changes/replace-version-in-rst.sh b/testing/btest/zeek-aux/update-changes/replace-version-in-rst.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/replace-version-in-rst.sh
rename to testing/btest/zeek-aux/update-changes/replace-version-in-rst.sh
diff --git a/auxil/zeek-aux/testing/update-changes/replace-version-in-script.sh b/testing/btest/zeek-aux/update-changes/replace-version-in-script.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/replace-version-in-script.sh
rename to testing/btest/zeek-aux/update-changes/replace-version-in-script.sh
diff --git a/auxil/zeek-aux/testing/update-changes/replace-version-in-setup-py.sh b/testing/btest/zeek-aux/update-changes/replace-version-in-setup-py.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/replace-version-in-setup-py.sh
rename to testing/btest/zeek-aux/update-changes/replace-version-in-setup-py.sh
diff --git a/auxil/zeek-aux/testing/update-changes/tag-dev-point-release-ahead-of-origin.sh b/testing/btest/zeek-aux/update-changes/tag-dev-point-release-ahead-of-origin.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/tag-dev-point-release-ahead-of-origin.sh
rename to testing/btest/zeek-aux/update-changes/tag-dev-point-release-ahead-of-origin.sh
diff --git a/auxil/zeek-aux/testing/update-changes/tag-point-release-ahead-of-origin.sh b/testing/btest/zeek-aux/update-changes/tag-point-release-ahead-of-origin.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/tag-point-release-ahead-of-origin.sh
rename to testing/btest/zeek-aux/update-changes/tag-point-release-ahead-of-origin.sh
diff --git a/auxil/zeek-aux/testing/update-changes/tag-point-release-at-origin.sh b/testing/btest/zeek-aux/update-changes/tag-point-release-at-origin.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/tag-point-release-at-origin.sh
rename to testing/btest/zeek-aux/update-changes/tag-point-release-at-origin.sh
diff --git a/auxil/zeek-aux/testing/update-changes/tag-release-ahead-of-origin-new-commit.sh b/testing/btest/zeek-aux/update-changes/tag-release-ahead-of-origin-new-commit.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/tag-release-ahead-of-origin-new-commit.sh
rename to testing/btest/zeek-aux/update-changes/tag-release-ahead-of-origin-new-commit.sh
diff --git a/auxil/zeek-aux/testing/update-changes/tag-release-ahead-of-origin.sh b/testing/btest/zeek-aux/update-changes/tag-release-ahead-of-origin.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/tag-release-ahead-of-origin.sh
rename to testing/btest/zeek-aux/update-changes/tag-release-ahead-of-origin.sh
diff --git a/auxil/zeek-aux/testing/update-changes/tag-release-at-origin.sh b/testing/btest/zeek-aux/update-changes/tag-release-at-origin.sh
similarity index 100%
rename from auxil/zeek-aux/testing/update-changes/tag-release-at-origin.sh
rename to testing/btest/zeek-aux/update-changes/tag-release-at-origin.sh
diff --git a/auxil/zeek-aux/testing/zeek-archiver/command-injection-filenames.test b/testing/btest/zeek-aux/zeek-archiver/command-injection-filenames.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-archiver/command-injection-filenames.test
rename to testing/btest/zeek-aux/zeek-archiver/command-injection-filenames.test
diff --git a/auxil/zeek-aux/testing/zeek-archiver/custom-delimiter.test b/testing/btest/zeek-aux/zeek-archiver/custom-delimiter.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-archiver/custom-delimiter.test
rename to testing/btest/zeek-aux/zeek-archiver/custom-delimiter.test
diff --git a/auxil/zeek-aux/testing/zeek-archiver/custom-timestamp.test b/testing/btest/zeek-aux/zeek-archiver/custom-timestamp.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-archiver/custom-timestamp.test
rename to testing/btest/zeek-aux/zeek-archiver/custom-timestamp.test
diff --git a/auxil/zeek-aux/testing/zeek-archiver/default.test b/testing/btest/zeek-aux/zeek-archiver/default.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-archiver/default.test
rename to testing/btest/zeek-aux/zeek-archiver/default.test
diff --git a/auxil/zeek-aux/testing/zeek-archiver/disable-compression.test b/testing/btest/zeek-aux/zeek-archiver/disable-compression.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-archiver/disable-compression.test
rename to testing/btest/zeek-aux/zeek-archiver/disable-compression.test
diff --git a/auxil/zeek-aux/testing/zeek-archiver/extra-compression-args.test b/testing/btest/zeek-aux/zeek-archiver/extra-compression-args.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-archiver/extra-compression-args.test
rename to testing/btest/zeek-aux/zeek-archiver/extra-compression-args.test
diff --git a/auxil/zeek-aux/testing/zeek-archiver/failing-compress.test b/testing/btest/zeek-aux/zeek-archiver/failing-compress.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-archiver/failing-compress.test
rename to testing/btest/zeek-aux/zeek-archiver/failing-compress.test
diff --git a/auxil/zeek-aux/testing/zeek-archiver/metadata-addl.test b/testing/btest/zeek-aux/zeek-archiver/metadata-addl.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-archiver/metadata-addl.test
rename to testing/btest/zeek-aux/zeek-archiver/metadata-addl.test
diff --git a/auxil/zeek-aux/testing/zeek-archiver/metadata-empty.test b/testing/btest/zeek-aux/zeek-archiver/metadata-empty.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-archiver/metadata-empty.test
rename to testing/btest/zeek-aux/zeek-archiver/metadata-empty.test
diff --git a/auxil/zeek-aux/testing/zeek-archiver/metadata-invalid.test b/testing/btest/zeek-aux/zeek-archiver/metadata-invalid.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-archiver/metadata-invalid.test
rename to testing/btest/zeek-aux/zeek-archiver/metadata-invalid.test
diff --git a/auxil/zeek-aux/testing/zeek-archiver/metadata.test b/testing/btest/zeek-aux/zeek-archiver/metadata.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-archiver/metadata.test
rename to testing/btest/zeek-aux/zeek-archiver/metadata.test
diff --git a/auxil/zeek-aux/testing/zeek-archiver/pre-compression-logs.test b/testing/btest/zeek-aux/zeek-archiver/pre-compression-logs.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-archiver/pre-compression-logs.test
rename to testing/btest/zeek-aux/zeek-archiver/pre-compression-logs.test
diff --git a/auxil/zeek-aux/testing/zeek-archiver/umask.test b/testing/btest/zeek-aux/zeek-archiver/umask.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-archiver/umask.test
rename to testing/btest/zeek-aux/zeek-archiver/umask.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/bad-logs.test b/testing/btest/zeek-aux/zeek-cut/bad-logs.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/bad-logs.test
rename to testing/btest/zeek-aux/zeek-cut/bad-logs.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/columns.test b/testing/btest/zeek-aux/zeek-cut/columns.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/columns.test
rename to testing/btest/zeek-aux/zeek-cut/columns.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/help.test b/testing/btest/zeek-aux/zeek-cut/help.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/help.test
rename to testing/btest/zeek-aux/zeek-cut/help.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/minimal-view.test b/testing/btest/zeek-aux/zeek-cut/minimal-view.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/minimal-view.test
rename to testing/btest/zeek-aux/zeek-cut/minimal-view.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/no-options.test b/testing/btest/zeek-aux/zeek-cut/no-options.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/no-options.test
rename to testing/btest/zeek-aux/zeek-cut/no-options.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/not-columns.test b/testing/btest/zeek-aux/zeek-cut/not-columns.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/not-columns.test
rename to testing/btest/zeek-aux/zeek-cut/not-columns.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/ofs.test b/testing/btest/zeek-aux/zeek-cut/ofs.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/ofs.test
rename to testing/btest/zeek-aux/zeek-cut/ofs.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/show-header.test b/testing/btest/zeek-aux/zeek-cut/show-header.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/show-header.test
rename to testing/btest/zeek-aux/zeek-cut/show-header.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/time-bad-logs.test b/testing/btest/zeek-aux/zeek-cut/time-bad-logs.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/time-bad-logs.test
rename to testing/btest/zeek-aux/zeek-cut/time-bad-logs.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/time-conversion.test b/testing/btest/zeek-aux/zeek-cut/time-conversion.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/time-conversion.test
rename to testing/btest/zeek-aux/zeek-cut/time-conversion.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/time-fmt-env.test b/testing/btest/zeek-aux/zeek-cut/time-fmt-env.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/time-fmt-env.test
rename to testing/btest/zeek-aux/zeek-cut/time-fmt-env.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/time-fmt.test b/testing/btest/zeek-aux/zeek-cut/time-fmt.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/time-fmt.test
rename to testing/btest/zeek-aux/zeek-cut/time-fmt.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/time-header.test b/testing/btest/zeek-aux/zeek-cut/time-header.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/time-header.test
rename to testing/btest/zeek-aux/zeek-cut/time-header.test
diff --git a/auxil/zeek-aux/testing/zeek-cut/time-optional.test b/testing/btest/zeek-aux/zeek-cut/time-optional.test
similarity index 100%
rename from auxil/zeek-aux/testing/zeek-cut/time-optional.test
rename to testing/btest/zeek-aux/zeek-cut/time-optional.test
diff --git a/auxil/zeek-aux/testing/Scripts/diff-time-zone b/testing/scripts/zeek-aux/diff-time-zone
similarity index 100%
rename from auxil/zeek-aux/testing/Scripts/diff-time-zone
rename to testing/scripts/zeek-aux/diff-time-zone
diff --git a/auxil/zeek-aux/testing/Scripts/git b/testing/scripts/zeek-aux/git
similarity index 100%
rename from auxil/zeek-aux/testing/Scripts/git
rename to testing/scripts/zeek-aux/git
diff --git a/auxil/zeek-aux/testing/Scripts/zeek-archiver-common.sh b/testing/scripts/zeek-aux/zeek-archiver-common.sh
similarity index 100%
rename from auxil/zeek-aux/testing/Scripts/zeek-archiver-common.sh
rename to testing/scripts/zeek-aux/zeek-archiver-common.sh