From ffcae91e8eccef4bcaec679d90bd44d41ff2b292 Mon Sep 17 00:00:00 2001 From: Chris Doherty Date: Mon, 9 Dec 2019 17:12:31 -0800 Subject: [PATCH] Re-arrange directory structure for merge. --- .gitignore => builder/vsphere/.gitignore | 0 LICENSE.txt => builder/vsphere/LICENSE.txt | 0 Makefile => builder/vsphere/Makefile | 0 README.md => builder/vsphere/README.md | 0 {clone => builder/vsphere/clone}/builder.go | 0 .../vsphere/clone}/builder_acc_test.go | 0 {clone => builder/vsphere/clone}/builder_test.go | 0 {clone => builder/vsphere/clone}/config.go | 0 {clone => builder/vsphere/clone}/config_test.go | 0 {clone => builder/vsphere/clone}/leak_test.go | 0 {clone => builder/vsphere/clone}/step_clone.go | 0 {cmd => builder/vsphere/cmd}/clone/main.go | 0 {cmd => builder/vsphere/cmd}/iso/main.go | 0 {common => builder/vsphere/common}/artifact.go | 0 .../vsphere/common}/config_location.go | 0 {common => builder/vsphere/common}/config_ssh.go | 0 .../vsphere/common}/step_config_params.go | 0 {common => builder/vsphere/common}/step_connect.go | 0 {common => builder/vsphere/common}/step_hardware.go | 0 {common => builder/vsphere/common}/step_run.go | 0 {common => builder/vsphere/common}/step_shutdown.go | 0 {common => builder/vsphere/common}/step_snapshot.go | 0 {common => builder/vsphere/common}/step_template.go | 0 .../vsphere/common}/step_wait_for_ip.go | 0 .../vsphere/common}/testing/utility.go | 0 .../vsphere/docker-compose.yml | 0 {driver => builder/vsphere/driver}/datastore.go | 0 .../vsphere/driver}/datastore_acc_test.go | 0 {driver => builder/vsphere/driver}/driver.go | 0 {driver => builder/vsphere/driver}/driver_test.go | 0 {driver => builder/vsphere/driver}/folder.go | 0 .../vsphere/driver}/folder_acc_test.go | 0 {driver => builder/vsphere/driver}/host.go | 0 {driver => builder/vsphere/driver}/host_acc_test.go | 0 {driver => builder/vsphere/driver}/leak_test.go | 0 {driver => builder/vsphere/driver}/network.go | 0 {driver => builder/vsphere/driver}/resource_pool.go | 0 .../vsphere/driver}/resource_pool_acc_test.go | 0 {driver => builder/vsphere/driver}/vm.go | 0 {driver => builder/vsphere/driver}/vm_cdrom.go | 0 .../vsphere/driver}/vm_clone_acc_test.go | 0 .../vsphere/driver}/vm_create_acc_test.go | 0 {driver => builder/vsphere/driver}/vm_keyboard.go | 0 .../vsphere/examples}/alpine/alpine-3.8.json | 0 .../vsphere/examples}/alpine/answerfile | 0 .../vsphere/examples}/alpine/setup.sh | 0 .../vsphere/examples}/clone/alpine.json | 0 .../vsphere/examples}/driver/main.go | 0 .../vsphere/examples}/macos/macos-10.13.json | 0 .../vsphere/examples}/macos/setup/.gitignore | 0 .../vsphere/examples}/macos/setup/iso-macos.sh | 0 .../vsphere/examples}/macos/setup/iso-setup.sh | 0 .../vsphere/examples}/macos/setup/postinstall | 0 .../vsphere/examples}/macos/setup/setup.sh | 0 .../vsphere/examples}/ubuntu/preseed.cfg | 0 .../vsphere/examples}/ubuntu/ubuntu-16.04.json | 0 .../vsphere/examples}/windows/.gitattributes | 0 .../examples}/windows/setup/Autounattend.xml | 0 .../vsphere/examples}/windows/setup/setup.ps1 | 0 .../vsphere/examples}/windows/setup/vmtools.cmd | 0 .../vsphere/examples}/windows/windows-10.json | 0 go.mod => builder/vsphere/go.mod | 0 go.sum => builder/vsphere/go.sum | 0 gofmt.sh => builder/vsphere/gofmt.sh | 0 {iso => builder/vsphere/iso}/builder.go | 0 {iso => builder/vsphere/iso}/builder_acc_test.go | 0 {iso => builder/vsphere/iso}/config.go | 0 {iso => builder/vsphere/iso}/leak_test.go | 0 {iso => builder/vsphere/iso}/step_add_cdrom.go | 0 {iso => builder/vsphere/iso}/step_add_floppy.go | 0 {iso => builder/vsphere/iso}/step_boot_command.go | 0 {iso => builder/vsphere/iso}/step_create.go | 0 {iso => builder/vsphere/iso}/step_remote_upload.go | 0 {iso => builder/vsphere/iso}/step_remove_cdrom.go | 0 {iso => builder/vsphere/iso}/step_remove_floppy.go | 0 .../vsphere/teamcity-services.yml | 0 {test => builder/vsphere/test}/lab.ovpn | 0 {test => builder/vsphere/test}/lab.p12 | Bin {test => builder/vsphere/test}/test-key.pem | 0 {test => builder/vsphere/test}/test-key.pub | 0 80 files changed, 0 insertions(+), 0 deletions(-) rename .gitignore => builder/vsphere/.gitignore (100%) rename LICENSE.txt => builder/vsphere/LICENSE.txt (100%) rename Makefile => builder/vsphere/Makefile (100%) rename README.md => builder/vsphere/README.md (100%) rename {clone => builder/vsphere/clone}/builder.go (100%) rename {clone => builder/vsphere/clone}/builder_acc_test.go (100%) rename {clone => builder/vsphere/clone}/builder_test.go (100%) rename {clone => builder/vsphere/clone}/config.go (100%) rename {clone => builder/vsphere/clone}/config_test.go (100%) rename {clone => builder/vsphere/clone}/leak_test.go (100%) rename {clone => builder/vsphere/clone}/step_clone.go (100%) rename {cmd => builder/vsphere/cmd}/clone/main.go (100%) rename {cmd => builder/vsphere/cmd}/iso/main.go (100%) rename {common => builder/vsphere/common}/artifact.go (100%) rename {common => builder/vsphere/common}/config_location.go (100%) rename {common => builder/vsphere/common}/config_ssh.go (100%) rename {common => builder/vsphere/common}/step_config_params.go (100%) rename {common => builder/vsphere/common}/step_connect.go (100%) rename {common => builder/vsphere/common}/step_hardware.go (100%) rename {common => builder/vsphere/common}/step_run.go (100%) rename {common => builder/vsphere/common}/step_shutdown.go (100%) rename {common => builder/vsphere/common}/step_snapshot.go (100%) rename {common => builder/vsphere/common}/step_template.go (100%) rename {common => builder/vsphere/common}/step_wait_for_ip.go (100%) rename {common => builder/vsphere/common}/testing/utility.go (100%) rename docker-compose.yml => builder/vsphere/docker-compose.yml (100%) rename {driver => builder/vsphere/driver}/datastore.go (100%) rename {driver => builder/vsphere/driver}/datastore_acc_test.go (100%) rename {driver => builder/vsphere/driver}/driver.go (100%) rename {driver => builder/vsphere/driver}/driver_test.go (100%) rename {driver => builder/vsphere/driver}/folder.go (100%) rename {driver => builder/vsphere/driver}/folder_acc_test.go (100%) rename {driver => builder/vsphere/driver}/host.go (100%) rename {driver => builder/vsphere/driver}/host_acc_test.go (100%) rename {driver => builder/vsphere/driver}/leak_test.go (100%) rename {driver => builder/vsphere/driver}/network.go (100%) rename {driver => builder/vsphere/driver}/resource_pool.go (100%) rename {driver => builder/vsphere/driver}/resource_pool_acc_test.go (100%) rename {driver => builder/vsphere/driver}/vm.go (100%) rename {driver => builder/vsphere/driver}/vm_cdrom.go (100%) rename {driver => builder/vsphere/driver}/vm_clone_acc_test.go (100%) rename {driver => builder/vsphere/driver}/vm_create_acc_test.go (100%) rename {driver => builder/vsphere/driver}/vm_keyboard.go (100%) rename {examples => builder/vsphere/examples}/alpine/alpine-3.8.json (100%) rename {examples => builder/vsphere/examples}/alpine/answerfile (100%) rename {examples => builder/vsphere/examples}/alpine/setup.sh (100%) rename {examples => builder/vsphere/examples}/clone/alpine.json (100%) rename {examples => builder/vsphere/examples}/driver/main.go (100%) rename {examples => builder/vsphere/examples}/macos/macos-10.13.json (100%) rename {examples => builder/vsphere/examples}/macos/setup/.gitignore (100%) rename {examples => builder/vsphere/examples}/macos/setup/iso-macos.sh (100%) rename {examples => builder/vsphere/examples}/macos/setup/iso-setup.sh (100%) rename {examples => builder/vsphere/examples}/macos/setup/postinstall (100%) rename {examples => builder/vsphere/examples}/macos/setup/setup.sh (100%) rename {examples => builder/vsphere/examples}/ubuntu/preseed.cfg (100%) rename {examples => builder/vsphere/examples}/ubuntu/ubuntu-16.04.json (100%) rename {examples => builder/vsphere/examples}/windows/.gitattributes (100%) rename {examples => builder/vsphere/examples}/windows/setup/Autounattend.xml (100%) rename {examples => builder/vsphere/examples}/windows/setup/setup.ps1 (100%) rename {examples => builder/vsphere/examples}/windows/setup/vmtools.cmd (100%) rename {examples => builder/vsphere/examples}/windows/windows-10.json (100%) rename go.mod => builder/vsphere/go.mod (100%) rename go.sum => builder/vsphere/go.sum (100%) rename gofmt.sh => builder/vsphere/gofmt.sh (100%) rename {iso => builder/vsphere/iso}/builder.go (100%) rename {iso => builder/vsphere/iso}/builder_acc_test.go (100%) rename {iso => builder/vsphere/iso}/config.go (100%) rename {iso => builder/vsphere/iso}/leak_test.go (100%) rename {iso => builder/vsphere/iso}/step_add_cdrom.go (100%) rename {iso => builder/vsphere/iso}/step_add_floppy.go (100%) rename {iso => builder/vsphere/iso}/step_boot_command.go (100%) rename {iso => builder/vsphere/iso}/step_create.go (100%) rename {iso => builder/vsphere/iso}/step_remote_upload.go (100%) rename {iso => builder/vsphere/iso}/step_remove_cdrom.go (100%) rename {iso => builder/vsphere/iso}/step_remove_floppy.go (100%) rename teamcity-services.yml => builder/vsphere/teamcity-services.yml (100%) rename {test => builder/vsphere/test}/lab.ovpn (100%) rename {test => builder/vsphere/test}/lab.p12 (100%) rename {test => builder/vsphere/test}/test-key.pem (100%) rename {test => builder/vsphere/test}/test-key.pub (100%) diff --git a/.gitignore b/builder/vsphere/.gitignore similarity index 100% rename from .gitignore rename to builder/vsphere/.gitignore diff --git a/LICENSE.txt b/builder/vsphere/LICENSE.txt similarity index 100% rename from LICENSE.txt rename to builder/vsphere/LICENSE.txt diff --git a/Makefile b/builder/vsphere/Makefile similarity index 100% rename from Makefile rename to builder/vsphere/Makefile diff --git a/README.md b/builder/vsphere/README.md similarity index 100% rename from README.md rename to builder/vsphere/README.md diff --git a/clone/builder.go b/builder/vsphere/clone/builder.go similarity index 100% rename from clone/builder.go rename to builder/vsphere/clone/builder.go diff --git a/clone/builder_acc_test.go b/builder/vsphere/clone/builder_acc_test.go similarity index 100% rename from clone/builder_acc_test.go rename to builder/vsphere/clone/builder_acc_test.go diff --git a/clone/builder_test.go b/builder/vsphere/clone/builder_test.go similarity index 100% rename from clone/builder_test.go rename to builder/vsphere/clone/builder_test.go diff --git a/clone/config.go b/builder/vsphere/clone/config.go similarity index 100% rename from clone/config.go rename to builder/vsphere/clone/config.go diff --git a/clone/config_test.go b/builder/vsphere/clone/config_test.go similarity index 100% rename from clone/config_test.go rename to builder/vsphere/clone/config_test.go diff --git a/clone/leak_test.go b/builder/vsphere/clone/leak_test.go similarity index 100% rename from clone/leak_test.go rename to builder/vsphere/clone/leak_test.go diff --git a/clone/step_clone.go b/builder/vsphere/clone/step_clone.go similarity index 100% rename from clone/step_clone.go rename to builder/vsphere/clone/step_clone.go diff --git a/cmd/clone/main.go b/builder/vsphere/cmd/clone/main.go similarity index 100% rename from cmd/clone/main.go rename to builder/vsphere/cmd/clone/main.go diff --git a/cmd/iso/main.go b/builder/vsphere/cmd/iso/main.go similarity index 100% rename from cmd/iso/main.go rename to builder/vsphere/cmd/iso/main.go diff --git a/common/artifact.go b/builder/vsphere/common/artifact.go similarity index 100% rename from common/artifact.go rename to builder/vsphere/common/artifact.go diff --git a/common/config_location.go b/builder/vsphere/common/config_location.go similarity index 100% rename from common/config_location.go rename to builder/vsphere/common/config_location.go diff --git a/common/config_ssh.go b/builder/vsphere/common/config_ssh.go similarity index 100% rename from common/config_ssh.go rename to builder/vsphere/common/config_ssh.go diff --git a/common/step_config_params.go b/builder/vsphere/common/step_config_params.go similarity index 100% rename from common/step_config_params.go rename to builder/vsphere/common/step_config_params.go diff --git a/common/step_connect.go b/builder/vsphere/common/step_connect.go similarity index 100% rename from common/step_connect.go rename to builder/vsphere/common/step_connect.go diff --git a/common/step_hardware.go b/builder/vsphere/common/step_hardware.go similarity index 100% rename from common/step_hardware.go rename to builder/vsphere/common/step_hardware.go diff --git a/common/step_run.go b/builder/vsphere/common/step_run.go similarity index 100% rename from common/step_run.go rename to builder/vsphere/common/step_run.go diff --git a/common/step_shutdown.go b/builder/vsphere/common/step_shutdown.go similarity index 100% rename from common/step_shutdown.go rename to builder/vsphere/common/step_shutdown.go diff --git a/common/step_snapshot.go b/builder/vsphere/common/step_snapshot.go similarity index 100% rename from common/step_snapshot.go rename to builder/vsphere/common/step_snapshot.go diff --git a/common/step_template.go b/builder/vsphere/common/step_template.go similarity index 100% rename from common/step_template.go rename to builder/vsphere/common/step_template.go diff --git a/common/step_wait_for_ip.go b/builder/vsphere/common/step_wait_for_ip.go similarity index 100% rename from common/step_wait_for_ip.go rename to builder/vsphere/common/step_wait_for_ip.go diff --git a/common/testing/utility.go b/builder/vsphere/common/testing/utility.go similarity index 100% rename from common/testing/utility.go rename to builder/vsphere/common/testing/utility.go diff --git a/docker-compose.yml b/builder/vsphere/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to builder/vsphere/docker-compose.yml diff --git a/driver/datastore.go b/builder/vsphere/driver/datastore.go similarity index 100% rename from driver/datastore.go rename to builder/vsphere/driver/datastore.go diff --git a/driver/datastore_acc_test.go b/builder/vsphere/driver/datastore_acc_test.go similarity index 100% rename from driver/datastore_acc_test.go rename to builder/vsphere/driver/datastore_acc_test.go diff --git a/driver/driver.go b/builder/vsphere/driver/driver.go similarity index 100% rename from driver/driver.go rename to builder/vsphere/driver/driver.go diff --git a/driver/driver_test.go b/builder/vsphere/driver/driver_test.go similarity index 100% rename from driver/driver_test.go rename to builder/vsphere/driver/driver_test.go diff --git a/driver/folder.go b/builder/vsphere/driver/folder.go similarity index 100% rename from driver/folder.go rename to builder/vsphere/driver/folder.go diff --git a/driver/folder_acc_test.go b/builder/vsphere/driver/folder_acc_test.go similarity index 100% rename from driver/folder_acc_test.go rename to builder/vsphere/driver/folder_acc_test.go diff --git a/driver/host.go b/builder/vsphere/driver/host.go similarity index 100% rename from driver/host.go rename to builder/vsphere/driver/host.go diff --git a/driver/host_acc_test.go b/builder/vsphere/driver/host_acc_test.go similarity index 100% rename from driver/host_acc_test.go rename to builder/vsphere/driver/host_acc_test.go diff --git a/driver/leak_test.go b/builder/vsphere/driver/leak_test.go similarity index 100% rename from driver/leak_test.go rename to builder/vsphere/driver/leak_test.go diff --git a/driver/network.go b/builder/vsphere/driver/network.go similarity index 100% rename from driver/network.go rename to builder/vsphere/driver/network.go diff --git a/driver/resource_pool.go b/builder/vsphere/driver/resource_pool.go similarity index 100% rename from driver/resource_pool.go rename to builder/vsphere/driver/resource_pool.go diff --git a/driver/resource_pool_acc_test.go b/builder/vsphere/driver/resource_pool_acc_test.go similarity index 100% rename from driver/resource_pool_acc_test.go rename to builder/vsphere/driver/resource_pool_acc_test.go diff --git a/driver/vm.go b/builder/vsphere/driver/vm.go similarity index 100% rename from driver/vm.go rename to builder/vsphere/driver/vm.go diff --git a/driver/vm_cdrom.go b/builder/vsphere/driver/vm_cdrom.go similarity index 100% rename from driver/vm_cdrom.go rename to builder/vsphere/driver/vm_cdrom.go diff --git a/driver/vm_clone_acc_test.go b/builder/vsphere/driver/vm_clone_acc_test.go similarity index 100% rename from driver/vm_clone_acc_test.go rename to builder/vsphere/driver/vm_clone_acc_test.go diff --git a/driver/vm_create_acc_test.go b/builder/vsphere/driver/vm_create_acc_test.go similarity index 100% rename from driver/vm_create_acc_test.go rename to builder/vsphere/driver/vm_create_acc_test.go diff --git a/driver/vm_keyboard.go b/builder/vsphere/driver/vm_keyboard.go similarity index 100% rename from driver/vm_keyboard.go rename to builder/vsphere/driver/vm_keyboard.go diff --git a/examples/alpine/alpine-3.8.json b/builder/vsphere/examples/alpine/alpine-3.8.json similarity index 100% rename from examples/alpine/alpine-3.8.json rename to builder/vsphere/examples/alpine/alpine-3.8.json diff --git a/examples/alpine/answerfile b/builder/vsphere/examples/alpine/answerfile similarity index 100% rename from examples/alpine/answerfile rename to builder/vsphere/examples/alpine/answerfile diff --git a/examples/alpine/setup.sh b/builder/vsphere/examples/alpine/setup.sh similarity index 100% rename from examples/alpine/setup.sh rename to builder/vsphere/examples/alpine/setup.sh diff --git a/examples/clone/alpine.json b/builder/vsphere/examples/clone/alpine.json similarity index 100% rename from examples/clone/alpine.json rename to builder/vsphere/examples/clone/alpine.json diff --git a/examples/driver/main.go b/builder/vsphere/examples/driver/main.go similarity index 100% rename from examples/driver/main.go rename to builder/vsphere/examples/driver/main.go diff --git a/examples/macos/macos-10.13.json b/builder/vsphere/examples/macos/macos-10.13.json similarity index 100% rename from examples/macos/macos-10.13.json rename to builder/vsphere/examples/macos/macos-10.13.json diff --git a/examples/macos/setup/.gitignore b/builder/vsphere/examples/macos/setup/.gitignore similarity index 100% rename from examples/macos/setup/.gitignore rename to builder/vsphere/examples/macos/setup/.gitignore diff --git a/examples/macos/setup/iso-macos.sh b/builder/vsphere/examples/macos/setup/iso-macos.sh similarity index 100% rename from examples/macos/setup/iso-macos.sh rename to builder/vsphere/examples/macos/setup/iso-macos.sh diff --git a/examples/macos/setup/iso-setup.sh b/builder/vsphere/examples/macos/setup/iso-setup.sh similarity index 100% rename from examples/macos/setup/iso-setup.sh rename to builder/vsphere/examples/macos/setup/iso-setup.sh diff --git a/examples/macos/setup/postinstall b/builder/vsphere/examples/macos/setup/postinstall similarity index 100% rename from examples/macos/setup/postinstall rename to builder/vsphere/examples/macos/setup/postinstall diff --git a/examples/macos/setup/setup.sh b/builder/vsphere/examples/macos/setup/setup.sh similarity index 100% rename from examples/macos/setup/setup.sh rename to builder/vsphere/examples/macos/setup/setup.sh diff --git a/examples/ubuntu/preseed.cfg b/builder/vsphere/examples/ubuntu/preseed.cfg similarity index 100% rename from examples/ubuntu/preseed.cfg rename to builder/vsphere/examples/ubuntu/preseed.cfg diff --git a/examples/ubuntu/ubuntu-16.04.json b/builder/vsphere/examples/ubuntu/ubuntu-16.04.json similarity index 100% rename from examples/ubuntu/ubuntu-16.04.json rename to builder/vsphere/examples/ubuntu/ubuntu-16.04.json diff --git a/examples/windows/.gitattributes b/builder/vsphere/examples/windows/.gitattributes similarity index 100% rename from examples/windows/.gitattributes rename to builder/vsphere/examples/windows/.gitattributes diff --git a/examples/windows/setup/Autounattend.xml b/builder/vsphere/examples/windows/setup/Autounattend.xml similarity index 100% rename from examples/windows/setup/Autounattend.xml rename to builder/vsphere/examples/windows/setup/Autounattend.xml diff --git a/examples/windows/setup/setup.ps1 b/builder/vsphere/examples/windows/setup/setup.ps1 similarity index 100% rename from examples/windows/setup/setup.ps1 rename to builder/vsphere/examples/windows/setup/setup.ps1 diff --git a/examples/windows/setup/vmtools.cmd b/builder/vsphere/examples/windows/setup/vmtools.cmd similarity index 100% rename from examples/windows/setup/vmtools.cmd rename to builder/vsphere/examples/windows/setup/vmtools.cmd diff --git a/examples/windows/windows-10.json b/builder/vsphere/examples/windows/windows-10.json similarity index 100% rename from examples/windows/windows-10.json rename to builder/vsphere/examples/windows/windows-10.json diff --git a/go.mod b/builder/vsphere/go.mod similarity index 100% rename from go.mod rename to builder/vsphere/go.mod diff --git a/go.sum b/builder/vsphere/go.sum similarity index 100% rename from go.sum rename to builder/vsphere/go.sum diff --git a/gofmt.sh b/builder/vsphere/gofmt.sh similarity index 100% rename from gofmt.sh rename to builder/vsphere/gofmt.sh diff --git a/iso/builder.go b/builder/vsphere/iso/builder.go similarity index 100% rename from iso/builder.go rename to builder/vsphere/iso/builder.go diff --git a/iso/builder_acc_test.go b/builder/vsphere/iso/builder_acc_test.go similarity index 100% rename from iso/builder_acc_test.go rename to builder/vsphere/iso/builder_acc_test.go diff --git a/iso/config.go b/builder/vsphere/iso/config.go similarity index 100% rename from iso/config.go rename to builder/vsphere/iso/config.go diff --git a/iso/leak_test.go b/builder/vsphere/iso/leak_test.go similarity index 100% rename from iso/leak_test.go rename to builder/vsphere/iso/leak_test.go diff --git a/iso/step_add_cdrom.go b/builder/vsphere/iso/step_add_cdrom.go similarity index 100% rename from iso/step_add_cdrom.go rename to builder/vsphere/iso/step_add_cdrom.go diff --git a/iso/step_add_floppy.go b/builder/vsphere/iso/step_add_floppy.go similarity index 100% rename from iso/step_add_floppy.go rename to builder/vsphere/iso/step_add_floppy.go diff --git a/iso/step_boot_command.go b/builder/vsphere/iso/step_boot_command.go similarity index 100% rename from iso/step_boot_command.go rename to builder/vsphere/iso/step_boot_command.go diff --git a/iso/step_create.go b/builder/vsphere/iso/step_create.go similarity index 100% rename from iso/step_create.go rename to builder/vsphere/iso/step_create.go diff --git a/iso/step_remote_upload.go b/builder/vsphere/iso/step_remote_upload.go similarity index 100% rename from iso/step_remote_upload.go rename to builder/vsphere/iso/step_remote_upload.go diff --git a/iso/step_remove_cdrom.go b/builder/vsphere/iso/step_remove_cdrom.go similarity index 100% rename from iso/step_remove_cdrom.go rename to builder/vsphere/iso/step_remove_cdrom.go diff --git a/iso/step_remove_floppy.go b/builder/vsphere/iso/step_remove_floppy.go similarity index 100% rename from iso/step_remove_floppy.go rename to builder/vsphere/iso/step_remove_floppy.go diff --git a/teamcity-services.yml b/builder/vsphere/teamcity-services.yml similarity index 100% rename from teamcity-services.yml rename to builder/vsphere/teamcity-services.yml diff --git a/test/lab.ovpn b/builder/vsphere/test/lab.ovpn similarity index 100% rename from test/lab.ovpn rename to builder/vsphere/test/lab.ovpn diff --git a/test/lab.p12 b/builder/vsphere/test/lab.p12 similarity index 100% rename from test/lab.p12 rename to builder/vsphere/test/lab.p12 diff --git a/test/test-key.pem b/builder/vsphere/test/test-key.pem similarity index 100% rename from test/test-key.pem rename to builder/vsphere/test/test-key.pem diff --git a/test/test-key.pub b/builder/vsphere/test/test-key.pub similarity index 100% rename from test/test-key.pub rename to builder/vsphere/test/test-key.pub