diff --git a/packages/deployment/upgrade-test/Dockerfile b/upgrade-test/Dockerfile
similarity index 100%
rename from packages/deployment/upgrade-test/Dockerfile
rename to upgrade-test/Dockerfile
diff --git a/packages/deployment/upgrade-test/Makefile b/upgrade-test/Makefile
similarity index 100%
rename from packages/deployment/upgrade-test/Makefile
rename to upgrade-test/Makefile
diff --git a/packages/deployment/upgrade-test/Readme.md b/upgrade-test/Readme.md
similarity index 100%
rename from packages/deployment/upgrade-test/Readme.md
rename to upgrade-test/Readme.md
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.test.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.test.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.test.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-10/actions.test.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/legacy.sh b/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/legacy.sh
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/legacy.sh
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-10/legacy.sh
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/post.test.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/post.test.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/post.test.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-10/post.test.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/pre.test.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/pre.test.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/pre.test.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-10/pre.test.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/upgradeHelpers.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/upgradeHelpers.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-10/upgradeHelpers.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-10/upgradeHelpers.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/actions.test.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/actions.test.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/actions.test.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-11/actions.test.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/legacy.sh b/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/legacy.sh
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/legacy.sh
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-11/legacy.sh
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/post.test.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/post.test.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/post.test.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-11/post.test.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/pre.test.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/pre.test.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-11/pre.test.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-11/pre.test.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/.gitignore b/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/.gitignore
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/.gitignore
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-12/.gitignore
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/actions.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/actions.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/actions.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-12/actions.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/actions.test.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/actions.test.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/actions.test.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-12/actions.test.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/post.test.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/post.test.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/post.test.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-12/post.test.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/pre.test.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/pre.test.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/pre.test.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-12/pre.test.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/tools/vat-status.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/tools/vat-status.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/tools/vat-status.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-12/tools/vat-status.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/run-prober-script.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/run-prober-script.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/run-prober-script.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/run-prober-script.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/run-prober.sh b/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/run-prober.sh
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/run-prober.sh
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/run-prober.sh
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/zcf-upgrade-driver.sh b/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/zcf-upgrade-driver.sh
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/zcf-upgrade-driver.sh
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/zcf-upgrade-driver.sh
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/zcf-upgrade-permit.json b/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/zcf-upgrade-permit.json
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/zcf-upgrade-permit.json
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/zcf-upgrade-permit.json
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/zcf-upgrade-script.js b/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/zcf-upgrade-script.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/zcf-upgrade-script.js
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-12/zoe-full-upgrade/zcf-upgrade-script.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8-1/.keep b/upgrade-test/upgrade-test-scripts/agoric-upgrade-8-1/.keep
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8-1/.keep
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-8-1/.keep
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/.keep b/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/.keep
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/.keep
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-8/.keep
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/actions.sh b/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/actions.sh
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/actions.sh
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-8/actions.sh
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/pre_test.sh b/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/pre_test.sh
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/pre_test.sh
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-8/pre_test.sh
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/test.sh b/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/test.sh
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-8/test.sh
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-8/test.sh
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/.keep b/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/.keep
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/.keep
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-9/.keep
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/actions.sh b/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/actions.sh
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/actions.sh
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-9/actions.sh
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/test.sh b/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/test.sh
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-9/test.sh
rename to upgrade-test/upgrade-test-scripts/agoric-upgrade-9/test.sh
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/cliHelper.js b/upgrade-test/upgrade-test-scripts/cliHelper.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/cliHelper.js
rename to upgrade-test/upgrade-test-scripts/cliHelper.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/commonUpgradeHelpers.js b/upgrade-test/upgrade-test-scripts/commonUpgradeHelpers.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/commonUpgradeHelpers.js
rename to upgrade-test/upgrade-test-scripts/commonUpgradeHelpers.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/constants.js b/upgrade-test/upgrade-test-scripts/constants.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/constants.js
rename to upgrade-test/upgrade-test-scripts/constants.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/econHelpers.js b/upgrade-test/upgrade-test-scripts/econHelpers.js
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/econHelpers.js
rename to upgrade-test/upgrade-test-scripts/econHelpers.js
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/env_setup.sh b/upgrade-test/upgrade-test-scripts/env_setup.sh
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/env_setup.sh
rename to upgrade-test/upgrade-test-scripts/env_setup.sh
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/package.json b/upgrade-test/upgrade-test-scripts/package.json
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/package.json
rename to upgrade-test/upgrade-test-scripts/package.json
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/propose-agoric-upgrade-11/.keep b/upgrade-test/upgrade-test-scripts/propose-agoric-upgrade-11/.keep
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/propose-agoric-upgrade-11/.keep
rename to upgrade-test/upgrade-test-scripts/propose-agoric-upgrade-11/.keep
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/propose-agoric-upgrade-12/.keep b/upgrade-test/upgrade-test-scripts/propose-agoric-upgrade-12/.keep
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/propose-agoric-upgrade-12/.keep
rename to upgrade-test/upgrade-test-scripts/propose-agoric-upgrade-12/.keep
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/start_ag0.sh b/upgrade-test/upgrade-test-scripts/start_ag0.sh
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/start_ag0.sh
rename to upgrade-test/upgrade-test-scripts/start_ag0.sh
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/start_to_to.sh b/upgrade-test/upgrade-test-scripts/start_to_to.sh
similarity index 100%
rename from packages/deployment/upgrade-test/upgrade-test-scripts/start_to_to.sh
rename to upgrade-test/upgrade-test-scripts/start_to_to.sh