diff --git a/dev/perforce-testing-helpers/README.md b/dev/perforce/test-helpers/README.md
similarity index 100%
rename from dev/perforce-testing-helpers/README.md
rename to dev/perforce/test-helpers/README.md
diff --git a/dev/perforce-testing-helpers/base/.p4ignore b/dev/perforce/test-helpers/base/.p4ignore
similarity index 100%
rename from dev/perforce-testing-helpers/base/.p4ignore
rename to dev/perforce/test-helpers/base/.p4ignore
diff --git a/dev/perforce-testing-helpers/base/path.txt b/dev/perforce/test-helpers/base/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/path.txt
rename to dev/perforce/test-helpers/base/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/dev/cmd/config.json b/dev/perforce/test-helpers/base/src/dev/cmd/config.json
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/dev/cmd/config.json
rename to dev/perforce/test-helpers/base/src/dev/cmd/config.json
diff --git a/dev/perforce-testing-helpers/base/src/dev/cmd/golang/ci/INFO.md b/dev/perforce/test-helpers/base/src/dev/cmd/golang/ci/INFO.md
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/dev/cmd/golang/ci/INFO.md
rename to dev/perforce/test-helpers/base/src/dev/cmd/golang/ci/INFO.md
diff --git a/dev/perforce-testing-helpers/base/src/dev/cmd/golang/ci/path.txt b/dev/perforce/test-helpers/base/src/dev/cmd/golang/ci/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/dev/cmd/golang/ci/path.txt
rename to dev/perforce/test-helpers/base/src/dev/cmd/golang/ci/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/dev/cmd/golang/path.txt b/dev/perforce/test-helpers/base/src/dev/cmd/golang/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/dev/cmd/golang/path.txt
rename to dev/perforce/test-helpers/base/src/dev/cmd/golang/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/dev/cmd/package.json b/dev/perforce/test-helpers/base/src/dev/cmd/package.json
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/dev/cmd/package.json
rename to dev/perforce/test-helpers/base/src/dev/cmd/package.json
diff --git a/dev/perforce-testing-helpers/base/src/dev/cmd/path.txt b/dev/perforce/test-helpers/base/src/dev/cmd/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/dev/cmd/path.txt
rename to dev/perforce/test-helpers/base/src/dev/cmd/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/dev/cmd/rides-api/build.sh b/dev/perforce/test-helpers/base/src/dev/cmd/rides-api/build.sh
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/dev/cmd/rides-api/build.sh
rename to dev/perforce/test-helpers/base/src/dev/cmd/rides-api/build.sh
diff --git a/dev/perforce-testing-helpers/base/src/dev/cmd/rides-api/path.txt b/dev/perforce/test-helpers/base/src/dev/cmd/rides-api/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/dev/cmd/rides-api/path.txt
rename to dev/perforce/test-helpers/base/src/dev/cmd/rides-api/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/dev/cmd/rides/path.txt b/dev/perforce/test-helpers/base/src/dev/cmd/rides/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/dev/cmd/rides/path.txt
rename to dev/perforce/test-helpers/base/src/dev/cmd/rides/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/dev/cmd/storage/path.txt b/dev/perforce/test-helpers/base/src/dev/cmd/storage/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/dev/cmd/storage/path.txt
rename to dev/perforce/test-helpers/base/src/dev/cmd/storage/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/dev/cmd/storage/redis/dump.rdb b/dev/perforce/test-helpers/base/src/dev/cmd/storage/redis/dump.rdb
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/dev/cmd/storage/redis/dump.rdb
rename to dev/perforce/test-helpers/base/src/dev/cmd/storage/redis/dump.rdb
diff --git a/dev/perforce-testing-helpers/base/src/dev/cmd/storage/redis/path.txt b/dev/perforce/test-helpers/base/src/dev/cmd/storage/redis/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/dev/cmd/storage/redis/path.txt
rename to dev/perforce/test-helpers/base/src/dev/cmd/storage/redis/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/dev/path.txt b/dev/perforce/test-helpers/base/src/dev/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/dev/path.txt
rename to dev/perforce/test-helpers/base/src/dev/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/feature/cmd/golang/ci/INFO.md b/dev/perforce/test-helpers/base/src/feature/cmd/golang/ci/INFO.md
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/feature/cmd/golang/ci/INFO.md
rename to dev/perforce/test-helpers/base/src/feature/cmd/golang/ci/INFO.md
diff --git a/dev/perforce-testing-helpers/base/src/feature/cmd/golang/ci/path.txt b/dev/perforce/test-helpers/base/src/feature/cmd/golang/ci/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/feature/cmd/golang/ci/path.txt
rename to dev/perforce/test-helpers/base/src/feature/cmd/golang/ci/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/feature/cmd/golang/path.txt b/dev/perforce/test-helpers/base/src/feature/cmd/golang/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/feature/cmd/golang/path.txt
rename to dev/perforce/test-helpers/base/src/feature/cmd/golang/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/feature/cmd/path.txt b/dev/perforce/test-helpers/base/src/feature/cmd/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/feature/cmd/path.txt
rename to dev/perforce/test-helpers/base/src/feature/cmd/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/feature/cmd/rides-api/config.json b/dev/perforce/test-helpers/base/src/feature/cmd/rides-api/config.json
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/feature/cmd/rides-api/config.json
rename to dev/perforce/test-helpers/base/src/feature/cmd/rides-api/config.json
diff --git a/dev/perforce-testing-helpers/base/src/feature/cmd/rides-api/path.txt b/dev/perforce/test-helpers/base/src/feature/cmd/rides-api/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/feature/cmd/rides-api/path.txt
rename to dev/perforce/test-helpers/base/src/feature/cmd/rides-api/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/feature/cmd/storage/path.txt b/dev/perforce/test-helpers/base/src/feature/cmd/storage/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/feature/cmd/storage/path.txt
rename to dev/perforce/test-helpers/base/src/feature/cmd/storage/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/feature/cmd/storage/redis/dump.rdb b/dev/perforce/test-helpers/base/src/feature/cmd/storage/redis/dump.rdb
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/feature/cmd/storage/redis/dump.rdb
rename to dev/perforce/test-helpers/base/src/feature/cmd/storage/redis/dump.rdb
diff --git a/dev/perforce-testing-helpers/base/src/feature/cmd/storage/redis/path.txt b/dev/perforce/test-helpers/base/src/feature/cmd/storage/redis/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/feature/cmd/storage/redis/path.txt
rename to dev/perforce/test-helpers/base/src/feature/cmd/storage/redis/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/feature/path.txt b/dev/perforce/test-helpers/base/src/feature/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/feature/path.txt
rename to dev/perforce/test-helpers/base/src/feature/path.txt
diff --git a/dev/perforce-testing-helpers/base/src/path.txt b/dev/perforce/test-helpers/base/src/path.txt
similarity index 100%
rename from dev/perforce-testing-helpers/base/src/path.txt
rename to dev/perforce/test-helpers/base/src/path.txt
diff --git a/dev/perforce-testing-helpers/create_path_files.sh b/dev/perforce/test-helpers/create_path_files.sh
similarity index 100%
rename from dev/perforce-testing-helpers/create_path_files.sh
rename to dev/perforce/test-helpers/create_path_files.sh
diff --git a/dev/perforce-testing-helpers/p4-setup-protections.sh b/dev/perforce/test-helpers/p4-setup-protections.sh
similarity index 100%
rename from dev/perforce-testing-helpers/p4-setup-protections.sh
rename to dev/perforce/test-helpers/p4-setup-protections.sh
diff --git a/dev/perforce-testing-helpers/p4-upload.sh b/dev/perforce/test-helpers/p4-upload.sh
similarity index 100%
rename from dev/perforce-testing-helpers/p4-upload.sh
rename to dev/perforce/test-helpers/p4-upload.sh
diff --git a/dev/perforce-testing-helpers/templates/changelist.tmpl b/dev/perforce/test-helpers/templates/changelist.tmpl
similarity index 100%
rename from dev/perforce-testing-helpers/templates/changelist.tmpl
rename to dev/perforce/test-helpers/templates/changelist.tmpl
diff --git a/dev/perforce-testing-helpers/templates/client.tmpl b/dev/perforce/test-helpers/templates/client.tmpl
similarity index 100%
rename from dev/perforce-testing-helpers/templates/client.tmpl
rename to dev/perforce/test-helpers/templates/client.tmpl
diff --git a/dev/perforce-testing-helpers/templates/depot.tmpl b/dev/perforce/test-helpers/templates/depot.tmpl
similarity index 100%
rename from dev/perforce-testing-helpers/templates/depot.tmpl
rename to dev/perforce/test-helpers/templates/depot.tmpl
diff --git a/dev/perforce-testing-helpers/templates/group.tmpl b/dev/perforce/test-helpers/templates/group.tmpl
similarity index 100%
rename from dev/perforce-testing-helpers/templates/group.tmpl
rename to dev/perforce/test-helpers/templates/group.tmpl
diff --git a/dev/perforce-testing-helpers/templates/p4_protects.tmpl b/dev/perforce/test-helpers/templates/p4_protects.tmpl
similarity index 100%
rename from dev/perforce-testing-helpers/templates/p4_protects.tmpl
rename to dev/perforce/test-helpers/templates/p4_protects.tmpl
diff --git a/dev/perforce-testing-helpers/templates/user.tmpl b/dev/perforce/test-helpers/templates/user.tmpl
similarity index 100%
rename from dev/perforce-testing-helpers/templates/user.tmpl
rename to dev/perforce/test-helpers/templates/user.tmpl