From 7d658149ea392f9d5787fe367944d03ccb27c5b9 Mon Sep 17 00:00:00 2001
From: Megan Marsh <megan@hashicorp.com>
Date: Thu, 12 Nov 2020 14:44:02 -0800
Subject: [PATCH] update tests and website and generated partials to reflect
 new package format

---
 .github/CONTRIBUTING.md                       |   2 +-
 Makefile                                      |   4 +--
 builder/alicloud/ecs/builder.go               |   4 +--
 builder/alicloud/ecs/run_config.go            |   2 +-
 builder/alicloud/ecs/step_config_eip.go       |   2 +-
 .../ecs/step_config_security_group.go         |   2 +-
 builder/alicloud/ecs/step_config_vpc.go       |   2 +-
 builder/alicloud/ecs/step_config_vswitch.go   |   2 +-
 builder/alicloud/ecs/step_create_image.go     |   4 +--
 builder/alicloud/ecs/step_create_instance.go  |   2 +-
 builder/amazon/chroot/builder.go              |   8 ++---
 builder/amazon/chroot/copy_files_test.go      |   2 +-
 .../amazon/chroot/step_attach_volume_test.go  |   2 +-
 builder/amazon/chroot/step_early_unflock.go   |   2 +-
 builder/amazon/chroot/step_flock_test.go      |   2 +-
 builder/amazon/chroot/step_mount_device.go    |   4 +--
 .../amazon/chroot/step_mount_device_test.go   |   2 +-
 builder/amazon/chroot/step_prepare_device.go  |   2 +-
 builder/amazon/chroot/step_register_ami.go    |   2 +-
 .../amazon/chroot/step_register_ami_test.go   |   2 +-
 builder/amazon/common/helper_funcs.go         |   2 +-
 .../amazon/common/interpolate_build_info.go   |   2 +-
 .../common/interpolate_build_info_test.go     |   2 +-
 builder/amazon/common/run_config.go           |   2 +-
 builder/amazon/common/ssm/session.go          |   4 +--
 .../amazon/common/step_create_ssm_tunnel.go   |   2 +-
 builder/amazon/common/step_create_tags.go     |   2 +-
 builder/amazon/common/step_get_password.go    |   2 +-
 .../common/step_iam_instance_profile.go       |   2 +-
 builder/amazon/common/step_key_pair.go        |   2 +-
 .../common/step_modify_ami_attributes.go      |   2 +-
 builder/amazon/common/step_pre_validate.go    |   2 +-
 .../amazon/common/step_run_source_instance.go |   2 +-
 .../amazon/common/step_run_spot_instance.go   |   4 +--
 builder/amazon/common/step_security_group.go  |   2 +-
 .../amazon/common/step_set_generated_data.go  |   2 +-
 .../amazon/common/step_stop_ebs_instance.go   |   2 +-
 builder/amazon/common/tags.go                 |   2 +-
 builder/amazon/ebs/builder.go                 |   6 ++--
 builder/amazon/ebs/step_create_ami.go         |   4 +--
 builder/amazon/ebssurrogate/builder.go        |   6 ++--
 .../amazon/ebssurrogate/step_register_ami.go  |   2 +-
 builder/amazon/ebsvolume/builder.go           |   6 ++--
 builder/amazon/instance/builder.go            |   6 ++--
 builder/amazon/instance/step_register_ami.go  |   2 +-
 .../azure/arm/azure_error_response_test.go    |   2 +-
 builder/azure/arm/builder.go                  |   2 +-
 builder/azure/arm/config.go                   |   4 +--
 builder/azure/arm/step_deploy_template.go     |   2 +-
 builder/azure/arm/tempname.go                 |   2 +-
 builder/azure/arm/tempname_test.go            |   2 +-
 builder/azure/chroot/builder.go               |   6 ++--
 builder/azure/chroot/step_mount_device.go     |   2 +-
 .../azure/chroot/step_mount_device_test.go    |   2 +-
 .../azure/dtl/azure_error_response_test.go    |   2 +-
 builder/azure/dtl/builder.go                  |   2 +-
 builder/azure/dtl/config.go                   |   2 +-
 builder/azure/dtl/template_funcs.go           |   2 +-
 builder/azure/dtl/tempname.go                 |   2 +-
 builder/cloudstack/builder.go                 |   2 +-
 builder/cloudstack/config.go                  |   6 ++--
 .../cloudstack/step_create_security_group.go  |   2 +-
 builder/digitalocean/builder.go               |   2 +-
 builder/digitalocean/config.go                |   4 +--
 builder/digitalocean/step_create_ssh_key.go   |   2 +-
 builder/docker/builder.go                     |   4 +--
 builder/docker/config.go                      |   2 +-
 builder/docker/exec.go                        |   2 +-
 builder/docker/step_set_generated_data.go     |   2 +-
 .../docker/step_set_generated_data_test.go    |   2 +-
 builder/file/config.go                        |   2 +-
 builder/googlecompute/builder.go              |   2 +-
 builder/googlecompute/config.go               |   4 +--
 builder/googlecompute/driver_gce.go           |   2 +-
 builder/googlecompute/step_start_tunnel.go    |   4 +--
 .../googlecompute/step_wait_startup_script.go |   2 +-
 builder/hcloud/builder.go                     |   2 +-
 builder/hcloud/config.go                      |   4 +--
 builder/hcloud/step_create_sshkey.go          |   2 +-
 builder/hyperone/builder.go                   |   2 +-
 builder/hyperone/config.go                    |   6 ++--
 builder/hyperone/step_chroot_provision.go     |   2 +-
 builder/hyperone/token_by_ssh.go              |   2 +-
 builder/hyperv/common/config.go               |   4 +--
 builder/hyperv/common/output_config.go        |   2 +-
 builder/hyperv/common/output_config_test.go   |   2 +-
 .../common/step_create_external_switch.go     |   2 +-
 builder/hyperv/common/step_test.go            |   2 +-
 .../hyperv/common/step_type_boot_command.go   |   2 +-
 builder/hyperv/iso/builder.go                 |   8 ++---
 builder/hyperv/iso/builder_test.go            |   2 +-
 builder/hyperv/vmcx/builder.go                |   8 ++---
 builder/hyperv/vmcx/builder_test.go           |   2 +-
 builder/jdcloud/builder.go                    |   2 +-
 builder/jdcloud/common.go                     |   2 +-
 builder/linode/builder.go                     |   2 +-
 builder/linode/config.go                      |   2 +-
 builder/lxc/builder.go                        |   2 +-
 builder/lxc/config.go                         |   2 +-
 builder/lxc/step_provision.go                 |   2 +-
 builder/lxd/builder.go                        |   2 +-
 builder/lxd/config.go                         |   2 +-
 builder/lxd/step_provision.go                 |   2 +-
 builder/ncloud/builder.go                     |   2 +-
 builder/ncloud/config.go                      |   2 +-
 builder/null/builder.go                       |   2 +-
 builder/null/config.go                        |   2 +-
 builder/oneandone/builder.go                  |   2 +-
 builder/oneandone/config.go                   |   2 +-
 builder/openstack/builder.go                  |   4 +--
 builder/openstack/run_config.go               |   2 +-
 builder/oracle/classic/builder.go             |   2 +-
 builder/oracle/classic/config.go              |   2 +-
 .../classic/step_create_ip_reservation.go     |   2 +-
 builder/oracle/oci/builder.go                 |   2 +-
 builder/oracle/oci/config.go                  |   2 +-
 builder/osc/bsu/builder.go                    |   4 +--
 builder/osc/bsusurrogate/builder.go           |   4 +--
 builder/osc/bsuvolume/builder.go              |   4 +--
 builder/osc/chroot/builder.go                 |   4 +--
 builder/osc/chroot/run_local_commands.go      |   2 +-
 builder/osc/chroot/step_chroot_provision.go   |   2 +-
 builder/osc/common/run_config.go              |   2 +-
 builder/osc/common/step_security_group.go     |   2 +-
 builder/parallels/common/output_config.go     |   2 +-
 .../parallels/common/output_config_test.go    |   2 +-
 .../common/step_type_boot_command.go          |   2 +-
 builder/parallels/iso/builder.go              |   8 ++---
 builder/parallels/iso/builder_test.go         |   2 +-
 builder/parallels/pvm/builder.go              |   2 +-
 builder/parallels/pvm/config.go               |   8 ++---
 builder/parallels/pvm/config_test.go          |   2 +-
 builder/profitbricks/builder.go               |   2 +-
 builder/profitbricks/config.go                |   2 +-
 builder/proxmox/clone/step_ssh_key_pair.go    |   2 +-
 builder/proxmox/common/bootcommand_driver.go  |   2 +-
 builder/proxmox/common/builder.go             |   2 +-
 builder/proxmox/common/config.go              |   8 ++---
 .../proxmox/common/step_type_boot_command.go  |   2 +-
 .../common/step_type_boot_command_test.go     |   2 +-
 builder/proxmox/iso/builder.go                |   2 +-
 builder/proxmox/iso/config.go                 |   2 +-
 builder/proxmox/iso/step_upload_iso_test.go   |   2 +-
 builder/qemu/builder.go                       |   2 +-
 builder/qemu/config.go                        |   8 ++---
 builder/qemu/config_test.go                   |   2 +-
 builder/qemu/step_configure_vnc.go            |   2 +-
 builder/qemu/step_convert_disk.go             |   2 +-
 builder/qemu/step_port_forward.go             |   2 +-
 builder/qemu/step_run_test.go                 |   2 +-
 builder/qemu/step_set_iso.go                  |   2 +-
 builder/qemu/step_type_boot_command.go        |   2 +-
 builder/scaleway/builder.go                   |   2 +-
 builder/scaleway/config.go                    |   4 +--
 builder/tencentcloud/cvm/builder.go           |   4 +--
 builder/tencentcloud/cvm/common.go            |   2 +-
 builder/tencentcloud/cvm/run_config.go        |   2 +-
 builder/triton/builder.go                     |   2 +-
 builder/triton/config.go                      |   2 +-
 builder/ucloud/common/run_config.go           |   2 +-
 builder/ucloud/uhost/builder.go               |   4 +--
 builder/ucloud/uhost/step_copy_image.go       |   2 +-
 builder/ucloud/uhost/step_create_image.go     |   2 +-
 builder/ucloud/uhost/step_create_instance.go  |   2 +-
 builder/ucloud/uhost/step_stop_instance.go    |   2 +-
 builder/vagrant/builder.go                    |   6 ++--
 builder/virtualbox/common/driver_4_2.go       |   2 +-
 builder/virtualbox/common/output_config.go    |   2 +-
 .../virtualbox/common/output_config_test.go   |   2 +-
 .../virtualbox/common/step_configure_vrdp.go  |   2 +-
 .../common/step_download_guest_additions.go   |   2 +-
 .../virtualbox/common/step_port_forwarding.go |   2 +-
 .../virtualbox/common/step_remove_devices.go  |   2 +-
 .../virtualbox/common/step_ssh_key_pair.go    |   2 +-
 .../common/step_type_boot_command.go          |   2 +-
 builder/virtualbox/iso/builder.go             |   6 ++--
 builder/virtualbox/iso/builder_test.go        |   2 +-
 builder/virtualbox/ovf/builder.go             |   2 +-
 builder/virtualbox/ovf/config.go              |   6 ++--
 builder/virtualbox/ovf/config_test.go         |   2 +-
 builder/virtualbox/vm/builder.go              |   2 +-
 builder/virtualbox/vm/config.go               |   6 ++--
 builder/vmware/common/output_config.go        |   2 +-
 builder/vmware/common/output_config_test.go   |   2 +-
 builder/vmware/common/run_config_test.go      |   2 +-
 builder/vmware/common/step_configure_vnc.go   |   2 +-
 .../vmware/common/step_vnc_boot_command.go    |   2 +-
 builder/vmware/iso/builder.go                 |   2 +-
 builder/vmware/iso/builder_test.go            |   2 +-
 builder/vmware/iso/config.go                  |   8 ++---
 builder/vmware/vmx/builder.go                 |   2 +-
 builder/vmware/vmx/builder_test.go            |   2 +-
 builder/vmware/vmx/config.go                  |   8 ++---
 builder/vsphere/clone/builder.go              |   2 +-
 builder/vsphere/clone/config.go               |   4 +--
 builder/vsphere/common/output_config.go       |   2 +-
 builder/vsphere/common/step_boot_command.go   |   2 +-
 builder/vsphere/common/step_export.go         |   2 +-
 builder/vsphere/common/step_ssh_key_pair.go   |   2 +-
 builder/vsphere/iso/builder.go                |   2 +-
 builder/vsphere/iso/config.go                 |   4 +--
 builder/yandex/builder.go                     |   4 +--
 builder/yandex/config.go                      |   4 +--
 builder/yandex/step_create_image.go           |   2 +-
 builder/yandex/step_create_instance.go        |   4 +--
 builder/yandex/step_wait_cloudinit_script.go  |   2 +-
 hcl2template/function/Consul.go               |   2 +-
 hcl2template/function/aws_secretetkey.go      |   2 +-
 hcl2template/function/vault.go                |   2 +-
 helper/ssh/key_pair_test.go                   |   2 +-
 main.go                                       |   2 +-
 .../adapter/adapter.go                        |   0
 .../adapter/adapter_test.go                   |   0
 {common => packer-plugin-sdk}/adapter/doc.go  |   0
 {common => packer-plugin-sdk}/adapter/scp.go  |   0
 .../bootcommand/boot_command.go               |   0
 .../bootcommand/boot_command.pigeon           |   0
 .../bootcommand/boot_command_ast.go           |   0
 .../bootcommand/boot_command_ast_test.go      |   0
 .../bootcommand/config.go                     |   0
 .../bootcommand/config_test.go                |   0
 .../bootcommand/doc.go                        |   0
 .../bootcommand/driver.go                     |   0
 .../bootcommand/gen.go                        |   0
 .../bootcommand/pc_xt_driver.go               |   0
 .../bootcommand/pc_xt_driver_test.go          |   0
 .../bootcommand/usb_driver.go                 |   0
 .../bootcommand/usb_driver_test.go            |   0
 .../bootcommand/vnc_driver.go                 |   0
 .../bootcommand/vnc_driver_test.go            |   0
 .../chroot/cleanup.go                         |   0
 .../chroot/communicator.go                    |   2 +-
 .../chroot/communicator_test.go               |   0
 {common => packer-plugin-sdk}/chroot/doc.go   |   0
 .../chroot/interpolate_context_provider.go    |   0
 .../chroot/run_local_commands.go              |   4 +--
 .../chroot/step_chroot_provision.go           |   4 +--
 .../chroot/step_copy_files.go                 |   2 +-
 .../chroot/step_copy_files_test.go            |   2 +-
 .../chroot/step_early_cleanup.go              |   0
 .../chroot/step_mount_extra.go                |   2 +-
 .../chroot/step_mount_extra_test.go           |   0
 .../chroot/step_post_mount_commands.go        |   2 +-
 .../chroot/step_pre_mount_commands.go         |   2 +-
 .../common}/command.go                        |   0
 .../common}/packer_config.go                  |   0
 .../commonsteps/doc.go                        |   0
 .../commonsteps/extra_iso_config.go           |   0
 .../commonsteps/extra_iso_config_test.go      |   0
 .../commonsteps/floppy_config.go              |   0
 .../commonsteps/floppy_config_test.go         |   0
 .../commonsteps/http_config.go                |   0
 .../commonsteps/http_config_test.go           |   0
 .../commonsteps/iso_config.go                 |   0
 .../commonsteps/iso_config_test.go            |   0
 .../commonsteps/multistep_debug.go            |   0
 .../commonsteps/multistep_runner.go           |   2 +-
 .../commonsteps/step_cleanup_temp_keys.go     |   0
 .../commonsteps/step_create_cdrom.go          |   2 +-
 .../commonsteps/step_create_cdrom_test.go     |   0
 .../commonsteps/step_create_floppy.go         |   0
 .../commonsteps/step_create_floppy_test.go    |   0
 .../commonsteps/step_download.go              |   2 +-
 .../commonsteps/step_download_test.go         |   0
 .../commonsteps/step_http_server.go           |   2 +-
 .../commonsteps/step_output_dir.go            |   0
 .../commonsteps/step_output_dir_test.go       |   0
 .../commonsteps/step_provision.go             |   0
 .../commonsteps/step_provision_test.go        |   0
 .../test-fixtures/SomeDir/myfile.txt          |   0
 .../test-fixtures/floppy-hier/test-0/file1    |   0
 .../test-fixtures/floppy-hier/test-0/file2    |   0
 .../test-fixtures/floppy-hier/test-0/file3    |   0
 .../floppy-hier/test-1/dir1/file1             |   0
 .../floppy-hier/test-1/dir1/file2             |   0
 .../floppy-hier/test-1/dir1/file3             |   0
 .../floppy-hier/test-2/dir1/file1             |   0
 .../floppy-hier/test-2/dir1/subdir1/file1     |   0
 .../floppy-hier/test-2/dir1/subdir1/file2     |   0
 .../floppy-hier/test-2/dir2/subdir1/file1     |   0
 .../floppy-hier/test-2/dir2/subdir1/file2     |   0
 .../test-fixtures/root/another.txt            |   0
 .../test-fixtures/root/another.txt.sha1sum    |   0
 .../commonsteps/test-fixtures/root/basic.txt  |   0
 .../test-fixtures/root/basic.txt.sha1sum      |   0
 .../test-fixtures/root/subfolder.sum          |   0
 {common => packer-plugin-sdk}/filelock/doc.go |   0
 .../filelock/filelock.go                      |   0
 .../filelock/filelock_solaris.go              |   0
 .../filelock/noop.go                          |   0
 .../guestexec/doc.go                          |   0
 .../guestexec/elevated.go                     |   2 +-
 .../guestexec/elevated_test.go                |   0
 .../guestexec/guest_commands.go               |   0
 .../guestexec/guest_commands_test.go          |   0
 .../iochan/iochan.go                          |   0
 .../iochan/iochan_test.go                     |   0
 .../json/unmarshal.go                         |   0
 .../json/unmarshal_test.go                    |   0
 .../net/configure_port.go                     |   4 +--
 .../net/configure_port_test.go                |   0
 .../net/default_client.go                     |   0
 .../packerbuilderdata/generated_data.go       |   0
 .../packerbuilderdata/generated_data_test.go  |   0
 .../random/string.go                          |   0
 {common => packer-plugin-sdk}/retry/retry.go  |   0
 .../retry/retry_test.go                       |   0
 .../retry/utils_test.go                       |   0
 .../shell-local/communicator.go               |   0
 .../shell-local/communicator_test.go          |   0
 .../shell-local/config.go                     |   2 +-
 .../shell-local/config.hcl2spec.go            |   0
 .../shell-local/config_test.go                |   0
 .../shell-local/doc.go                        |   0
 .../shell-local/localexec/run_and_stream.go   |   2 +-
 .../localexec/run_and_stream_test.go          |   0
 .../shell-local/run.go                        |   2 +-
 .../shell/exit_code.go                        |   0
 .../shell/exit_code_test.go                   |   0
 {common => packer-plugin-sdk}/shell/shell.go  |   2 +-
 .../shutdowncommand/config.go                 |   0
 .../shutdowncommand/config_test.go            |   0
 .../template/funcs.go                         |   0
 .../template/interpolate/funcs.go             |   6 ++--
 .../template/interpolate/funcs_test.go        |   2 +-
 .../test-fixtures/SomeDir/myfile.txt          |   0
 .../decompress-tar/outside_parent.tar         | Bin
 .../test-fixtures/floppies/bar.bat            |   0
 .../test-fixtures/floppies/foo.ps1            |   0
 .../test-fixtures/floppy-hier/test-0/file1    |   0
 .../test-fixtures/floppy-hier/test-0/file2    |   0
 .../test-fixtures/floppy-hier/test-0/file3    |   0
 .../floppy-hier/test-1/dir1/file1             |   0
 .../floppy-hier/test-1/dir1/file2             |   0
 .../floppy-hier/test-1/dir1/file3             |   0
 .../floppy-hier/test-2/dir1/file1             |   0
 .../floppy-hier/test-2/dir1/subdir1/file1     |   0
 .../floppy-hier/test-2/dir1/subdir1/file2     |   0
 .../floppy-hier/test-2/dir2/subdir1/file1     |   0
 .../floppy-hier/test-2/dir2/subdir1/file2     |   0
 {common => packer-plugin-sdk}/uuid/uuid.go    |   0
 .../uuid/uuid_test.go                         |   0
 packer/build.go                               |   2 +-
 packer/build_test.go                          |   2 +-
 packer/communicator_test.go                   |   2 +-
 packer/provisioner.go                         |   2 +-
 packer/rpc/ui_progress_tracking.go            |   2 +-
 .../amazon-import/post-processor.go           |   4 +--
 post-processor/artifice/post-processor.go     |   2 +-
 post-processor/checksum/post-processor.go     |   2 +-
 post-processor/compress/post-processor.go     |   2 +-
 .../digitalocean-import/post-processor.go     |   2 +-
 .../docker-import/post-processor.go           |   2 +-
 post-processor/docker-push/post-processor.go  |   2 +-
 post-processor/docker-save/post-processor.go  |   2 +-
 post-processor/docker-tag/post-processor.go   |   2 +-
 .../exoscale-import/post-processor.go         |   2 +-
 .../googlecompute-export/post-processor.go    |   4 +--
 .../googlecompute-import/post-processor.go    |   2 +-
 post-processor/manifest/post-processor.go     |   2 +-
 post-processor/shell-local/post-processor.go  |   2 +-
 .../ucloud-import/post-processor.go           |   4 +--
 post-processor/vagrant-cloud/client.go        |   2 +-
 .../vagrant-cloud/post-processor.go           |   4 +--
 post-processor/vagrant-cloud/step_upload.go   |   2 +-
 post-processor/vagrant/post-processor.go      |   2 +-
 post-processor/vagrant/virtualbox_test.go     |   2 +-
 .../vsphere-template/post-processor.go        |   4 +--
 post-processor/vsphere/post-processor.go      |   4 +--
 .../yandex-export/post-processor.go           |   6 ++--
 .../yandex-import/post-processor.go           |   2 +-
 provisioner/ansible-local/provisioner.go      |   4 +--
 provisioner/ansible/provisioner.go            |   6 ++--
 provisioner/ansible/provisioner_test.go       |   2 +-
 provisioner/azure-dtlartifact/provisioner.go  |   2 +-
 provisioner/breakpoint/provisioner.go         |   2 +-
 provisioner/chef-client/provisioner.go        |   6 ++--
 provisioner/chef-solo/provisioner.go          |   4 +--
 provisioner/converge/provisioner.go           |   2 +-
 provisioner/file/provisioner.go               |   2 +-
 provisioner/inspec/provisioner.go             |   4 +--
 provisioner/powershell/provisioner.go         |  10 +++----
 provisioner/powershell/provisioner_test.go    |   2 +-
 provisioner/puppet-masterless/provisioner.go  |   4 +--
 provisioner/puppet-server/provisioner.go      |   4 +--
 provisioner/salt-masterless/provisioner.go    |   4 +--
 provisioner/shell-local/provisioner.go        |   2 +-
 provisioner/shell/provisioner.go              |   6 ++--
 provisioner/shell/provisioner_test.go         |   2 +-
 provisioner/windows-restart/provisioner.go    |   4 +--
 provisioner/windows-shell/provisioner.go      |   6 ++--
 provisioner/windows-shell/provisioner_test.go |   2 +-
 website/pages/docs/builders/cloudstack.mdx    |   4 +--
 website/pages/docs/builders/hyperv/iso.mdx    |  22 +++++++-------
 website/pages/docs/builders/hyperv/vmcx.mdx   |  14 ++++-----
 website/pages/docs/builders/parallels/iso.mdx |   6 ++--
 website/pages/docs/builders/proxmox/iso.mdx   |   4 +--
 website/pages/docs/builders/qemu.mdx          |  28 +++++++++---------
 .../pages/docs/builders/virtualbox/iso.mdx    |  22 +++++++-------
 .../pages/docs/builders/virtualbox/ovf.mdx    |  16 +++++-----
 website/pages/docs/builders/virtualbox/vm.mdx |  16 +++++-----
 website/pages/docs/builders/vmware/iso.mdx    |  26 ++++++++--------
 website/pages/docs/builders/vmware/vmx.mdx    |  22 +++++++-------
 .../docs/builders/vmware/vsphere-clone.mdx    |  12 ++++----
 .../docs/builders/vmware/vsphere-iso.mdx      |  18 +++++------
 .../bootcommand/BootConfig-not-required.mdx   |   2 +-
 .../bootcommand/BootConfig.mdx                |   2 +-
 .../bootcommand/VNCConfig-not-required.mdx    |   2 +-
 .../bootcommand/VNCConfig.mdx                 |   2 +-
 .../commonsteps/CDConfig-not-required.mdx     |   2 +-
 .../commonsteps/CDConfig.mdx                  |   2 +-
 .../commonsteps/FloppyConfig-not-required.mdx |   2 +-
 .../commonsteps/FloppyConfig.mdx              |   2 +-
 .../commonsteps/HTTPConfig-not-required.mdx   |   2 +-
 .../commonsteps/HTTPConfig.mdx                |   2 +-
 .../commonsteps/ISOConfig-not-required.mdx    |   2 +-
 .../commonsteps/ISOConfig-required.mdx        |   2 +-
 .../commonsteps/ISOConfig.mdx                 |   2 +-
 .../ShutdownConfig-not-required.mdx           |   2 +-
 .../shutdowncommand/ShutdownConfig.mdx        |   9 ++++++
 420 files changed, 517 insertions(+), 508 deletions(-)
 rename {common => packer-plugin-sdk}/adapter/adapter.go (100%)
 rename {common => packer-plugin-sdk}/adapter/adapter_test.go (100%)
 rename {common => packer-plugin-sdk}/adapter/doc.go (100%)
 rename {common => packer-plugin-sdk}/adapter/scp.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/boot_command.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/boot_command.pigeon (100%)
 rename {common => packer-plugin-sdk}/bootcommand/boot_command_ast.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/boot_command_ast_test.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/config.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/config_test.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/doc.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/driver.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/gen.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/pc_xt_driver.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/pc_xt_driver_test.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/usb_driver.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/usb_driver_test.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/vnc_driver.go (100%)
 rename {common => packer-plugin-sdk}/bootcommand/vnc_driver_test.go (100%)
 rename {common => packer-plugin-sdk}/chroot/cleanup.go (100%)
 rename {common => packer-plugin-sdk}/chroot/communicator.go (98%)
 rename {common => packer-plugin-sdk}/chroot/communicator_test.go (100%)
 rename {common => packer-plugin-sdk}/chroot/doc.go (100%)
 rename {common => packer-plugin-sdk}/chroot/interpolate_context_provider.go (100%)
 rename {common => packer-plugin-sdk}/chroot/run_local_commands.go (89%)
 rename {common => packer-plugin-sdk}/chroot/step_chroot_provision.go (91%)
 rename {common => packer-plugin-sdk}/chroot/step_copy_files.go (97%)
 rename {common => packer-plugin-sdk}/chroot/step_copy_files_test.go (98%)
 rename {common => packer-plugin-sdk}/chroot/step_early_cleanup.go (100%)
 rename {common => packer-plugin-sdk}/chroot/step_mount_extra.go (98%)
 rename {common => packer-plugin-sdk}/chroot/step_mount_extra_test.go (100%)
 rename {common => packer-plugin-sdk}/chroot/step_post_mount_commands.go (95%)
 rename {common => packer-plugin-sdk}/chroot/step_pre_mount_commands.go (95%)
 rename {common => packer-plugin-sdk/common}/command.go (100%)
 rename {common => packer-plugin-sdk/common}/packer_config.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/doc.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/extra_iso_config.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/extra_iso_config_test.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/floppy_config.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/floppy_config_test.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/http_config.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/http_config_test.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/iso_config.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/iso_config_test.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/multistep_debug.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/multistep_runner.go (98%)
 rename {common => packer-plugin-sdk}/commonsteps/step_cleanup_temp_keys.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/step_create_cdrom.go (99%)
 rename {common => packer-plugin-sdk}/commonsteps/step_create_cdrom_test.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/step_create_floppy.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/step_create_floppy_test.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/step_download.go (99%)
 rename {common => packer-plugin-sdk}/commonsteps/step_download_test.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/step_http_server.go (96%)
 rename {common => packer-plugin-sdk}/commonsteps/step_output_dir.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/step_output_dir_test.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/step_provision.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/step_provision_test.go (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/SomeDir/myfile.txt (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-0/file1 (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-0/file2 (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-0/file3 (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/root/another.txt (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/root/another.txt.sha1sum (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/root/basic.txt (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/root/basic.txt.sha1sum (100%)
 rename {common => packer-plugin-sdk}/commonsteps/test-fixtures/root/subfolder.sum (100%)
 rename {common => packer-plugin-sdk}/filelock/doc.go (100%)
 rename {common => packer-plugin-sdk}/filelock/filelock.go (100%)
 rename {common => packer-plugin-sdk}/filelock/filelock_solaris.go (100%)
 rename {common => packer-plugin-sdk}/filelock/noop.go (100%)
 rename {common => packer-plugin-sdk}/guestexec/doc.go (100%)
 rename {common => packer-plugin-sdk}/guestexec/elevated.go (99%)
 rename {common => packer-plugin-sdk}/guestexec/elevated_test.go (100%)
 rename {common => packer-plugin-sdk}/guestexec/guest_commands.go (100%)
 rename {common => packer-plugin-sdk}/guestexec/guest_commands_test.go (100%)
 rename {common => packer-plugin-sdk}/iochan/iochan.go (100%)
 rename {common => packer-plugin-sdk}/iochan/iochan_test.go (100%)
 rename {common => packer-plugin-sdk}/json/unmarshal.go (100%)
 rename {common => packer-plugin-sdk}/json/unmarshal_test.go (100%)
 rename {common => packer-plugin-sdk}/net/configure_port.go (96%)
 rename {common => packer-plugin-sdk}/net/configure_port_test.go (100%)
 rename {common => packer-plugin-sdk}/net/default_client.go (100%)
 rename {common => packer-plugin-sdk}/packerbuilderdata/generated_data.go (100%)
 rename {common => packer-plugin-sdk}/packerbuilderdata/generated_data_test.go (100%)
 rename {common => packer-plugin-sdk}/random/string.go (100%)
 rename {common => packer-plugin-sdk}/retry/retry.go (100%)
 rename {common => packer-plugin-sdk}/retry/retry_test.go (100%)
 rename {common => packer-plugin-sdk}/retry/utils_test.go (100%)
 rename {common => packer-plugin-sdk}/shell-local/communicator.go (100%)
 rename {common => packer-plugin-sdk}/shell-local/communicator_test.go (100%)
 rename {common => packer-plugin-sdk}/shell-local/config.go (99%)
 rename {common => packer-plugin-sdk}/shell-local/config.hcl2spec.go (100%)
 rename {common => packer-plugin-sdk}/shell-local/config_test.go (100%)
 rename {common => packer-plugin-sdk}/shell-local/doc.go (100%)
 rename {common => packer-plugin-sdk}/shell-local/localexec/run_and_stream.go (97%)
 rename {common => packer-plugin-sdk}/shell-local/localexec/run_and_stream_test.go (100%)
 rename {common => packer-plugin-sdk}/shell-local/run.go (99%)
 rename {common => packer-plugin-sdk}/shell/exit_code.go (100%)
 rename {common => packer-plugin-sdk}/shell/exit_code_test.go (100%)
 rename {common => packer-plugin-sdk}/shell/shell.go (97%)
 rename {common => packer-plugin-sdk}/shutdowncommand/config.go (100%)
 rename {common => packer-plugin-sdk}/shutdowncommand/config_test.go (100%)
 rename {common => packer-plugin-sdk}/template/funcs.go (100%)
 create mode 100644 packer-plugin-sdk/test-fixtures/SomeDir/myfile.txt
 rename {common => packer-plugin-sdk}/test-fixtures/decompress-tar/outside_parent.tar (100%)
 rename {common => packer-plugin-sdk}/test-fixtures/floppies/bar.bat (100%)
 rename {common => packer-plugin-sdk}/test-fixtures/floppies/foo.ps1 (100%)
 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file1
 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file2
 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file3
 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file1
 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file2
 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file3
 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/file1
 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1
 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2
 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1
 create mode 100644 packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2
 rename {common => packer-plugin-sdk}/uuid/uuid.go (100%)
 rename {common => packer-plugin-sdk}/uuid/uuid_test.go (100%)
 rename website/pages/partials/{common => packer-plugin-sdk}/bootcommand/BootConfig-not-required.mdx (94%)
 rename website/pages/partials/{common => packer-plugin-sdk}/bootcommand/BootConfig.mdx (98%)
 rename website/pages/partials/{common => packer-plugin-sdk}/bootcommand/VNCConfig-not-required.mdx (81%)
 rename website/pages/partials/{common => packer-plugin-sdk}/bootcommand/VNCConfig.mdx (87%)
 rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/CDConfig-not-required.mdx (95%)
 rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/CDConfig.mdx (86%)
 rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/FloppyConfig-not-required.mdx (92%)
 rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/FloppyConfig.mdx (88%)
 rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/HTTPConfig-not-required.mdx (93%)
 rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/HTTPConfig.mdx (83%)
 rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/ISOConfig-not-required.mdx (91%)
 rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/ISOConfig-required.mdx (94%)
 rename website/pages/partials/{common => packer-plugin-sdk}/commonsteps/ISOConfig.mdx (95%)
 rename website/pages/partials/{common => packer-plugin-sdk}/shutdowncommand/ShutdownConfig-not-required.mdx (92%)
 create mode 100644 website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig.mdx

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 71f86e553..7acea7daf 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -259,7 +259,7 @@ does not attempt to track the latest version for each dependency.
 #### Code generation
 
 Packer relies on `go generate` to generate a [peg parser for boot
-commands](https://github.com/hashicorp/packer/blob/master/common/bootcommand/boot_command.go),
+commands](https://github.com/hashicorp/packer/blob/master/packer-plugin-sdk/bootcommand/boot_command.go),
 [docs](https://github.com/hashicorp/packer/blob/master/website/pages/partials/builder/amazon/chroot/_Config-not-required.mdx)
 and HCL2's bridging code. Packer's testing suite will run `make check-generate`
 to check that all the generated files Packer needs are what they should be.
diff --git a/Makefile b/Makefile
index 589dde035..f4d375843 100644
--- a/Makefile
+++ b/Makefile
@@ -123,9 +123,9 @@ generate: install-gen-deps ## Generate dynamically generated code
 	@echo "==> removing autogenerated markdown..."
 	@find website/pages/ -type f | xargs grep -l '^<!-- Code generated' | xargs rm -f
 	@echo "==> removing autogenerated code..."
-	@find post-processor common helper template builder provisioner -type f | xargs grep -l '^// Code generated' | xargs rm -f
+	@find post-processor packer-plugin-sdk helper template builder provisioner -type f | xargs grep -l '^// Code generated' | xargs rm -f
 	go generate ./...
-	go fmt common/bootcommand/boot_command.go
+	go fmt packer-plugin-sdk/bootcommand/boot_command.go
 	go run ./cmd/generate-fixer-deprecations
 
 generate-check: generate ## Check go code generation is on par
diff --git a/builder/alicloud/ecs/builder.go b/builder/alicloud/ecs/builder.go
index 50a81c058..acf768e60 100644
--- a/builder/alicloud/ecs/builder.go
+++ b/builder/alicloud/ecs/builder.go
@@ -9,12 +9,12 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/alicloud/ecs/run_config.go b/builder/alicloud/ecs/run_config.go
index 500487139..a8988bb0a 100644
--- a/builder/alicloud/ecs/run_config.go
+++ b/builder/alicloud/ecs/run_config.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type RunConfig struct {
diff --git a/builder/alicloud/ecs/step_config_eip.go b/builder/alicloud/ecs/step_config_eip.go
index 468e1ecab..a04efabb1 100644
--- a/builder/alicloud/ecs/step_config_eip.go
+++ b/builder/alicloud/ecs/step_config_eip.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors"
-	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
diff --git a/builder/alicloud/ecs/step_config_security_group.go b/builder/alicloud/ecs/step_config_security_group.go
index 8dfbcdc60..5913198b6 100644
--- a/builder/alicloud/ecs/step_config_security_group.go
+++ b/builder/alicloud/ecs/step_config_security_group.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type stepConfigAlicloudSecurityGroup struct {
diff --git a/builder/alicloud/ecs/step_config_vpc.go b/builder/alicloud/ecs/step_config_vpc.go
index 3b8f9574b..0ccfed678 100644
--- a/builder/alicloud/ecs/step_config_vpc.go
+++ b/builder/alicloud/ecs/step_config_vpc.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type stepConfigAlicloudVPC struct {
diff --git a/builder/alicloud/ecs/step_config_vswitch.go b/builder/alicloud/ecs/step_config_vswitch.go
index 4f2541b89..ee85c6c07 100644
--- a/builder/alicloud/ecs/step_config_vswitch.go
+++ b/builder/alicloud/ecs/step_config_vswitch.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type stepConfigAlicloudVSwitch struct {
diff --git a/builder/alicloud/ecs/step_create_image.go b/builder/alicloud/ecs/step_create_image.go
index 9c8c45ec6..970c6783a 100644
--- a/builder/alicloud/ecs/step_create_image.go
+++ b/builder/alicloud/ecs/step_create_image.go
@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/common/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type stepCreateAlicloudImage struct {
diff --git a/builder/alicloud/ecs/step_create_instance.go b/builder/alicloud/ecs/step_create_instance.go
index 24d3acf27..81ee510ff 100644
--- a/builder/alicloud/ecs/step_create_instance.go
+++ b/builder/alicloud/ecs/step_create_instance.go
@@ -7,7 +7,7 @@ import (
 	"io/ioutil"
 	"strconv"
 
-	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go
index af2893b10..f41272f2f 100644
--- a/builder/amazon/chroot/builder.go
+++ b/builder/amazon/chroot/builder.go
@@ -15,14 +15,14 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/chroot"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/amazon/chroot/copy_files_test.go b/builder/amazon/chroot/copy_files_test.go
index 409bbfb9b..2924e1193 100644
--- a/builder/amazon/chroot/copy_files_test.go
+++ b/builder/amazon/chroot/copy_files_test.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 )
 
 func TestCopyFile(t *testing.T) {
diff --git a/builder/amazon/chroot/step_attach_volume_test.go b/builder/amazon/chroot/step_attach_volume_test.go
index 3d3cc135e..cfc3dad76 100644
--- a/builder/amazon/chroot/step_attach_volume_test.go
+++ b/builder/amazon/chroot/step_attach_volume_test.go
@@ -3,7 +3,7 @@ package chroot
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/common/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
 )
 
 func TestAttachVolumeCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
diff --git a/builder/amazon/chroot/step_early_unflock.go b/builder/amazon/chroot/step_early_unflock.go
index bae757f8a..e08dc672f 100644
--- a/builder/amazon/chroot/step_early_unflock.go
+++ b/builder/amazon/chroot/step_early_unflock.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/common/chroot"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
 )
 
 // StepEarlyUnflock unlocks the flock.
diff --git a/builder/amazon/chroot/step_flock_test.go b/builder/amazon/chroot/step_flock_test.go
index 698a4906d..8c20aefbd 100644
--- a/builder/amazon/chroot/step_flock_test.go
+++ b/builder/amazon/chroot/step_flock_test.go
@@ -3,7 +3,7 @@ package chroot
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/common/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
 )
 
 func TestFlockCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
diff --git a/builder/amazon/chroot/step_mount_device.go b/builder/amazon/chroot/step_mount_device.go
index 17d9cd74e..c9dcfc042 100644
--- a/builder/amazon/chroot/step_mount_device.go
+++ b/builder/amazon/chroot/step_mount_device.go
@@ -10,10 +10,10 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/amazon/chroot/step_mount_device_test.go b/builder/amazon/chroot/step_mount_device_test.go
index 88418451b..0ae140af0 100644
--- a/builder/amazon/chroot/step_mount_device_test.go
+++ b/builder/amazon/chroot/step_mount_device_test.go
@@ -3,7 +3,7 @@ package chroot
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/common/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
 )
 
 func TestMountDeviceCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
diff --git a/builder/amazon/chroot/step_prepare_device.go b/builder/amazon/chroot/step_prepare_device.go
index d91ace7c8..a6a27eb95 100644
--- a/builder/amazon/chroot/step_prepare_device.go
+++ b/builder/amazon/chroot/step_prepare_device.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 // StepPrepareDevice finds an available device and sets it.
diff --git a/builder/amazon/chroot/step_register_ami.go b/builder/amazon/chroot/step_register_ami.go
index f7e85dc07..b44692cb4 100644
--- a/builder/amazon/chroot/step_register_ami.go
+++ b/builder/amazon/chroot/step_register_ami.go
@@ -7,10 +7,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common/random"
 	confighelper "github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 )
 
 // StepRegisterAMI creates the AMI.
diff --git a/builder/amazon/chroot/step_register_ami_test.go b/builder/amazon/chroot/step_register_ami_test.go
index 6a9de18f6..861fd4ca7 100644
--- a/builder/amazon/chroot/step_register_ami_test.go
+++ b/builder/amazon/chroot/step_register_ami_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	amazon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
diff --git a/builder/amazon/common/helper_funcs.go b/builder/amazon/common/helper_funcs.go
index 12dfe715e..cf7fec1f1 100644
--- a/builder/amazon/common/helper_funcs.go
+++ b/builder/amazon/common/helper_funcs.go
@@ -9,7 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 // DestroyAMIs deregisters the AWS machine images in imageids from an active AWS account
diff --git a/builder/amazon/common/interpolate_build_info.go b/builder/amazon/common/interpolate_build_info.go
index e04400f4b..8087a88c9 100644
--- a/builder/amazon/common/interpolate_build_info.go
+++ b/builder/amazon/common/interpolate_build_info.go
@@ -3,8 +3,8 @@ package common
 import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 type BuildInfoTemplate struct {
diff --git a/builder/amazon/common/interpolate_build_info_test.go b/builder/amazon/common/interpolate_build_info_test.go
index 6a5cc17b3..1dac35894 100644
--- a/builder/amazon/common/interpolate_build_info_test.go
+++ b/builder/amazon/common/interpolate_build_info_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 func testImage() *ec2.Image {
diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go
index 80162f34c..05e6a444b 100644
--- a/builder/amazon/common/run_config.go
+++ b/builder/amazon/common/run_config.go
@@ -11,10 +11,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$")
diff --git a/builder/amazon/common/ssm/session.go b/builder/amazon/common/ssm/session.go
index 350c01ba4..8e3f0fa84 100644
--- a/builder/amazon/common/ssm/session.go
+++ b/builder/amazon/common/ssm/session.go
@@ -13,9 +13,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/ssm"
 	"github.com/aws/aws-sdk-go/service/ssm/ssmiface"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/common/shell-local/localexec"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell-local/localexec"
 )
 
 type Session struct {
diff --git a/builder/amazon/common/step_create_ssm_tunnel.go b/builder/amazon/common/step_create_ssm_tunnel.go
index aad0fab4f..1086f477c 100644
--- a/builder/amazon/common/step_create_ssm_tunnel.go
+++ b/builder/amazon/common/step_create_ssm_tunnel.go
@@ -10,9 +10,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ssm"
 	pssm "github.com/hashicorp/packer/builder/amazon/common/ssm"
-	"github.com/hashicorp/packer/common/net"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 type StepCreateSSMTunnel struct {
diff --git a/builder/amazon/common/step_create_tags.go b/builder/amazon/common/step_create_tags.go
index aadb70716..a6a97c4c8 100644
--- a/builder/amazon/common/step_create_tags.go
+++ b/builder/amazon/common/step_create_tags.go
@@ -9,9 +9,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/amazon/common/step_get_password.go b/builder/amazon/common/step_get_password.go
index a2d741af6..cbdca2814 100644
--- a/builder/amazon/common/step_get_password.go
+++ b/builder/amazon/common/step_get_password.go
@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 // StepGetPassword reads the password from a Windows server and sets it
diff --git a/builder/amazon/common/step_iam_instance_profile.go b/builder/amazon/common/step_iam_instance_profile.go
index 3ef72e9ee..d743c4e16 100644
--- a/builder/amazon/common/step_iam_instance_profile.go
+++ b/builder/amazon/common/step_iam_instance_profile.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/iam"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type StepIamInstanceProfile struct {
diff --git a/builder/amazon/common/step_key_pair.go b/builder/amazon/common/step_key_pair.go
index 631226ab3..2f70d3a35 100644
--- a/builder/amazon/common/step_key_pair.go
+++ b/builder/amazon/common/step_key_pair.go
@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type StepKeyPair struct {
diff --git a/builder/amazon/common/step_modify_ami_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go
index 6879e3f7f..d4ab8f5c1 100644
--- a/builder/amazon/common/step_modify_ami_attributes.go
+++ b/builder/amazon/common/step_modify_ami_attributes.go
@@ -7,9 +7,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/amazon/common/step_pre_validate.go b/builder/amazon/common/step_pre_validate.go
index 94ea7af57..197676fa2 100644
--- a/builder/amazon/common/step_pre_validate.go
+++ b/builder/amazon/common/step_pre_validate.go
@@ -10,9 +10,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 // StepPreValidate provides an opportunity to pre-validate any configuration for
diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go
index 45f7144c9..23e8981ff 100644
--- a/builder/amazon/common/step_run_source_instance.go
+++ b/builder/amazon/common/step_run_source_instance.go
@@ -12,10 +12,10 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/amazon/common/step_run_spot_instance.go b/builder/amazon/common/step_run_spot_instance.go
index 2b4a52e07..24ee1d70e 100644
--- a/builder/amazon/common/step_run_spot_instance.go
+++ b/builder/amazon/common/step_run_spot_instance.go
@@ -13,11 +13,11 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/random"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/amazon/common/step_security_group.go b/builder/amazon/common/step_security_group.go
index 2b5ddaf7e..5e4dc2301 100644
--- a/builder/amazon/common/step_security_group.go
+++ b/builder/amazon/common/step_security_group.go
@@ -10,10 +10,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type StepSecurityGroup struct {
diff --git a/builder/amazon/common/step_set_generated_data.go b/builder/amazon/common/step_set_generated_data.go
index 50f0d15fc..cf6a52694 100644
--- a/builder/amazon/common/step_set_generated_data.go
+++ b/builder/amazon/common/step_set_generated_data.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 // &awscommon.StepSetGeneratedData{
diff --git a/builder/amazon/common/step_stop_ebs_instance.go b/builder/amazon/common/step_stop_ebs_instance.go
index f3ed58473..21363470f 100644
--- a/builder/amazon/common/step_stop_ebs_instance.go
+++ b/builder/amazon/common/step_stop_ebs_instance.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type StepStopEBSBackedInstance struct {
diff --git a/builder/amazon/common/tags.go b/builder/amazon/common/tags.go
index 8842db6e6..20aec10b8 100644
--- a/builder/amazon/common/tags.go
+++ b/builder/amazon/common/tags.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go
index 6a2077a8b..726d4bba9 100644
--- a/builder/amazon/ebs/builder.go
+++ b/builder/amazon/ebs/builder.go
@@ -16,14 +16,14 @@ import (
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/amazon/ebs/step_create_ami.go b/builder/amazon/ebs/step_create_ami.go
index 5cbbc5ca8..a17455125 100644
--- a/builder/amazon/ebs/step_create_ami.go
+++ b/builder/amazon/ebs/step_create_ami.go
@@ -10,10 +10,10 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/random"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type stepCreateAMI struct {
diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go
index 5d80cc5fa..60522be96 100644
--- a/builder/amazon/ebssurrogate/builder.go
+++ b/builder/amazon/ebssurrogate/builder.go
@@ -14,14 +14,14 @@ import (
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/amazon/ebssurrogate/step_register_ami.go b/builder/amazon/ebssurrogate/step_register_ami.go
index 7d6f05fbf..445c34f2a 100644
--- a/builder/amazon/ebssurrogate/step_register_ami.go
+++ b/builder/amazon/ebssurrogate/step_register_ami.go
@@ -7,10 +7,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common/random"
 	confighelper "github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 )
 
 // StepRegisterAMI creates the AMI.
diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go
index eb352f48b..c79cf2ee1 100644
--- a/builder/amazon/ebsvolume/builder.go
+++ b/builder/amazon/ebsvolume/builder.go
@@ -13,14 +13,14 @@ import (
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go
index 7e606104d..1b798c002 100644
--- a/builder/amazon/instance/builder.go
+++ b/builder/amazon/instance/builder.go
@@ -16,13 +16,13 @@ import (
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/amazon/instance/step_register_ami.go b/builder/amazon/instance/step_register_ami.go
index 3aba13dc2..d6075cf48 100644
--- a/builder/amazon/instance/step_register_ami.go
+++ b/builder/amazon/instance/step_register_ami.go
@@ -7,10 +7,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common/random"
 	confighelper "github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 )
 
 type StepRegisterAMI struct {
diff --git a/builder/azure/arm/azure_error_response_test.go b/builder/azure/arm/azure_error_response_test.go
index d27c2192a..130353c8b 100644
--- a/builder/azure/arm/azure_error_response_test.go
+++ b/builder/azure/arm/azure_error_response_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	approvaltests "github.com/approvals/go-approval-tests"
-	"github.com/hashicorp/packer/common/json"
+	"github.com/hashicorp/packer/packer-plugin-sdk/json"
 )
 
 const AzureErrorSimple = `{"error":{"code":"ResourceNotFound","message":"The Resource 'Microsoft.Compute/images/PackerUbuntuImage' under resource group 'packer-test00' was not found."}}`
diff --git a/builder/azure/arm/builder.go b/builder/azure/arm/builder.go
index 7cb551770..09c3e900c 100644
--- a/builder/azure/arm/builder.go
+++ b/builder/azure/arm/builder.go
@@ -18,10 +18,10 @@ import (
 	packerAzureCommon "github.com/hashicorp/packer/builder/azure/common"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/hashicorp/packer/builder/azure/common/lin"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 type Builder struct {
diff --git a/builder/azure/arm/config.go b/builder/azure/arm/config.go
index ce8913d72..ef70b38c9 100644
--- a/builder/azure/arm/config.go
+++ b/builder/azure/arm/config.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
@@ -28,11 +28,11 @@ import (
 	"github.com/hashicorp/packer/builder/azure/common/client"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/hashicorp/packer/builder/azure/pkcs12"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 
 	"golang.org/x/crypto/ssh"
diff --git a/builder/azure/arm/step_deploy_template.go b/builder/azure/arm/step_deploy_template.go
index 11e71e8da..3a2564f6d 100644
--- a/builder/azure/arm/step_deploy_template.go
+++ b/builder/azure/arm/step_deploy_template.go
@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type StepDeployTemplate struct {
diff --git a/builder/azure/arm/tempname.go b/builder/azure/arm/tempname.go
index 8ad7fae3e..e90d2c420 100644
--- a/builder/azure/arm/tempname.go
+++ b/builder/azure/arm/tempname.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/packer/common/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 )
 
 type TempName struct {
diff --git a/builder/azure/arm/tempname_test.go b/builder/azure/arm/tempname_test.go
index 5f7711a82..5f0baa52f 100644
--- a/builder/azure/arm/tempname_test.go
+++ b/builder/azure/arm/tempname_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/packer/common/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 )
 
 func TestTempNameShouldCreatePrefixedRandomNames(t *testing.T) {
diff --git a/builder/azure/chroot/builder.go b/builder/azure/chroot/builder.go
index a6e53af84..3e97083ae 100644
--- a/builder/azure/chroot/builder.go
+++ b/builder/azure/chroot/builder.go
@@ -18,12 +18,12 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	azcommon "github.com/hashicorp/packer/builder/azure/common"
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/chroot"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
diff --git a/builder/azure/chroot/step_mount_device.go b/builder/azure/chroot/step_mount_device.go
index 82ae6cb5d..e6833075d 100644
--- a/builder/azure/chroot/step_mount_device.go
+++ b/builder/azure/chroot/step_mount_device.go
@@ -12,9 +12,9 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/azure/chroot/step_mount_device_test.go b/builder/azure/chroot/step_mount_device_test.go
index 98ed49bc7..fa46b4806 100644
--- a/builder/azure/chroot/step_mount_device_test.go
+++ b/builder/azure/chroot/step_mount_device_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 )
 
 func TestStepMountDevice_Run(t *testing.T) {
diff --git a/builder/azure/dtl/azure_error_response_test.go b/builder/azure/dtl/azure_error_response_test.go
index bc8a82f15..6e1e78d7b 100644
--- a/builder/azure/dtl/azure_error_response_test.go
+++ b/builder/azure/dtl/azure_error_response_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	approvaltests "github.com/approvals/go-approval-tests"
-	"github.com/hashicorp/packer/common/json"
+	"github.com/hashicorp/packer/packer-plugin-sdk/json"
 )
 
 const AzureErrorSimple = `{"error":{"code":"ResourceNotFound","message":"The Resource 'Microsoft.Compute/images/PackerUbuntuImage' under resource group 'packer-test00' was not found."}}`
diff --git a/builder/azure/dtl/builder.go b/builder/azure/dtl/builder.go
index 303af3322..fb840dc3d 100644
--- a/builder/azure/dtl/builder.go
+++ b/builder/azure/dtl/builder.go
@@ -17,10 +17,10 @@ import (
 	packerAzureCommon "github.com/hashicorp/packer/builder/azure/common"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/hashicorp/packer/builder/azure/common/lin"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 type Builder struct {
diff --git a/builder/azure/dtl/config.go b/builder/azure/dtl/config.go
index 309c56a9c..7268fc612 100644
--- a/builder/azure/dtl/config.go
+++ b/builder/azure/dtl/config.go
@@ -24,10 +24,10 @@ import (
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 
 	"github.com/hashicorp/packer/builder/azure/pkcs12"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 
 	"golang.org/x/crypto/ssh"
diff --git a/builder/azure/dtl/template_funcs.go b/builder/azure/dtl/template_funcs.go
index d76eda267..0bb93fa08 100644
--- a/builder/azure/dtl/template_funcs.go
+++ b/builder/azure/dtl/template_funcs.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"text/template"
 
-	packertpl "github.com/hashicorp/packer/common/template"
+	packertpl "github.com/hashicorp/packer/packer-plugin-sdk/template"
 )
 
 func isValidByteValue(b byte) bool {
diff --git a/builder/azure/dtl/tempname.go b/builder/azure/dtl/tempname.go
index b4c51d478..c5d64ac04 100644
--- a/builder/azure/dtl/tempname.go
+++ b/builder/azure/dtl/tempname.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/packer/common/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 )
 
 type TempName struct {
diff --git a/builder/cloudstack/builder.go b/builder/cloudstack/builder.go
index 68e46f523..7a4f0cdc4 100644
--- a/builder/cloudstack/builder.go
+++ b/builder/cloudstack/builder.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/config.go b/builder/cloudstack/config.go
index 219667933..ce2760438 100644
--- a/builder/cloudstack/config.go
+++ b/builder/cloudstack/config.go
@@ -9,13 +9,13 @@ import (
 	"os"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 // Config holds all the details needed to configure the builder.
diff --git a/builder/cloudstack/step_create_security_group.go b/builder/cloudstack/step_create_security_group.go
index e8a1f1818..816948397 100644
--- a/builder/cloudstack/step_create_security_group.go
+++ b/builder/cloudstack/step_create_security_group.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/digitalocean/builder.go b/builder/digitalocean/builder.go
index 21d7be7c8..836f7b6b8 100644
--- a/builder/digitalocean/builder.go
+++ b/builder/digitalocean/builder.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/digitalocean/godo"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"golang.org/x/oauth2"
 )
 
diff --git a/builder/digitalocean/config.go b/builder/digitalocean/config.go
index 7a722b5f9..ee67b8bdc 100644
--- a/builder/digitalocean/config.go
+++ b/builder/digitalocean/config.go
@@ -10,12 +10,12 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/mitchellh/mapstructure"
 )
 
diff --git a/builder/digitalocean/step_create_ssh_key.go b/builder/digitalocean/step_create_ssh_key.go
index 40b6c115d..5e104b506 100644
--- a/builder/digitalocean/step_create_ssh_key.go
+++ b/builder/digitalocean/step_create_ssh_key.go
@@ -12,9 +12,9 @@ import (
 	"runtime"
 
 	"github.com/digitalocean/godo"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/docker/builder.go b/builder/docker/builder.go
index f1487f9c0..d5e7dcf41 100644
--- a/builder/docker/builder.go
+++ b/builder/docker/builder.go
@@ -5,11 +5,11 @@ import (
 	"log"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 const (
diff --git a/builder/docker/config.go b/builder/docker/config.go
index 28743f448..463f13dfd 100644
--- a/builder/docker/config.go
+++ b/builder/docker/config.go
@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/mapstructure"
 )
diff --git a/builder/docker/exec.go b/builder/docker/exec.go
index ee5a01efd..309fdcc5d 100644
--- a/builder/docker/exec.go
+++ b/builder/docker/exec.go
@@ -3,8 +3,8 @@ package docker
 import (
 	"os/exec"
 
-	"github.com/hashicorp/packer/common/shell-local/localexec"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell-local/localexec"
 )
 
 func runAndStream(cmd *exec.Cmd, ui packer.Ui) error {
diff --git a/builder/docker/step_set_generated_data.go b/builder/docker/step_set_generated_data.go
index ffe58420d..972dd6495 100644
--- a/builder/docker/step_set_generated_data.go
+++ b/builder/docker/step_set_generated_data.go
@@ -3,8 +3,8 @@ package docker
 import (
 	"context"
 
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 type StepSetGeneratedData struct {
diff --git a/builder/docker/step_set_generated_data_test.go b/builder/docker/step_set_generated_data_test.go
index 370626c8e..9fa826129 100644
--- a/builder/docker/step_set_generated_data_test.go
+++ b/builder/docker/step_set_generated_data_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 func TestStepSetGeneratedData_Run(t *testing.T) {
diff --git a/builder/file/config.go b/builder/file/config.go
index ac97a2f74..d5ddedd8a 100644
--- a/builder/file/config.go
+++ b/builder/file/config.go
@@ -5,9 +5,9 @@ package file
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/googlecompute/builder.go b/builder/googlecompute/builder.go
index 032ba3457..f8d7a896b 100644
--- a/builder/googlecompute/builder.go
+++ b/builder/googlecompute/builder.go
@@ -8,10 +8,10 @@ import (
 	"log"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 // The unique ID for this builder.
diff --git a/builder/googlecompute/config.go b/builder/googlecompute/config.go
index 6908f4f1d..9cc372f07 100644
--- a/builder/googlecompute/config.go
+++ b/builder/googlecompute/config.go
@@ -11,12 +11,12 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	compute "google.golang.org/api/compute/v1"
 )
 
diff --git a/builder/googlecompute/driver_gce.go b/builder/googlecompute/driver_gce.go
index 518408bcf..574b027bb 100644
--- a/builder/googlecompute/driver_gce.go
+++ b/builder/googlecompute/driver_gce.go
@@ -18,9 +18,9 @@ import (
 	oslogin "google.golang.org/api/oslogin/v1"
 
 	"github.com/hashicorp/packer/builder/googlecompute/version"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/useragent"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 	vaultapi "github.com/hashicorp/vault/api"
 
 	"golang.org/x/oauth2"
diff --git a/builder/googlecompute/step_start_tunnel.go b/builder/googlecompute/step_start_tunnel.go
index 724216ebc..34a5d1e67 100644
--- a/builder/googlecompute/step_start_tunnel.go
+++ b/builder/googlecompute/step_start_tunnel.go
@@ -18,11 +18,11 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/hashicorp/packer/common/net"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
diff --git a/builder/googlecompute/step_wait_startup_script.go b/builder/googlecompute/step_wait_startup_script.go
index 8bde22f7e..82f7e4b16 100644
--- a/builder/googlecompute/step_wait_startup_script.go
+++ b/builder/googlecompute/step_wait_startup_script.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type StepWaitStartupScript int
diff --git a/builder/hcloud/builder.go b/builder/hcloud/builder.go
index 34688984e..a07378c58 100644
--- a/builder/hcloud/builder.go
+++ b/builder/hcloud/builder.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hetznercloud/hcloud-go/hcloud"
 )
 
diff --git a/builder/hcloud/config.go b/builder/hcloud/config.go
index 7478e7cdb..349743b1b 100644
--- a/builder/hcloud/config.go
+++ b/builder/hcloud/config.go
@@ -8,13 +8,13 @@ import (
 	"os"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/hetznercloud/hcloud-go/hcloud"
 	"github.com/mitchellh/mapstructure"
 )
diff --git a/builder/hcloud/step_create_sshkey.go b/builder/hcloud/step_create_sshkey.go
index d1c98da4f..757efda4e 100644
--- a/builder/hcloud/step_create_sshkey.go
+++ b/builder/hcloud/step_create_sshkey.go
@@ -11,9 +11,9 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/hetznercloud/hcloud-go/hcloud"
 	"golang.org/x/crypto/ssh"
 )
diff --git a/builder/hyperone/builder.go b/builder/hyperone/builder.go
index 7364d69ae..15f3716dc 100644
--- a/builder/hyperone/builder.go
+++ b/builder/hyperone/builder.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	openapi "github.com/hyperonecom/h1-client-go"
 )
diff --git a/builder/hyperone/config.go b/builder/hyperone/config.go
index e88ee39ad..1b677ed29 100644
--- a/builder/hyperone/config.go
+++ b/builder/hyperone/config.go
@@ -10,15 +10,15 @@ import (
 	"os"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/json"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/json"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/mitchellh/go-homedir"
 	"github.com/mitchellh/mapstructure"
 )
diff --git a/builder/hyperone/step_chroot_provision.go b/builder/hyperone/step_chroot_provision.go
index f0aa6acb0..ffbc5a6fc 100644
--- a/builder/hyperone/step_chroot_provision.go
+++ b/builder/hyperone/step_chroot_provision.go
@@ -3,9 +3,9 @@ package hyperone
 import (
 	"context"
 
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 type stepChrootProvision struct{}
diff --git a/builder/hyperone/token_by_ssh.go b/builder/hyperone/token_by_ssh.go
index ae1da04d2..47e626bf5 100644
--- a/builder/hyperone/token_by_ssh.go
+++ b/builder/hyperone/token_by_ssh.go
@@ -11,7 +11,7 @@ import (
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
 
-	"github.com/hashicorp/packer/common/json"
+	"github.com/hashicorp/packer/packer-plugin-sdk/json"
 )
 
 const (
diff --git a/builder/hyperv/common/config.go b/builder/hyperv/common/config.go
index 2c1e47c34..3502bd2ab 100644
--- a/builder/hyperv/common/config.go
+++ b/builder/hyperv/common/config.go
@@ -10,8 +10,8 @@ import (
 
 	powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell"
 	"github.com/hashicorp/packer/builder/hyperv/common/powershell/hyperv"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/hyperv/common/output_config.go b/builder/hyperv/common/output_config.go
index f1839f83e..2637ae87e 100644
--- a/builder/hyperv/common/output_config.go
+++ b/builder/hyperv/common/output_config.go
@@ -6,7 +6,7 @@ package common
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/hyperv/common/output_config_test.go b/builder/hyperv/common/output_config_test.go
index a5ac7dfd9..278969a42 100644
--- a/builder/hyperv/common/output_config_test.go
+++ b/builder/hyperv/common/output_config_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/hyperv/common/step_create_external_switch.go b/builder/hyperv/common/step_create_external_switch.go
index df1776a63..04c4d2d4c 100644
--- a/builder/hyperv/common/step_create_external_switch.go
+++ b/builder/hyperv/common/step_create_external_switch.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 // This step creates an external switch for the VM.
diff --git a/builder/hyperv/common/step_test.go b/builder/hyperv/common/step_test.go
index e5f9f3998..34c8eea3e 100644
--- a/builder/hyperv/common/step_test.go
+++ b/builder/hyperv/common/step_test.go
@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/hyperv/common/step_type_boot_command.go b/builder/hyperv/common/step_type_boot_command.go
index c34c5a04c..84fed0a5a 100644
--- a/builder/hyperv/common/step_type_boot_command.go
+++ b/builder/hyperv/common/step_type_boot_command.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common/bootcommand"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/hyperv/iso/builder.go b/builder/hyperv/iso/builder.go
index 9bd604b18..c398b1b3e 100644
--- a/builder/hyperv/iso/builder.go
+++ b/builder/hyperv/iso/builder.go
@@ -13,14 +13,14 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	hypervcommon "github.com/hashicorp/packer/builder/hyperv/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/shutdowncommand"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/hyperv/iso/builder_test.go b/builder/hyperv/iso/builder_test.go
index 2f95f5f1a..54c05477a 100644
--- a/builder/hyperv/iso/builder_test.go
+++ b/builder/hyperv/iso/builder_test.go
@@ -213,7 +213,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", b.config.FloppyFiles)
 	}
 
-	floppiesPath := "../../../common/test-fixtures/floppies"
+	floppiesPath := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppiesPath), fmt.Sprintf("%s/foo.ps1", floppiesPath)}
 	b = Builder{}
 	_, warns, err = b.Prepare(config)
diff --git a/builder/hyperv/vmcx/builder.go b/builder/hyperv/vmcx/builder.go
index ed688a89f..d61d8794e 100644
--- a/builder/hyperv/vmcx/builder.go
+++ b/builder/hyperv/vmcx/builder.go
@@ -13,14 +13,14 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	hypervcommon "github.com/hashicorp/packer/builder/hyperv/common"
 	powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/shutdowncommand"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/hyperv/vmcx/builder_test.go b/builder/hyperv/vmcx/builder_test.go
index 5e01b488e..b9b1ffc8c 100644
--- a/builder/hyperv/vmcx/builder_test.go
+++ b/builder/hyperv/vmcx/builder_test.go
@@ -353,7 +353,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", b.config.FloppyFiles)
 	}
 
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	b = Builder{}
 	_, warns, err = b.Prepare(config)
diff --git a/builder/jdcloud/builder.go b/builder/jdcloud/builder.go
index 76f1b3b3d..e5f0c45ac 100644
--- a/builder/jdcloud/builder.go
+++ b/builder/jdcloud/builder.go
@@ -5,11 +5,11 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/jdcloud/common.go b/builder/jdcloud/common.go
index d89965846..540863dd9 100644
--- a/builder/jdcloud/common.go
+++ b/builder/jdcloud/common.go
@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client"
 	vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client"
diff --git a/builder/linode/builder.go b/builder/linode/builder.go
index 8141cb091..771ba8123 100644
--- a/builder/linode/builder.go
+++ b/builder/linode/builder.go
@@ -11,10 +11,10 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/linode/linodego"
 
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 // The unique ID for this builder.
diff --git a/builder/linode/config.go b/builder/linode/config.go
index 08aadc3df..a66a180d7 100644
--- a/builder/linode/config.go
+++ b/builder/linode/config.go
@@ -11,10 +11,10 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/lxc/builder.go b/builder/lxc/builder.go
index 86e125c14..a888cb77b 100644
--- a/builder/lxc/builder.go
+++ b/builder/lxc/builder.go
@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/lxc/config.go b/builder/lxc/config.go
index bd2a781fe..f7cfa8ee7 100644
--- a/builder/lxc/config.go
+++ b/builder/lxc/config.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/mapstructure"
 )
diff --git a/builder/lxc/step_provision.go b/builder/lxc/step_provision.go
index 3a76f26e4..578b25906 100644
--- a/builder/lxc/step_provision.go
+++ b/builder/lxc/step_provision.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"log"
 
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 // StepProvision provisions the instance within a chroot.
diff --git a/builder/lxd/builder.go b/builder/lxd/builder.go
index 24e700949..e0f168b4d 100644
--- a/builder/lxd/builder.go
+++ b/builder/lxd/builder.go
@@ -4,9 +4,9 @@ import (
 	"context"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/lxd/config.go b/builder/lxd/config.go
index 840cdaabe..0369158b2 100644
--- a/builder/lxd/config.go
+++ b/builder/lxd/config.go
@@ -6,9 +6,9 @@ package lxd
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/mapstructure"
 )
diff --git a/builder/lxd/step_provision.go b/builder/lxd/step_provision.go
index 114be8fce..7c57d7e5b 100644
--- a/builder/lxd/step_provision.go
+++ b/builder/lxd/step_provision.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"log"
 
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 // StepProvision provisions the container
diff --git a/builder/ncloud/builder.go b/builder/ncloud/builder.go
index c802a2ada..6562b69ff 100644
--- a/builder/ncloud/builder.go
+++ b/builder/ncloud/builder.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 // Builder assume this implements packer.Builder
diff --git a/builder/ncloud/config.go b/builder/ncloud/config.go
index 18a544879..d3fd8ec61 100644
--- a/builder/ncloud/config.go
+++ b/builder/ncloud/config.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud"
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/null/builder.go b/builder/null/builder.go
index 3af67c187..3fd7606dd 100644
--- a/builder/null/builder.go
+++ b/builder/null/builder.go
@@ -4,10 +4,10 @@ import (
 	"context"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 const BuilderId = "fnoeding.null"
diff --git a/builder/null/config.go b/builder/null/config.go
index 490bc04e2..62f82e04f 100644
--- a/builder/null/config.go
+++ b/builder/null/config.go
@@ -5,10 +5,10 @@ package null
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/oneandone/builder.go b/builder/oneandone/builder.go
index 1600bf7f6..01b24ec40 100644
--- a/builder/oneandone/builder.go
+++ b/builder/oneandone/builder.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 const BuilderId = "packer.oneandone"
diff --git a/builder/oneandone/config.go b/builder/oneandone/config.go
index f48666930..66c49b87f 100644
--- a/builder/oneandone/config.go
+++ b/builder/oneandone/config.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 
 	"github.com/1and1/oneandone-cloudserver-sdk-go"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/mapstructure"
 )
diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go
index c93553fcc..69c4c780e 100644
--- a/builder/openstack/builder.go
+++ b/builder/openstack/builder.go
@@ -10,12 +10,12 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/openstack/run_config.go b/builder/openstack/run_config.go
index 6acd5f152..b57124465 100644
--- a/builder/openstack/run_config.go
+++ b/builder/openstack/run_config.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 
 	"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 // RunConfig contains configuration for running an instance from a source image
diff --git a/builder/oracle/classic/builder.go b/builder/oracle/classic/builder.go
index 87f351ea2..3b086bbe0 100644
--- a/builder/oracle/classic/builder.go
+++ b/builder/oracle/classic/builder.go
@@ -12,10 +12,10 @@ import (
 	"github.com/hashicorp/go-oracle-terraform/opc"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	ocommon "github.com/hashicorp/packer/builder/oracle/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 // BuilderId uniquely identifies the builder
diff --git a/builder/oracle/classic/config.go b/builder/oracle/classic/config.go
index 2cdf75b9e..fcb28a527 100644
--- a/builder/oracle/classic/config.go
+++ b/builder/oracle/classic/config.go
@@ -9,10 +9,10 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/oracle/classic/step_create_ip_reservation.go b/builder/oracle/classic/step_create_ip_reservation.go
index e1005657d..7f3a1b3e7 100644
--- a/builder/oracle/classic/step_create_ip_reservation.go
+++ b/builder/oracle/classic/step_create_ip_reservation.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/go-oracle-terraform/compute"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type stepCreateIPReservation struct{}
diff --git a/builder/oracle/oci/builder.go b/builder/oracle/oci/builder.go
index f10be1e8c..97704068b 100644
--- a/builder/oracle/oci/builder.go
+++ b/builder/oracle/oci/builder.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	ocommon "github.com/hashicorp/packer/builder/oracle/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/oracle/oci-go-sdk/core"
 )
 
diff --git a/builder/oracle/oci/config.go b/builder/oracle/oci/config.go
index 847b19f45..20096d9d5 100644
--- a/builder/oracle/oci/config.go
+++ b/builder/oracle/oci/config.go
@@ -13,10 +13,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	ocicommon "github.com/oracle/oci-go-sdk/common"
 	ociauth "github.com/oracle/oci-go-sdk/common/auth"
diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go
index e495547c6..b0dee623d 100644
--- a/builder/osc/bsu/builder.go
+++ b/builder/osc/bsu/builder.go
@@ -13,12 +13,12 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/osc/bsusurrogate/builder.go b/builder/osc/bsusurrogate/builder.go
index d01e97c44..d8c033ea1 100644
--- a/builder/osc/bsusurrogate/builder.go
+++ b/builder/osc/bsusurrogate/builder.go
@@ -11,12 +11,12 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/osc/bsuvolume/builder.go b/builder/osc/bsuvolume/builder.go
index e265bbd2e..798cec71a 100644
--- a/builder/osc/bsuvolume/builder.go
+++ b/builder/osc/bsuvolume/builder.go
@@ -11,12 +11,12 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/osc/chroot/builder.go b/builder/osc/chroot/builder.go
index 099cb4f7f..fe382f04f 100644
--- a/builder/osc/chroot/builder.go
+++ b/builder/osc/chroot/builder.go
@@ -13,11 +13,11 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/osc/chroot/run_local_commands.go b/builder/osc/chroot/run_local_commands.go
index b34f3a397..175a2afa6 100644
--- a/builder/osc/chroot/run_local_commands.go
+++ b/builder/osc/chroot/run_local_commands.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	sl "github.com/hashicorp/packer/common/shell-local"
 	"github.com/hashicorp/packer/packer"
+	sl "github.com/hashicorp/packer/packer-plugin-sdk/shell-local"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/osc/chroot/step_chroot_provision.go b/builder/osc/chroot/step_chroot_provision.go
index 39f034901..1f35d88e6 100644
--- a/builder/osc/chroot/step_chroot_provision.go
+++ b/builder/osc/chroot/step_chroot_provision.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"log"
 
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 // StepChrootProvision provisions the instance within a chroot.
diff --git a/builder/osc/common/run_config.go b/builder/osc/common/run_config.go
index d090489cb..589ed3f28 100644
--- a/builder/osc/common/run_config.go
+++ b/builder/osc/common/run_config.go
@@ -10,10 +10,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$")
diff --git a/builder/osc/common/step_security_group.go b/builder/osc/common/step_security_group.go
index 7c4bceba1..8c368cc34 100644
--- a/builder/osc/common/step_security_group.go
+++ b/builder/osc/common/step_security_group.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 
 	"github.com/antihax/optional"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/parallels/common/output_config.go b/builder/parallels/common/output_config.go
index edc93a721..57f65b308 100644
--- a/builder/parallels/common/output_config.go
+++ b/builder/parallels/common/output_config.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/parallels/common/output_config_test.go b/builder/parallels/common/output_config_test.go
index 6e5ad3752..ca251c38c 100644
--- a/builder/parallels/common/output_config_test.go
+++ b/builder/parallels/common/output_config_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/parallels/common/step_type_boot_command.go b/builder/parallels/common/step_type_boot_command.go
index 95b7dc5f8..dbf90c46a 100644
--- a/builder/parallels/common/step_type_boot_command.go
+++ b/builder/parallels/common/step_type_boot_command.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/common/bootcommand"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/parallels/iso/builder.go b/builder/parallels/iso/builder.go
index 55d395f61..f05094fa4 100644
--- a/builder/parallels/iso/builder.go
+++ b/builder/parallels/iso/builder.go
@@ -10,14 +10,14 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/shutdowncommand"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/parallels/iso/builder_test.go b/builder/parallels/iso/builder_test.go
index 76af90d1b..06be93302 100644
--- a/builder/parallels/iso/builder_test.go
+++ b/builder/parallels/iso/builder_test.go
@@ -65,7 +65,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", b.config.FloppyFiles)
 	}
 
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	b = Builder{}
 	_, warns, err = b.Prepare(config)
diff --git a/builder/parallels/pvm/builder.go b/builder/parallels/pvm/builder.go
index dcf6ce2eb..757b5b9a4 100644
--- a/builder/parallels/pvm/builder.go
+++ b/builder/parallels/pvm/builder.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 // Builder implements packer.Builder and builds the actual Parallels
diff --git a/builder/parallels/pvm/config.go b/builder/parallels/pvm/config.go
index 49afa0bd6..651f64419 100644
--- a/builder/parallels/pvm/config.go
+++ b/builder/parallels/pvm/config.go
@@ -8,12 +8,12 @@ import (
 	"os"
 
 	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/shutdowncommand"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/parallels/pvm/config_test.go b/builder/parallels/pvm/config_test.go
index e7a2a5d59..701eff59c 100644
--- a/builder/parallels/pvm/config_test.go
+++ b/builder/parallels/pvm/config_test.go
@@ -74,7 +74,7 @@ func TestNewConfig_sourcePath(t *testing.T) {
 
 func TestNewConfig_FloppyFiles(t *testing.T) {
 	c := testConfig(t)
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	c["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	_, err := (&Config{}).Prepare(c)
 	if err != nil {
diff --git a/builder/profitbricks/builder.go b/builder/profitbricks/builder.go
index 1cf8cc1f8..dada47170 100644
--- a/builder/profitbricks/builder.go
+++ b/builder/profitbricks/builder.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 const BuilderId = "packer.profitbricks"
diff --git a/builder/profitbricks/config.go b/builder/profitbricks/config.go
index 58155eb90..ccecb3e68 100644
--- a/builder/profitbricks/config.go
+++ b/builder/profitbricks/config.go
@@ -6,10 +6,10 @@ import (
 	"errors"
 	"os"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/mapstructure"
 )
diff --git a/builder/proxmox/clone/step_ssh_key_pair.go b/builder/proxmox/clone/step_ssh_key_pair.go
index 2aad603bb..1fd0844d0 100644
--- a/builder/proxmox/clone/step_ssh_key_pair.go
+++ b/builder/proxmox/clone/step_ssh_key_pair.go
@@ -6,10 +6,10 @@ import (
 	"os"
 
 	common "github.com/hashicorp/packer/builder/proxmox/common"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/helper/ssh"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 // StepSshKeyPair executes the business logic for setting the SSH key pair in
diff --git a/builder/proxmox/common/bootcommand_driver.go b/builder/proxmox/common/bootcommand_driver.go
index 304db3ef4..21fbaef1e 100644
--- a/builder/proxmox/common/bootcommand_driver.go
+++ b/builder/proxmox/common/bootcommand_driver.go
@@ -7,7 +7,7 @@ import (
 	"unicode"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/common/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
 )
 
 type proxmoxDriver struct {
diff --git a/builder/proxmox/common/builder.go b/builder/proxmox/common/builder.go
index 784549160..bbb5e7c9d 100644
--- a/builder/proxmox/common/builder.go
+++ b/builder/proxmox/common/builder.go
@@ -7,10 +7,10 @@ import (
 	"fmt"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 func NewSharedBuilder(id string, config Config, preSteps []multistep.Step, postSteps []multistep.Step, vmCreator ProxmoxVMCreator) *Builder {
diff --git a/builder/proxmox/common/config.go b/builder/proxmox/common/config.go
index 8686c4f0b..4a3184282 100644
--- a/builder/proxmox/common/config.go
+++ b/builder/proxmox/common/config.go
@@ -11,14 +11,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/mitchellh/mapstructure"
 )
 
diff --git a/builder/proxmox/common/step_type_boot_command.go b/builder/proxmox/common/step_type_boot_command.go
index 3ba1c910b..fafdd8e9d 100644
--- a/builder/proxmox/common/step_type_boot_command.go
+++ b/builder/proxmox/common/step_type_boot_command.go
@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/common/bootcommand"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/proxmox/common/step_type_boot_command_test.go b/builder/proxmox/common/step_type_boot_command_test.go
index c713e9cca..7070b312d 100644
--- a/builder/proxmox/common/step_type_boot_command_test.go
+++ b/builder/proxmox/common/step_type_boot_command_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/common/bootcommand"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
 )
 
 type commandTyperMock struct {
diff --git a/builder/proxmox/iso/builder.go b/builder/proxmox/iso/builder.go
index 699308b58..4f17e213f 100644
--- a/builder/proxmox/iso/builder.go
+++ b/builder/proxmox/iso/builder.go
@@ -6,9 +6,9 @@ import (
 	proxmoxapi "github.com/Telmate/proxmox-api-go/proxmox"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	proxmox "github.com/hashicorp/packer/builder/proxmox/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 // The unique id for the builder
diff --git a/builder/proxmox/iso/config.go b/builder/proxmox/iso/config.go
index 4f80fe28f..331f0ff08 100644
--- a/builder/proxmox/iso/config.go
+++ b/builder/proxmox/iso/config.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	proxmox "github.com/hashicorp/packer/builder/proxmox/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 type Config struct {
diff --git a/builder/proxmox/iso/step_upload_iso_test.go b/builder/proxmox/iso/step_upload_iso_test.go
index a6b7fa4fd..0099c1271 100644
--- a/builder/proxmox/iso/step_upload_iso_test.go
+++ b/builder/proxmox/iso/step_upload_iso_test.go
@@ -6,9 +6,9 @@ import (
 	"io"
 	"testing"
 
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 type uploaderMock struct {
diff --git a/builder/qemu/builder.go b/builder/qemu/builder.go
index 1c94ad70a..d382c7b8e 100644
--- a/builder/qemu/builder.go
+++ b/builder/qemu/builder.go
@@ -10,10 +10,10 @@ import (
 	"path/filepath"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 const BuilderId = "transcend.qemu"
diff --git a/builder/qemu/config.go b/builder/qemu/config.go
index 7f3541ba7..db294ec01 100644
--- a/builder/qemu/config.go
+++ b/builder/qemu/config.go
@@ -13,12 +13,12 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/shutdowncommand"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/qemu/config_test.go b/builder/qemu/config_test.go
index bd94d6eb8..bcb867004 100644
--- a/builder/qemu/config_test.go
+++ b/builder/qemu/config_test.go
@@ -327,7 +327,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", c.FloppyFiles)
 	}
 
-	floppies_path := "../../common/test-fixtures/floppies"
+	floppies_path := "../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	c = Config{}
 	warns, err = c.Prepare(config)
diff --git a/builder/qemu/step_configure_vnc.go b/builder/qemu/step_configure_vnc.go
index 34aed791e..0a8c34590 100644
--- a/builder/qemu/step_configure_vnc.go
+++ b/builder/qemu/step_configure_vnc.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"math/rand"
 
-	"github.com/hashicorp/packer/common/net"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step configures the VM to enable the VNC server.
diff --git a/builder/qemu/step_convert_disk.go b/builder/qemu/step_convert_disk.go
index a97343264..cb0f17ea3 100644
--- a/builder/qemu/step_convert_disk.go
+++ b/builder/qemu/step_convert_disk.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 
 	"os"
 )
diff --git a/builder/qemu/step_port_forward.go b/builder/qemu/step_port_forward.go
index ab5871fa2..537043973 100644
--- a/builder/qemu/step_port_forward.go
+++ b/builder/qemu/step_port_forward.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/common/net"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step adds a NAT port forwarding definition so that SSH or WinRM is available
diff --git a/builder/qemu/step_run_test.go b/builder/qemu/step_run_test.go
index 194ebf541..d025a8063 100644
--- a/builder/qemu/step_run_test.go
+++ b/builder/qemu/step_run_test.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/builder/qemu/step_set_iso.go b/builder/qemu/step_set_iso.go
index 338017632..b912574b5 100644
--- a/builder/qemu/step_set_iso.go
+++ b/builder/qemu/step_set_iso.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/hashicorp/packer/common/net"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step set iso_patch to available url
diff --git a/builder/qemu/step_type_boot_command.go b/builder/qemu/step_type_boot_command.go
index d183e9777..70446bde3 100644
--- a/builder/qemu/step_type_boot_command.go
+++ b/builder/qemu/step_type_boot_command.go
@@ -7,9 +7,9 @@ import (
 	"net"
 	"time"
 
-	"github.com/hashicorp/packer/common/bootcommand"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/go-vnc"
 )
diff --git a/builder/scaleway/builder.go b/builder/scaleway/builder.go
index 157fe624a..f1f222f1f 100644
--- a/builder/scaleway/builder.go
+++ b/builder/scaleway/builder.go
@@ -9,10 +9,10 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/builder/scaleway/config.go b/builder/scaleway/config.go
index 1c85f9bf0..7411d33b7 100644
--- a/builder/scaleway/config.go
+++ b/builder/scaleway/config.go
@@ -10,13 +10,13 @@ import (
 	"os"
 
 	"github.com/hashicorp/packer/builder/scaleway/version"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/useragent"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/mitchellh/mapstructure"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/builder/tencentcloud/cvm/builder.go b/builder/tencentcloud/cvm/builder.go
index 9bbc04a79..ff9526a81 100644
--- a/builder/tencentcloud/cvm/builder.go
+++ b/builder/tencentcloud/cvm/builder.go
@@ -7,12 +7,12 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/tencentcloud/cvm/common.go b/builder/tencentcloud/cvm/common.go
index 48deda926..020ae4390 100644
--- a/builder/tencentcloud/cvm/common.go
+++ b/builder/tencentcloud/cvm/common.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
diff --git a/builder/tencentcloud/cvm/run_config.go b/builder/tencentcloud/cvm/run_config.go
index 31deea558..d3083661b 100644
--- a/builder/tencentcloud/cvm/run_config.go
+++ b/builder/tencentcloud/cvm/run_config.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/pkg/errors"
 )
 
diff --git a/builder/triton/builder.go b/builder/triton/builder.go
index 5375552b3..d9fd2b335 100644
--- a/builder/triton/builder.go
+++ b/builder/triton/builder.go
@@ -5,11 +5,11 @@ import (
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 const (
diff --git a/builder/triton/config.go b/builder/triton/config.go
index 6d0a6b128..bbf5e4de1 100644
--- a/builder/triton/config.go
+++ b/builder/triton/config.go
@@ -3,8 +3,8 @@
 package triton
 
 import (
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/ucloud/common/run_config.go b/builder/ucloud/common/run_config.go
index 30d541848..a4d4be9c4 100644
--- a/builder/ucloud/common/run_config.go
+++ b/builder/ucloud/common/run_config.go
@@ -6,9 +6,9 @@ import (
 	"os"
 	"regexp"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type RunConfig struct {
diff --git a/builder/ucloud/uhost/builder.go b/builder/ucloud/uhost/builder.go
index 24b9a68e4..8ec378d54 100644
--- a/builder/ucloud/uhost/builder.go
+++ b/builder/ucloud/uhost/builder.go
@@ -9,12 +9,12 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/ucloud/uhost/step_copy_image.go b/builder/ucloud/uhost/step_copy_image.go
index 67bb141bb..55c9f0c62 100644
--- a/builder/ucloud/uhost/step_copy_image.go
+++ b/builder/ucloud/uhost/step_copy_image.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/common/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
diff --git a/builder/ucloud/uhost/step_create_image.go b/builder/ucloud/uhost/step_create_image.go
index e0004a1ce..42207ee2a 100644
--- a/builder/ucloud/uhost/step_create_image.go
+++ b/builder/ucloud/uhost/step_create_image.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/common/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
diff --git a/builder/ucloud/uhost/step_create_instance.go b/builder/ucloud/uhost/step_create_instance.go
index 45ececb22..bb6738569 100644
--- a/builder/ucloud/uhost/step_create_instance.go
+++ b/builder/ucloud/uhost/step_create_instance.go
@@ -10,9 +10,9 @@ import (
 	"time"
 
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 	"github.com/ucloud/ucloud-sdk-go/services/uhost"
 	"github.com/ucloud/ucloud-sdk-go/ucloud"
 )
diff --git a/builder/ucloud/uhost/step_stop_instance.go b/builder/ucloud/uhost/step_stop_instance.go
index 7266d851c..15daea961 100644
--- a/builder/ucloud/uhost/step_stop_instance.go
+++ b/builder/ucloud/uhost/step_stop_instance.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/common/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
diff --git a/builder/vagrant/builder.go b/builder/vagrant/builder.go
index bdacf9a42..f8ff77497 100644
--- a/builder/vagrant/builder.go
+++ b/builder/vagrant/builder.go
@@ -14,13 +14,13 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/virtualbox/common/driver_4_2.go b/builder/virtualbox/common/driver_4_2.go
index b710720dc..465506ace 100644
--- a/builder/virtualbox/common/driver_4_2.go
+++ b/builder/virtualbox/common/driver_4_2.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	versionUtil "github.com/hashicorp/go-version"
-	"github.com/hashicorp/packer/common/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type VBox42Driver struct {
diff --git a/builder/virtualbox/common/output_config.go b/builder/virtualbox/common/output_config.go
index 3790998a6..a7a1e2588 100644
--- a/builder/virtualbox/common/output_config.go
+++ b/builder/virtualbox/common/output_config.go
@@ -5,7 +5,7 @@ package common
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/virtualbox/common/output_config_test.go b/builder/virtualbox/common/output_config_test.go
index a5ac7dfd9..278969a42 100644
--- a/builder/virtualbox/common/output_config_test.go
+++ b/builder/virtualbox/common/output_config_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/virtualbox/common/step_configure_vrdp.go b/builder/virtualbox/common/step_configure_vrdp.go
index 731238b3c..626cb12ee 100644
--- a/builder/virtualbox/common/step_configure_vrdp.go
+++ b/builder/virtualbox/common/step_configure_vrdp.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/common/net"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step configures the VM to enable the VRDP server
diff --git a/builder/virtualbox/common/step_download_guest_additions.go b/builder/virtualbox/common/step_download_guest_additions.go
index 7da001d94..e47d99dc7 100644
--- a/builder/virtualbox/common/step_download_guest_additions.go
+++ b/builder/virtualbox/common/step_download_guest_additions.go
@@ -9,9 +9,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
diff --git a/builder/virtualbox/common/step_port_forwarding.go b/builder/virtualbox/common/step_port_forwarding.go
index 5a0657414..be96667b2 100644
--- a/builder/virtualbox/common/step_port_forwarding.go
+++ b/builder/virtualbox/common/step_port_forwarding.go
@@ -6,10 +6,10 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/packer/common/net"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step adds a NAT port forwarding definition so that SSH or WinRM is available
diff --git a/builder/virtualbox/common/step_remove_devices.go b/builder/virtualbox/common/step_remove_devices.go
index 53bc97cca..4ff9aad3b 100644
--- a/builder/virtualbox/common/step_remove_devices.go
+++ b/builder/virtualbox/common/step_remove_devices.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 // This step removes any devices (floppy disks, ISOs, etc.) from the
diff --git a/builder/virtualbox/common/step_ssh_key_pair.go b/builder/virtualbox/common/step_ssh_key_pair.go
index 282461f27..d23143dcd 100644
--- a/builder/virtualbox/common/step_ssh_key_pair.go
+++ b/builder/virtualbox/common/step_ssh_key_pair.go
@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/helper/ssh"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 // StepSshKeyPair executes the business logic for setting the SSH key pair in
diff --git a/builder/virtualbox/common/step_type_boot_command.go b/builder/virtualbox/common/step_type_boot_command.go
index e152318ef..b2f11d632 100644
--- a/builder/virtualbox/common/step_type_boot_command.go
+++ b/builder/virtualbox/common/step_type_boot_command.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/common/bootcommand"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go
index c1c940ff9..f901ef763 100644
--- a/builder/virtualbox/iso/builder.go
+++ b/builder/virtualbox/iso/builder.go
@@ -10,13 +10,13 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/virtualbox/iso/builder_test.go b/builder/virtualbox/iso/builder_test.go
index d78556445..194b6f782 100644
--- a/builder/virtualbox/iso/builder_test.go
+++ b/builder/virtualbox/iso/builder_test.go
@@ -105,7 +105,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", b.config.FloppyFiles)
 	}
 
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	b = Builder{}
 	_, warns, err = b.Prepare(config)
diff --git a/builder/virtualbox/ovf/builder.go b/builder/virtualbox/ovf/builder.go
index 0165be197..c6b6b7814 100644
--- a/builder/virtualbox/ovf/builder.go
+++ b/builder/virtualbox/ovf/builder.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 // Builder implements packer.Builder and builds the actual VirtualBox
diff --git a/builder/virtualbox/ovf/config.go b/builder/virtualbox/ovf/config.go
index ba99f5684..29cf5c5ac 100644
--- a/builder/virtualbox/ovf/config.go
+++ b/builder/virtualbox/ovf/config.go
@@ -7,11 +7,11 @@ import (
 	"fmt"
 
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/virtualbox/ovf/config_test.go b/builder/virtualbox/ovf/config_test.go
index 240d3c0e4..707b2419e 100644
--- a/builder/virtualbox/ovf/config_test.go
+++ b/builder/virtualbox/ovf/config_test.go
@@ -32,7 +32,7 @@ func getTempFile(t *testing.T) *os.File {
 
 func TestNewConfig_FloppyFiles(t *testing.T) {
 	cfg := testConfig(t)
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	cfg["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	var c Config
 	_, err := c.Prepare(cfg)
diff --git a/builder/virtualbox/vm/builder.go b/builder/virtualbox/vm/builder.go
index fb1e0fa76..6611753ec 100644
--- a/builder/virtualbox/vm/builder.go
+++ b/builder/virtualbox/vm/builder.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 // Builder implements packer.Builder and builds the actual VirtualBox
diff --git a/builder/virtualbox/vm/config.go b/builder/virtualbox/vm/config.go
index 46235aeec..c1ec25dbe 100644
--- a/builder/virtualbox/vm/config.go
+++ b/builder/virtualbox/vm/config.go
@@ -9,11 +9,11 @@ import (
 	"time"
 
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/vmware/common/output_config.go b/builder/vmware/common/output_config.go
index bcc0c7df4..e315b6012 100644
--- a/builder/vmware/common/output_config.go
+++ b/builder/vmware/common/output_config.go
@@ -5,7 +5,7 @@ package common
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/vmware/common/output_config_test.go b/builder/vmware/common/output_config_test.go
index 6d46d2089..e2a95fd6c 100644
--- a/builder/vmware/common/output_config_test.go
+++ b/builder/vmware/common/output_config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/vmware/common/run_config_test.go b/builder/vmware/common/run_config_test.go
index 6119223eb..62ec61610 100644
--- a/builder/vmware/common/run_config_test.go
+++ b/builder/vmware/common/run_config_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/hashicorp/packer/common/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/vmware/common/step_configure_vnc.go b/builder/vmware/common/step_configure_vnc.go
index 72e5b56d6..6cc7ad3a7 100644
--- a/builder/vmware/common/step_configure_vnc.go
+++ b/builder/vmware/common/step_configure_vnc.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"math/rand"
 
-	"github.com/hashicorp/packer/common/net"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step configures the VM to enable the VNC server.
diff --git a/builder/vmware/common/step_vnc_boot_command.go b/builder/vmware/common/step_vnc_boot_command.go
index ff35cfed2..5e7837d8b 100644
--- a/builder/vmware/common/step_vnc_boot_command.go
+++ b/builder/vmware/common/step_vnc_boot_command.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/packer/common/bootcommand"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/go-vnc"
 )
diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go
index 18e068fdf..4110e1778 100644
--- a/builder/vmware/iso/builder.go
+++ b/builder/vmware/iso/builder.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 type Builder struct {
diff --git a/builder/vmware/iso/builder_test.go b/builder/vmware/iso/builder_test.go
index 868eb601a..57cc59ec2 100644
--- a/builder/vmware/iso/builder_test.go
+++ b/builder/vmware/iso/builder_test.go
@@ -106,7 +106,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", b.config.FloppyFiles)
 	}
 
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	b = Builder{}
 	_, warns, err = b.Prepare(config)
diff --git a/builder/vmware/iso/config.go b/builder/vmware/iso/config.go
index 3bb7908be..508204a2d 100644
--- a/builder/vmware/iso/config.go
+++ b/builder/vmware/iso/config.go
@@ -10,12 +10,12 @@ import (
 	"strings"
 
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/shutdowncommand"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/vmware/vmx/builder.go b/builder/vmware/vmx/builder.go
index daf27282d..d849dd613 100644
--- a/builder/vmware/vmx/builder.go
+++ b/builder/vmware/vmx/builder.go
@@ -9,10 +9,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 // Builder implements packer.Builder and builds the actual VMware
diff --git a/builder/vmware/vmx/builder_test.go b/builder/vmware/vmx/builder_test.go
index 66926b289..aaef376ac 100644
--- a/builder/vmware/vmx/builder_test.go
+++ b/builder/vmware/vmx/builder_test.go
@@ -36,7 +36,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", b.config.FloppyFiles)
 	}
 
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	b = Builder{}
 	_, warns, err = b.Prepare(config)
diff --git a/builder/vmware/vmx/config.go b/builder/vmware/vmx/config.go
index 6892156a6..f9f38e52e 100644
--- a/builder/vmware/vmx/config.go
+++ b/builder/vmware/vmx/config.go
@@ -8,12 +8,12 @@ import (
 	"os"
 
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/shutdowncommand"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/vsphere/clone/builder.go b/builder/vsphere/clone/builder.go
index 5c8bbdf7d..18ebe85a1 100644
--- a/builder/vsphere/clone/builder.go
+++ b/builder/vsphere/clone/builder.go
@@ -7,10 +7,10 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/vsphere/common"
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 type Builder struct {
diff --git a/builder/vsphere/clone/config.go b/builder/vsphere/clone/config.go
index dd612c9b7..8ac7a0f43 100644
--- a/builder/vsphere/clone/config.go
+++ b/builder/vsphere/clone/config.go
@@ -5,11 +5,11 @@ package clone
 
 import (
 	"github.com/hashicorp/packer/builder/vsphere/common"
-	packerCommon "github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	packerCommon "github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/vsphere/common/output_config.go b/builder/vsphere/common/output_config.go
index ddf9af1c4..6f605d25a 100644
--- a/builder/vsphere/common/output_config.go
+++ b/builder/vsphere/common/output_config.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/vsphere/common/step_boot_command.go b/builder/vsphere/common/step_boot_command.go
index 1c8f28cc6..a0eff022a 100644
--- a/builder/vsphere/common/step_boot_command.go
+++ b/builder/vsphere/common/step_boot_command.go
@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/common/bootcommand"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"golang.org/x/mobile/event/key"
 )
diff --git a/builder/vsphere/common/step_export.go b/builder/vsphere/common/step_export.go
index 057b732c7..c6a01c5a7 100644
--- a/builder/vsphere/common/step_export.go
+++ b/builder/vsphere/common/step_export.go
@@ -17,9 +17,9 @@ import (
 	"strings"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/pkg/errors"
 	"github.com/vmware/govmomi/nfc"
diff --git a/builder/vsphere/common/step_ssh_key_pair.go b/builder/vsphere/common/step_ssh_key_pair.go
index 4fe202893..643d4f09c 100644
--- a/builder/vsphere/common/step_ssh_key_pair.go
+++ b/builder/vsphere/common/step_ssh_key_pair.go
@@ -7,11 +7,11 @@ import (
 	"os"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/helper/ssh"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 // StepSshKeyPair executes the business logic for setting the SSH key pair in
diff --git a/builder/vsphere/iso/builder.go b/builder/vsphere/iso/builder.go
index ff2d58cb5..5db736fea 100644
--- a/builder/vsphere/iso/builder.go
+++ b/builder/vsphere/iso/builder.go
@@ -6,10 +6,10 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/vsphere/common"
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 type Builder struct {
diff --git a/builder/vsphere/iso/config.go b/builder/vsphere/iso/config.go
index 09b9b1723..21e78b58e 100644
--- a/builder/vsphere/iso/config.go
+++ b/builder/vsphere/iso/config.go
@@ -5,11 +5,11 @@ package iso
 
 import (
 	"github.com/hashicorp/packer/builder/vsphere/common"
-	packerCommon "github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	packerCommon "github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/builder/yandex/builder.go b/builder/yandex/builder.go
index 450386233..590579173 100644
--- a/builder/yandex/builder.go
+++ b/builder/yandex/builder.go
@@ -6,11 +6,11 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1"
 	"github.com/yandex-cloud/go-sdk/pkg/requestid"
diff --git a/builder/yandex/config.go b/builder/yandex/config.go
index 4aa24cb56..25fc61cd6 100644
--- a/builder/yandex/config.go
+++ b/builder/yandex/config.go
@@ -10,12 +10,12 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 const defaultGpuPlatformID = "gpu-standard-v1"
diff --git a/builder/yandex/step_create_image.go b/builder/yandex/step_create_image.go
index 13f989b81..86ad11371 100644
--- a/builder/yandex/step_create_image.go
+++ b/builder/yandex/step_create_image.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1"
 	ycsdk "github.com/yandex-cloud/go-sdk"
diff --git a/builder/yandex/step_create_instance.go b/builder/yandex/step_create_instance.go
index c22c49c28..2ae35f71d 100644
--- a/builder/yandex/step_create_instance.go
+++ b/builder/yandex/step_create_instance.go
@@ -7,10 +7,10 @@ import (
 	"io/ioutil"
 
 	"github.com/c2h5oh/datasize"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1"
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/vpc/v1"
diff --git a/builder/yandex/step_wait_cloudinit_script.go b/builder/yandex/step_wait_cloudinit_script.go
index 322f98f98..dcfdccd6e 100644
--- a/builder/yandex/step_wait_cloudinit_script.go
+++ b/builder/yandex/step_wait_cloudinit_script.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 const CloudInitScriptStatusKey = "cloud-init-status"
diff --git a/hcl2template/function/Consul.go b/hcl2template/function/Consul.go
index 4fc81a1e0..7690759b8 100644
--- a/hcl2template/function/Consul.go
+++ b/hcl2template/function/Consul.go
@@ -4,7 +4,7 @@ import (
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/function"
 
-	commontpl "github.com/hashicorp/packer/common/template"
+	commontpl "github.com/hashicorp/packer/packer-plugin-sdk/template"
 )
 
 // ConsulFunc constructs a function that retrieves KV secrets from HC vault
diff --git a/hcl2template/function/aws_secretetkey.go b/hcl2template/function/aws_secretetkey.go
index a76482464..24ec6053f 100644
--- a/hcl2template/function/aws_secretetkey.go
+++ b/hcl2template/function/aws_secretetkey.go
@@ -4,7 +4,7 @@ import (
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/function"
 
-	commontpl "github.com/hashicorp/packer/common/template"
+	commontpl "github.com/hashicorp/packer/packer-plugin-sdk/template"
 )
 
 // AWSSecret constructs a function that retrieves secrets from aws secrets
diff --git a/hcl2template/function/vault.go b/hcl2template/function/vault.go
index 6bec45935..baedf2c37 100644
--- a/hcl2template/function/vault.go
+++ b/hcl2template/function/vault.go
@@ -4,7 +4,7 @@ import (
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/function"
 
-	commontpl "github.com/hashicorp/packer/common/template"
+	commontpl "github.com/hashicorp/packer/packer-plugin-sdk/template"
 )
 
 // VaultFunc constructs a function that retrieves KV secrets from HC vault
diff --git a/helper/ssh/key_pair_test.go b/helper/ssh/key_pair_test.go
index 5ff182467..f24664913 100644
--- a/helper/ssh/key_pair_test.go
+++ b/helper/ssh/key_pair_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"golang.org/x/crypto/ed25519"
 	gossh "golang.org/x/crypto/ssh"
 )
diff --git a/main.go b/main.go
index d8f53845f..55b295b78 100644
--- a/main.go
+++ b/main.go
@@ -1,7 +1,7 @@
 // This is the main package for the `packer` application.
 
 //go:generate go run ./scripts/generate-plugins.go
-//go:generate go generate ./common/bootcommand/...
+//go:generate go generate ./packer-plugin-sdk/bootcommand/...
 package main
 
 import (
diff --git a/common/adapter/adapter.go b/packer-plugin-sdk/adapter/adapter.go
similarity index 100%
rename from common/adapter/adapter.go
rename to packer-plugin-sdk/adapter/adapter.go
diff --git a/common/adapter/adapter_test.go b/packer-plugin-sdk/adapter/adapter_test.go
similarity index 100%
rename from common/adapter/adapter_test.go
rename to packer-plugin-sdk/adapter/adapter_test.go
diff --git a/common/adapter/doc.go b/packer-plugin-sdk/adapter/doc.go
similarity index 100%
rename from common/adapter/doc.go
rename to packer-plugin-sdk/adapter/doc.go
diff --git a/common/adapter/scp.go b/packer-plugin-sdk/adapter/scp.go
similarity index 100%
rename from common/adapter/scp.go
rename to packer-plugin-sdk/adapter/scp.go
diff --git a/common/bootcommand/boot_command.go b/packer-plugin-sdk/bootcommand/boot_command.go
similarity index 100%
rename from common/bootcommand/boot_command.go
rename to packer-plugin-sdk/bootcommand/boot_command.go
diff --git a/common/bootcommand/boot_command.pigeon b/packer-plugin-sdk/bootcommand/boot_command.pigeon
similarity index 100%
rename from common/bootcommand/boot_command.pigeon
rename to packer-plugin-sdk/bootcommand/boot_command.pigeon
diff --git a/common/bootcommand/boot_command_ast.go b/packer-plugin-sdk/bootcommand/boot_command_ast.go
similarity index 100%
rename from common/bootcommand/boot_command_ast.go
rename to packer-plugin-sdk/bootcommand/boot_command_ast.go
diff --git a/common/bootcommand/boot_command_ast_test.go b/packer-plugin-sdk/bootcommand/boot_command_ast_test.go
similarity index 100%
rename from common/bootcommand/boot_command_ast_test.go
rename to packer-plugin-sdk/bootcommand/boot_command_ast_test.go
diff --git a/common/bootcommand/config.go b/packer-plugin-sdk/bootcommand/config.go
similarity index 100%
rename from common/bootcommand/config.go
rename to packer-plugin-sdk/bootcommand/config.go
diff --git a/common/bootcommand/config_test.go b/packer-plugin-sdk/bootcommand/config_test.go
similarity index 100%
rename from common/bootcommand/config_test.go
rename to packer-plugin-sdk/bootcommand/config_test.go
diff --git a/common/bootcommand/doc.go b/packer-plugin-sdk/bootcommand/doc.go
similarity index 100%
rename from common/bootcommand/doc.go
rename to packer-plugin-sdk/bootcommand/doc.go
diff --git a/common/bootcommand/driver.go b/packer-plugin-sdk/bootcommand/driver.go
similarity index 100%
rename from common/bootcommand/driver.go
rename to packer-plugin-sdk/bootcommand/driver.go
diff --git a/common/bootcommand/gen.go b/packer-plugin-sdk/bootcommand/gen.go
similarity index 100%
rename from common/bootcommand/gen.go
rename to packer-plugin-sdk/bootcommand/gen.go
diff --git a/common/bootcommand/pc_xt_driver.go b/packer-plugin-sdk/bootcommand/pc_xt_driver.go
similarity index 100%
rename from common/bootcommand/pc_xt_driver.go
rename to packer-plugin-sdk/bootcommand/pc_xt_driver.go
diff --git a/common/bootcommand/pc_xt_driver_test.go b/packer-plugin-sdk/bootcommand/pc_xt_driver_test.go
similarity index 100%
rename from common/bootcommand/pc_xt_driver_test.go
rename to packer-plugin-sdk/bootcommand/pc_xt_driver_test.go
diff --git a/common/bootcommand/usb_driver.go b/packer-plugin-sdk/bootcommand/usb_driver.go
similarity index 100%
rename from common/bootcommand/usb_driver.go
rename to packer-plugin-sdk/bootcommand/usb_driver.go
diff --git a/common/bootcommand/usb_driver_test.go b/packer-plugin-sdk/bootcommand/usb_driver_test.go
similarity index 100%
rename from common/bootcommand/usb_driver_test.go
rename to packer-plugin-sdk/bootcommand/usb_driver_test.go
diff --git a/common/bootcommand/vnc_driver.go b/packer-plugin-sdk/bootcommand/vnc_driver.go
similarity index 100%
rename from common/bootcommand/vnc_driver.go
rename to packer-plugin-sdk/bootcommand/vnc_driver.go
diff --git a/common/bootcommand/vnc_driver_test.go b/packer-plugin-sdk/bootcommand/vnc_driver_test.go
similarity index 100%
rename from common/bootcommand/vnc_driver_test.go
rename to packer-plugin-sdk/bootcommand/vnc_driver_test.go
diff --git a/common/chroot/cleanup.go b/packer-plugin-sdk/chroot/cleanup.go
similarity index 100%
rename from common/chroot/cleanup.go
rename to packer-plugin-sdk/chroot/cleanup.go
diff --git a/common/chroot/communicator.go b/packer-plugin-sdk/chroot/communicator.go
similarity index 98%
rename from common/chroot/communicator.go
rename to packer-plugin-sdk/chroot/communicator.go
index 7b07124af..33a6c4598 100644
--- a/common/chroot/communicator.go
+++ b/packer-plugin-sdk/chroot/communicator.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
diff --git a/common/chroot/communicator_test.go b/packer-plugin-sdk/chroot/communicator_test.go
similarity index 100%
rename from common/chroot/communicator_test.go
rename to packer-plugin-sdk/chroot/communicator_test.go
diff --git a/common/chroot/doc.go b/packer-plugin-sdk/chroot/doc.go
similarity index 100%
rename from common/chroot/doc.go
rename to packer-plugin-sdk/chroot/doc.go
diff --git a/common/chroot/interpolate_context_provider.go b/packer-plugin-sdk/chroot/interpolate_context_provider.go
similarity index 100%
rename from common/chroot/interpolate_context_provider.go
rename to packer-plugin-sdk/chroot/interpolate_context_provider.go
diff --git a/common/chroot/run_local_commands.go b/packer-plugin-sdk/chroot/run_local_commands.go
similarity index 89%
rename from common/chroot/run_local_commands.go
rename to packer-plugin-sdk/chroot/run_local_commands.go
index c760abb8c..320c7dcca 100644
--- a/common/chroot/run_local_commands.go
+++ b/packer-plugin-sdk/chroot/run_local_commands.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
-	sl "github.com/hashicorp/packer/common/shell-local"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	sl "github.com/hashicorp/packer/packer-plugin-sdk/shell-local"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/common/chroot/step_chroot_provision.go b/packer-plugin-sdk/chroot/step_chroot_provision.go
similarity index 91%
rename from common/chroot/step_chroot_provision.go
rename to packer-plugin-sdk/chroot/step_chroot_provision.go
index e18dae77d..5c0ab810a 100644
--- a/common/chroot/step_chroot_provision.go
+++ b/packer-plugin-sdk/chroot/step_chroot_provision.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"log"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 // StepChrootProvision provisions the instance within a chroot.
diff --git a/common/chroot/step_copy_files.go b/packer-plugin-sdk/chroot/step_copy_files.go
similarity index 97%
rename from common/chroot/step_copy_files.go
rename to packer-plugin-sdk/chroot/step_copy_files.go
index ecf011b38..a4f71f84f 100644
--- a/common/chroot/step_copy_files.go
+++ b/packer-plugin-sdk/chroot/step_copy_files.go
@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 )
 
 // StepCopyFiles copies some files from the host into the chroot environment.
diff --git a/common/chroot/step_copy_files_test.go b/packer-plugin-sdk/chroot/step_copy_files_test.go
similarity index 98%
rename from common/chroot/step_copy_files_test.go
rename to packer-plugin-sdk/chroot/step_copy_files_test.go
index 381f7ab82..40d5e46f4 100644
--- a/common/chroot/step_copy_files_test.go
+++ b/packer-plugin-sdk/chroot/step_copy_files_test.go
@@ -10,9 +10,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 )
 
 // testUI returns a test ui plus a function to retrieve the errors written to the ui
diff --git a/common/chroot/step_early_cleanup.go b/packer-plugin-sdk/chroot/step_early_cleanup.go
similarity index 100%
rename from common/chroot/step_early_cleanup.go
rename to packer-plugin-sdk/chroot/step_early_cleanup.go
diff --git a/common/chroot/step_mount_extra.go b/packer-plugin-sdk/chroot/step_mount_extra.go
similarity index 98%
rename from common/chroot/step_mount_extra.go
rename to packer-plugin-sdk/chroot/step_mount_extra.go
index a8a9f3ffb..f3f194f9b 100644
--- a/common/chroot/step_mount_extra.go
+++ b/packer-plugin-sdk/chroot/step_mount_extra.go
@@ -8,9 +8,9 @@ import (
 	"os/exec"
 	"syscall"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 )
 
 // StepMountExtra mounts the attached device.
diff --git a/common/chroot/step_mount_extra_test.go b/packer-plugin-sdk/chroot/step_mount_extra_test.go
similarity index 100%
rename from common/chroot/step_mount_extra_test.go
rename to packer-plugin-sdk/chroot/step_mount_extra_test.go
diff --git a/common/chroot/step_post_mount_commands.go b/packer-plugin-sdk/chroot/step_post_mount_commands.go
similarity index 95%
rename from common/chroot/step_post_mount_commands.go
rename to packer-plugin-sdk/chroot/step_post_mount_commands.go
index 77f0cfc72..4391795f5 100644
--- a/common/chroot/step_post_mount_commands.go
+++ b/packer-plugin-sdk/chroot/step_post_mount_commands.go
@@ -3,9 +3,9 @@ package chroot
 import (
 	"context"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 )
 
 type postMountCommandsData struct {
diff --git a/common/chroot/step_pre_mount_commands.go b/packer-plugin-sdk/chroot/step_pre_mount_commands.go
similarity index 95%
rename from common/chroot/step_pre_mount_commands.go
rename to packer-plugin-sdk/chroot/step_pre_mount_commands.go
index 8ff829917..c71ad96c7 100644
--- a/common/chroot/step_pre_mount_commands.go
+++ b/packer-plugin-sdk/chroot/step_pre_mount_commands.go
@@ -3,9 +3,9 @@ package chroot
 import (
 	"context"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 )
 
 type preMountCommandsData struct {
diff --git a/common/command.go b/packer-plugin-sdk/common/command.go
similarity index 100%
rename from common/command.go
rename to packer-plugin-sdk/common/command.go
diff --git a/common/packer_config.go b/packer-plugin-sdk/common/packer_config.go
similarity index 100%
rename from common/packer_config.go
rename to packer-plugin-sdk/common/packer_config.go
diff --git a/common/commonsteps/doc.go b/packer-plugin-sdk/commonsteps/doc.go
similarity index 100%
rename from common/commonsteps/doc.go
rename to packer-plugin-sdk/commonsteps/doc.go
diff --git a/common/commonsteps/extra_iso_config.go b/packer-plugin-sdk/commonsteps/extra_iso_config.go
similarity index 100%
rename from common/commonsteps/extra_iso_config.go
rename to packer-plugin-sdk/commonsteps/extra_iso_config.go
diff --git a/common/commonsteps/extra_iso_config_test.go b/packer-plugin-sdk/commonsteps/extra_iso_config_test.go
similarity index 100%
rename from common/commonsteps/extra_iso_config_test.go
rename to packer-plugin-sdk/commonsteps/extra_iso_config_test.go
diff --git a/common/commonsteps/floppy_config.go b/packer-plugin-sdk/commonsteps/floppy_config.go
similarity index 100%
rename from common/commonsteps/floppy_config.go
rename to packer-plugin-sdk/commonsteps/floppy_config.go
diff --git a/common/commonsteps/floppy_config_test.go b/packer-plugin-sdk/commonsteps/floppy_config_test.go
similarity index 100%
rename from common/commonsteps/floppy_config_test.go
rename to packer-plugin-sdk/commonsteps/floppy_config_test.go
diff --git a/common/commonsteps/http_config.go b/packer-plugin-sdk/commonsteps/http_config.go
similarity index 100%
rename from common/commonsteps/http_config.go
rename to packer-plugin-sdk/commonsteps/http_config.go
diff --git a/common/commonsteps/http_config_test.go b/packer-plugin-sdk/commonsteps/http_config_test.go
similarity index 100%
rename from common/commonsteps/http_config_test.go
rename to packer-plugin-sdk/commonsteps/http_config_test.go
diff --git a/common/commonsteps/iso_config.go b/packer-plugin-sdk/commonsteps/iso_config.go
similarity index 100%
rename from common/commonsteps/iso_config.go
rename to packer-plugin-sdk/commonsteps/iso_config.go
diff --git a/common/commonsteps/iso_config_test.go b/packer-plugin-sdk/commonsteps/iso_config_test.go
similarity index 100%
rename from common/commonsteps/iso_config_test.go
rename to packer-plugin-sdk/commonsteps/iso_config_test.go
diff --git a/common/commonsteps/multistep_debug.go b/packer-plugin-sdk/commonsteps/multistep_debug.go
similarity index 100%
rename from common/commonsteps/multistep_debug.go
rename to packer-plugin-sdk/commonsteps/multistep_debug.go
diff --git a/common/commonsteps/multistep_runner.go b/packer-plugin-sdk/commonsteps/multistep_runner.go
similarity index 98%
rename from common/commonsteps/multistep_runner.go
rename to packer-plugin-sdk/commonsteps/multistep_runner.go
index 5c7508203..7eecffbe4 100644
--- a/common/commonsteps/multistep_runner.go
+++ b/packer-plugin-sdk/commonsteps/multistep_runner.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 )
 
 func newRunner(steps []multistep.Step, config common.PackerConfig, ui packer.Ui) (multistep.Runner, multistep.DebugPauseFn) {
diff --git a/common/commonsteps/step_cleanup_temp_keys.go b/packer-plugin-sdk/commonsteps/step_cleanup_temp_keys.go
similarity index 100%
rename from common/commonsteps/step_cleanup_temp_keys.go
rename to packer-plugin-sdk/commonsteps/step_cleanup_temp_keys.go
diff --git a/common/commonsteps/step_create_cdrom.go b/packer-plugin-sdk/commonsteps/step_create_cdrom.go
similarity index 99%
rename from common/commonsteps/step_create_cdrom.go
rename to packer-plugin-sdk/commonsteps/step_create_cdrom.go
index 26b6639e5..151468514 100644
--- a/common/commonsteps/step_create_cdrom.go
+++ b/packer-plugin-sdk/commonsteps/step_create_cdrom.go
@@ -11,9 +11,9 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/hashicorp/packer/common/shell-local/localexec"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell-local/localexec"
 	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
diff --git a/common/commonsteps/step_create_cdrom_test.go b/packer-plugin-sdk/commonsteps/step_create_cdrom_test.go
similarity index 100%
rename from common/commonsteps/step_create_cdrom_test.go
rename to packer-plugin-sdk/commonsteps/step_create_cdrom_test.go
diff --git a/common/commonsteps/step_create_floppy.go b/packer-plugin-sdk/commonsteps/step_create_floppy.go
similarity index 100%
rename from common/commonsteps/step_create_floppy.go
rename to packer-plugin-sdk/commonsteps/step_create_floppy.go
diff --git a/common/commonsteps/step_create_floppy_test.go b/packer-plugin-sdk/commonsteps/step_create_floppy_test.go
similarity index 100%
rename from common/commonsteps/step_create_floppy_test.go
rename to packer-plugin-sdk/commonsteps/step_create_floppy_test.go
diff --git a/common/commonsteps/step_download.go b/packer-plugin-sdk/commonsteps/step_download.go
similarity index 99%
rename from common/commonsteps/step_download.go
rename to packer-plugin-sdk/commonsteps/step_download.go
index b23585b37..b90bd3ef3 100644
--- a/common/commonsteps/step_download.go
+++ b/packer-plugin-sdk/commonsteps/step_download.go
@@ -17,9 +17,9 @@ import (
 	getter "github.com/hashicorp/go-getter/v2"
 	urlhelper "github.com/hashicorp/go-getter/v2/helper/url"
 
-	"github.com/hashicorp/packer/common/filelock"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/filelock"
 )
 
 // StepDownload downloads a remote file using the download client within
diff --git a/common/commonsteps/step_download_test.go b/packer-plugin-sdk/commonsteps/step_download_test.go
similarity index 100%
rename from common/commonsteps/step_download_test.go
rename to packer-plugin-sdk/commonsteps/step_download_test.go
diff --git a/common/commonsteps/step_http_server.go b/packer-plugin-sdk/commonsteps/step_http_server.go
similarity index 96%
rename from common/commonsteps/step_http_server.go
rename to packer-plugin-sdk/commonsteps/step_http_server.go
index df0673774..f2c1e08c0 100644
--- a/common/commonsteps/step_http_server.go
+++ b/packer-plugin-sdk/commonsteps/step_http_server.go
@@ -6,9 +6,9 @@ import (
 
 	"net/http"
 
-	"github.com/hashicorp/packer/common/net"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step creates and runs the HTTP server that is serving files from the
diff --git a/common/commonsteps/step_output_dir.go b/packer-plugin-sdk/commonsteps/step_output_dir.go
similarity index 100%
rename from common/commonsteps/step_output_dir.go
rename to packer-plugin-sdk/commonsteps/step_output_dir.go
diff --git a/common/commonsteps/step_output_dir_test.go b/packer-plugin-sdk/commonsteps/step_output_dir_test.go
similarity index 100%
rename from common/commonsteps/step_output_dir_test.go
rename to packer-plugin-sdk/commonsteps/step_output_dir_test.go
diff --git a/common/commonsteps/step_provision.go b/packer-plugin-sdk/commonsteps/step_provision.go
similarity index 100%
rename from common/commonsteps/step_provision.go
rename to packer-plugin-sdk/commonsteps/step_provision.go
diff --git a/common/commonsteps/step_provision_test.go b/packer-plugin-sdk/commonsteps/step_provision_test.go
similarity index 100%
rename from common/commonsteps/step_provision_test.go
rename to packer-plugin-sdk/commonsteps/step_provision_test.go
diff --git a/common/commonsteps/test-fixtures/SomeDir/myfile.txt b/packer-plugin-sdk/commonsteps/test-fixtures/SomeDir/myfile.txt
similarity index 100%
rename from common/commonsteps/test-fixtures/SomeDir/myfile.txt
rename to packer-plugin-sdk/commonsteps/test-fixtures/SomeDir/myfile.txt
diff --git a/common/commonsteps/test-fixtures/floppy-hier/test-0/file1 b/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file1
similarity index 100%
rename from common/commonsteps/test-fixtures/floppy-hier/test-0/file1
rename to packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file1
diff --git a/common/commonsteps/test-fixtures/floppy-hier/test-0/file2 b/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file2
similarity index 100%
rename from common/commonsteps/test-fixtures/floppy-hier/test-0/file2
rename to packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file2
diff --git a/common/commonsteps/test-fixtures/floppy-hier/test-0/file3 b/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file3
similarity index 100%
rename from common/commonsteps/test-fixtures/floppy-hier/test-0/file3
rename to packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file3
diff --git a/common/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 b/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1
similarity index 100%
rename from common/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1
rename to packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1
diff --git a/common/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 b/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2
similarity index 100%
rename from common/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2
rename to packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2
diff --git a/common/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 b/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3
similarity index 100%
rename from common/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3
rename to packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3
diff --git a/common/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 b/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1
similarity index 100%
rename from common/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1
rename to packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1
diff --git a/common/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 b/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1
similarity index 100%
rename from common/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1
rename to packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1
diff --git a/common/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 b/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2
similarity index 100%
rename from common/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2
rename to packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2
diff --git a/common/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 b/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1
similarity index 100%
rename from common/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1
rename to packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1
diff --git a/common/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 b/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2
similarity index 100%
rename from common/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2
rename to packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2
diff --git a/common/commonsteps/test-fixtures/root/another.txt b/packer-plugin-sdk/commonsteps/test-fixtures/root/another.txt
similarity index 100%
rename from common/commonsteps/test-fixtures/root/another.txt
rename to packer-plugin-sdk/commonsteps/test-fixtures/root/another.txt
diff --git a/common/commonsteps/test-fixtures/root/another.txt.sha1sum b/packer-plugin-sdk/commonsteps/test-fixtures/root/another.txt.sha1sum
similarity index 100%
rename from common/commonsteps/test-fixtures/root/another.txt.sha1sum
rename to packer-plugin-sdk/commonsteps/test-fixtures/root/another.txt.sha1sum
diff --git a/common/commonsteps/test-fixtures/root/basic.txt b/packer-plugin-sdk/commonsteps/test-fixtures/root/basic.txt
similarity index 100%
rename from common/commonsteps/test-fixtures/root/basic.txt
rename to packer-plugin-sdk/commonsteps/test-fixtures/root/basic.txt
diff --git a/common/commonsteps/test-fixtures/root/basic.txt.sha1sum b/packer-plugin-sdk/commonsteps/test-fixtures/root/basic.txt.sha1sum
similarity index 100%
rename from common/commonsteps/test-fixtures/root/basic.txt.sha1sum
rename to packer-plugin-sdk/commonsteps/test-fixtures/root/basic.txt.sha1sum
diff --git a/common/commonsteps/test-fixtures/root/subfolder.sum b/packer-plugin-sdk/commonsteps/test-fixtures/root/subfolder.sum
similarity index 100%
rename from common/commonsteps/test-fixtures/root/subfolder.sum
rename to packer-plugin-sdk/commonsteps/test-fixtures/root/subfolder.sum
diff --git a/common/filelock/doc.go b/packer-plugin-sdk/filelock/doc.go
similarity index 100%
rename from common/filelock/doc.go
rename to packer-plugin-sdk/filelock/doc.go
diff --git a/common/filelock/filelock.go b/packer-plugin-sdk/filelock/filelock.go
similarity index 100%
rename from common/filelock/filelock.go
rename to packer-plugin-sdk/filelock/filelock.go
diff --git a/common/filelock/filelock_solaris.go b/packer-plugin-sdk/filelock/filelock_solaris.go
similarity index 100%
rename from common/filelock/filelock_solaris.go
rename to packer-plugin-sdk/filelock/filelock_solaris.go
diff --git a/common/filelock/noop.go b/packer-plugin-sdk/filelock/noop.go
similarity index 100%
rename from common/filelock/noop.go
rename to packer-plugin-sdk/filelock/noop.go
diff --git a/common/guestexec/doc.go b/packer-plugin-sdk/guestexec/doc.go
similarity index 100%
rename from common/guestexec/doc.go
rename to packer-plugin-sdk/guestexec/doc.go
diff --git a/common/guestexec/elevated.go b/packer-plugin-sdk/guestexec/elevated.go
similarity index 99%
rename from common/guestexec/elevated.go
rename to packer-plugin-sdk/guestexec/elevated.go
index dd46a450f..4abfc99af 100644
--- a/common/guestexec/elevated.go
+++ b/packer-plugin-sdk/guestexec/elevated.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type ElevatedProvisioner interface {
diff --git a/common/guestexec/elevated_test.go b/packer-plugin-sdk/guestexec/elevated_test.go
similarity index 100%
rename from common/guestexec/elevated_test.go
rename to packer-plugin-sdk/guestexec/elevated_test.go
diff --git a/common/guestexec/guest_commands.go b/packer-plugin-sdk/guestexec/guest_commands.go
similarity index 100%
rename from common/guestexec/guest_commands.go
rename to packer-plugin-sdk/guestexec/guest_commands.go
diff --git a/common/guestexec/guest_commands_test.go b/packer-plugin-sdk/guestexec/guest_commands_test.go
similarity index 100%
rename from common/guestexec/guest_commands_test.go
rename to packer-plugin-sdk/guestexec/guest_commands_test.go
diff --git a/common/iochan/iochan.go b/packer-plugin-sdk/iochan/iochan.go
similarity index 100%
rename from common/iochan/iochan.go
rename to packer-plugin-sdk/iochan/iochan.go
diff --git a/common/iochan/iochan_test.go b/packer-plugin-sdk/iochan/iochan_test.go
similarity index 100%
rename from common/iochan/iochan_test.go
rename to packer-plugin-sdk/iochan/iochan_test.go
diff --git a/common/json/unmarshal.go b/packer-plugin-sdk/json/unmarshal.go
similarity index 100%
rename from common/json/unmarshal.go
rename to packer-plugin-sdk/json/unmarshal.go
diff --git a/common/json/unmarshal_test.go b/packer-plugin-sdk/json/unmarshal_test.go
similarity index 100%
rename from common/json/unmarshal_test.go
rename to packer-plugin-sdk/json/unmarshal_test.go
diff --git a/common/net/configure_port.go b/packer-plugin-sdk/net/configure_port.go
similarity index 96%
rename from common/net/configure_port.go
rename to packer-plugin-sdk/net/configure_port.go
index 950e7a892..3ab0bed3e 100644
--- a/common/net/configure_port.go
+++ b/packer-plugin-sdk/net/configure_port.go
@@ -10,9 +10,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/hashicorp/packer/common/filelock"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/filelock"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 var _ net.Listener = &Listener{}
diff --git a/common/net/configure_port_test.go b/packer-plugin-sdk/net/configure_port_test.go
similarity index 100%
rename from common/net/configure_port_test.go
rename to packer-plugin-sdk/net/configure_port_test.go
diff --git a/common/net/default_client.go b/packer-plugin-sdk/net/default_client.go
similarity index 100%
rename from common/net/default_client.go
rename to packer-plugin-sdk/net/default_client.go
diff --git a/common/packerbuilderdata/generated_data.go b/packer-plugin-sdk/packerbuilderdata/generated_data.go
similarity index 100%
rename from common/packerbuilderdata/generated_data.go
rename to packer-plugin-sdk/packerbuilderdata/generated_data.go
diff --git a/common/packerbuilderdata/generated_data_test.go b/packer-plugin-sdk/packerbuilderdata/generated_data_test.go
similarity index 100%
rename from common/packerbuilderdata/generated_data_test.go
rename to packer-plugin-sdk/packerbuilderdata/generated_data_test.go
diff --git a/common/random/string.go b/packer-plugin-sdk/random/string.go
similarity index 100%
rename from common/random/string.go
rename to packer-plugin-sdk/random/string.go
diff --git a/common/retry/retry.go b/packer-plugin-sdk/retry/retry.go
similarity index 100%
rename from common/retry/retry.go
rename to packer-plugin-sdk/retry/retry.go
diff --git a/common/retry/retry_test.go b/packer-plugin-sdk/retry/retry_test.go
similarity index 100%
rename from common/retry/retry_test.go
rename to packer-plugin-sdk/retry/retry_test.go
diff --git a/common/retry/utils_test.go b/packer-plugin-sdk/retry/utils_test.go
similarity index 100%
rename from common/retry/utils_test.go
rename to packer-plugin-sdk/retry/utils_test.go
diff --git a/common/shell-local/communicator.go b/packer-plugin-sdk/shell-local/communicator.go
similarity index 100%
rename from common/shell-local/communicator.go
rename to packer-plugin-sdk/shell-local/communicator.go
diff --git a/common/shell-local/communicator_test.go b/packer-plugin-sdk/shell-local/communicator_test.go
similarity index 100%
rename from common/shell-local/communicator_test.go
rename to packer-plugin-sdk/shell-local/communicator_test.go
diff --git a/common/shell-local/config.go b/packer-plugin-sdk/shell-local/config.go
similarity index 99%
rename from common/shell-local/config.go
rename to packer-plugin-sdk/shell-local/config.go
index e86d82676..f8cd434ad 100644
--- a/common/shell-local/config.go
+++ b/packer-plugin-sdk/shell-local/config.go
@@ -10,9 +10,9 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/hashicorp/packer/common/shell"
 	configHelper "github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/common/shell-local/config.hcl2spec.go b/packer-plugin-sdk/shell-local/config.hcl2spec.go
similarity index 100%
rename from common/shell-local/config.hcl2spec.go
rename to packer-plugin-sdk/shell-local/config.hcl2spec.go
diff --git a/common/shell-local/config_test.go b/packer-plugin-sdk/shell-local/config_test.go
similarity index 100%
rename from common/shell-local/config_test.go
rename to packer-plugin-sdk/shell-local/config_test.go
diff --git a/common/shell-local/doc.go b/packer-plugin-sdk/shell-local/doc.go
similarity index 100%
rename from common/shell-local/doc.go
rename to packer-plugin-sdk/shell-local/doc.go
diff --git a/common/shell-local/localexec/run_and_stream.go b/packer-plugin-sdk/shell-local/localexec/run_and_stream.go
similarity index 97%
rename from common/shell-local/localexec/run_and_stream.go
rename to packer-plugin-sdk/shell-local/localexec/run_and_stream.go
index 9c598e608..d1c7d8d1c 100644
--- a/common/shell-local/localexec/run_and_stream.go
+++ b/packer-plugin-sdk/shell-local/localexec/run_and_stream.go
@@ -10,8 +10,8 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/hashicorp/packer/common/iochan"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/iochan"
 )
 
 // RunAndStream allows you to run a local command and stream output to the UI.
diff --git a/common/shell-local/localexec/run_and_stream_test.go b/packer-plugin-sdk/shell-local/localexec/run_and_stream_test.go
similarity index 100%
rename from common/shell-local/localexec/run_and_stream_test.go
rename to packer-plugin-sdk/shell-local/localexec/run_and_stream_test.go
diff --git a/common/shell-local/run.go b/packer-plugin-sdk/shell-local/run.go
similarity index 99%
rename from common/shell-local/run.go
rename to packer-plugin-sdk/shell-local/run.go
index 5f67fd056..4713b0827 100644
--- a/common/shell-local/run.go
+++ b/packer-plugin-sdk/shell-local/run.go
@@ -11,8 +11,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
diff --git a/common/shell/exit_code.go b/packer-plugin-sdk/shell/exit_code.go
similarity index 100%
rename from common/shell/exit_code.go
rename to packer-plugin-sdk/shell/exit_code.go
diff --git a/common/shell/exit_code_test.go b/packer-plugin-sdk/shell/exit_code_test.go
similarity index 100%
rename from common/shell/exit_code_test.go
rename to packer-plugin-sdk/shell/exit_code_test.go
diff --git a/common/shell/shell.go b/packer-plugin-sdk/shell/shell.go
similarity index 97%
rename from common/shell/shell.go
rename to packer-plugin-sdk/shell/shell.go
index 845e158eb..6aa03dfb0 100644
--- a/common/shell/shell.go
+++ b/packer-plugin-sdk/shell/shell.go
@@ -1,7 +1,7 @@
 // Package shell defines code that is common in shells
 package shell
 
-import "github.com/hashicorp/packer/common"
+import "github.com/hashicorp/packer/packer-plugin-sdk/common"
 
 // Provisioner contains common fields to all shell provisioners.
 // It is provided as a convenience to encourage plugin developers to
diff --git a/common/shutdowncommand/config.go b/packer-plugin-sdk/shutdowncommand/config.go
similarity index 100%
rename from common/shutdowncommand/config.go
rename to packer-plugin-sdk/shutdowncommand/config.go
diff --git a/common/shutdowncommand/config_test.go b/packer-plugin-sdk/shutdowncommand/config_test.go
similarity index 100%
rename from common/shutdowncommand/config_test.go
rename to packer-plugin-sdk/shutdowncommand/config_test.go
diff --git a/common/template/funcs.go b/packer-plugin-sdk/template/funcs.go
similarity index 100%
rename from common/template/funcs.go
rename to packer-plugin-sdk/template/funcs.go
diff --git a/packer-plugin-sdk/template/interpolate/funcs.go b/packer-plugin-sdk/template/interpolate/funcs.go
index 471343151..d8b6e13f5 100644
--- a/packer-plugin-sdk/template/interpolate/funcs.go
+++ b/packer-plugin-sdk/template/interpolate/funcs.go
@@ -10,9 +10,9 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/hashicorp/packer/common/packerbuilderdata"
-	commontpl "github.com/hashicorp/packer/common/template"
-	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	commontpl "github.com/hashicorp/packer/packer-plugin-sdk/template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	strftime "github.com/jehiah/go-strftime"
 )
 
diff --git a/packer-plugin-sdk/template/interpolate/funcs_test.go b/packer-plugin-sdk/template/interpolate/funcs_test.go
index 4a11be88b..7de9b4707 100644
--- a/packer-plugin-sdk/template/interpolate/funcs_test.go
+++ b/packer-plugin-sdk/template/interpolate/funcs_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 func TestFuncBuildName(t *testing.T) {
diff --git a/packer-plugin-sdk/test-fixtures/SomeDir/myfile.txt b/packer-plugin-sdk/test-fixtures/SomeDir/myfile.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/common/test-fixtures/decompress-tar/outside_parent.tar b/packer-plugin-sdk/test-fixtures/decompress-tar/outside_parent.tar
similarity index 100%
rename from common/test-fixtures/decompress-tar/outside_parent.tar
rename to packer-plugin-sdk/test-fixtures/decompress-tar/outside_parent.tar
diff --git a/common/test-fixtures/floppies/bar.bat b/packer-plugin-sdk/test-fixtures/floppies/bar.bat
similarity index 100%
rename from common/test-fixtures/floppies/bar.bat
rename to packer-plugin-sdk/test-fixtures/floppies/bar.bat
diff --git a/common/test-fixtures/floppies/foo.ps1 b/packer-plugin-sdk/test-fixtures/floppies/foo.ps1
similarity index 100%
rename from common/test-fixtures/floppies/foo.ps1
rename to packer-plugin-sdk/test-fixtures/floppies/foo.ps1
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file1
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file2 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file2
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file3 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file3
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file1
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file2 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file2
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file3 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file3
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/file1
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2
new file mode 100644
index 000000000..e69de29bb
diff --git a/common/uuid/uuid.go b/packer-plugin-sdk/uuid/uuid.go
similarity index 100%
rename from common/uuid/uuid.go
rename to packer-plugin-sdk/uuid/uuid.go
diff --git a/common/uuid/uuid_test.go b/packer-plugin-sdk/uuid/uuid_test.go
similarity index 100%
rename from common/uuid/uuid_test.go
rename to packer-plugin-sdk/uuid/uuid_test.go
diff --git a/packer/build.go b/packer/build.go
index f495aa5e1..28e02f3c5 100644
--- a/packer/build.go
+++ b/packer/build.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"sync"
 
-	"github.com/hashicorp/packer/common/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 	"github.com/hashicorp/packer/version"
 )
 
diff --git a/packer/build_test.go b/packer/build_test.go
index 5d0805361..49ff68f68 100644
--- a/packer/build_test.go
+++ b/packer/build_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/packer/common/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 	"github.com/hashicorp/packer/version"
 )
 
diff --git a/packer/communicator_test.go b/packer/communicator_test.go
index 097ca25d0..40450e98e 100644
--- a/packer/communicator_test.go
+++ b/packer/communicator_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/packer/common/iochan"
+	"github.com/hashicorp/packer/packer-plugin-sdk/iochan"
 	"golang.org/x/sync/errgroup"
 )
 
diff --git a/packer/provisioner.go b/packer/provisioner.go
index 9e34ccc1d..78da57524 100644
--- a/packer/provisioner.go
+++ b/packer/provisioner.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 // A provisioner is responsible for installing and configuring software
diff --git a/packer/rpc/ui_progress_tracking.go b/packer/rpc/ui_progress_tracking.go
index 4488c1bac..4f22835e1 100644
--- a/packer/rpc/ui_progress_tracking.go
+++ b/packer/rpc/ui_progress_tracking.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"net/rpc"
 
-	"github.com/hashicorp/packer/common/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 )
 
 // TrackProgress starts a pair of ProgressTrackingClient and ProgressProgressTrackingServer
diff --git a/post-processor/amazon-import/post-processor.go b/post-processor/amazon-import/post-processor.go
index 32849f704..a97d8501c 100644
--- a/post-processor/amazon-import/post-processor.go
+++ b/post-processor/amazon-import/post-processor.go
@@ -16,10 +16,10 @@ import (
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/post-processor/artifice/post-processor.go b/post-processor/artifice/post-processor.go
index 9efcc4df6..2131d2c01 100644
--- a/post-processor/artifice/post-processor.go
+++ b/post-processor/artifice/post-processor.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/post-processor/checksum/post-processor.go b/post-processor/checksum/post-processor.go
index 207dda872..c2cc5b080 100644
--- a/post-processor/checksum/post-processor.go
+++ b/post-processor/checksum/post-processor.go
@@ -15,9 +15,9 @@ import (
 	"path/filepath"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/post-processor/compress/post-processor.go b/post-processor/compress/post-processor.go
index 2eeab4bf9..fb37aeceb 100644
--- a/post-processor/compress/post-processor.go
+++ b/post-processor/compress/post-processor.go
@@ -15,9 +15,9 @@ import (
 
 	"github.com/biogo/hts/bgzf"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/klauspost/pgzip"
 	"github.com/pierrec/lz4"
diff --git a/post-processor/digitalocean-import/post-processor.go b/post-processor/digitalocean-import/post-processor.go
index 6cda2f483..5914de3f0 100644
--- a/post-processor/digitalocean-import/post-processor.go
+++ b/post-processor/digitalocean-import/post-processor.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/digitalocean"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/post-processor/docker-import/post-processor.go b/post-processor/docker-import/post-processor.go
index 68260ea6e..a0562395a 100644
--- a/post-processor/docker-import/post-processor.go
+++ b/post-processor/docker-import/post-processor.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/docker"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/post-processor/artifice"
 )
diff --git a/post-processor/docker-push/post-processor.go b/post-processor/docker-push/post-processor.go
index 4c90fb25f..6683aa299 100644
--- a/post-processor/docker-push/post-processor.go
+++ b/post-processor/docker-push/post-processor.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/docker"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	dockerimport "github.com/hashicorp/packer/post-processor/docker-import"
 	dockertag "github.com/hashicorp/packer/post-processor/docker-tag"
diff --git a/post-processor/docker-save/post-processor.go b/post-processor/docker-save/post-processor.go
index 0ab8a3374..1cbe7e5f0 100644
--- a/post-processor/docker-save/post-processor.go
+++ b/post-processor/docker-save/post-processor.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/docker"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	dockerimport "github.com/hashicorp/packer/post-processor/docker-import"
 	dockertag "github.com/hashicorp/packer/post-processor/docker-tag"
diff --git a/post-processor/docker-tag/post-processor.go b/post-processor/docker-tag/post-processor.go
index 4a26e5b41..c8cd44608 100644
--- a/post-processor/docker-tag/post-processor.go
+++ b/post-processor/docker-tag/post-processor.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/docker"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	dockerimport "github.com/hashicorp/packer/post-processor/docker-import"
 )
diff --git a/post-processor/exoscale-import/post-processor.go b/post-processor/exoscale-import/post-processor.go
index 08e60cee6..14f5aa23b 100644
--- a/post-processor/exoscale-import/post-processor.go
+++ b/post-processor/exoscale-import/post-processor.go
@@ -20,9 +20,9 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/file"
 	"github.com/hashicorp/packer/builder/qemu"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/post-processor/artifice"
 	"github.com/hashicorp/packer/post-processor/exoscale-import/version"
 )
diff --git a/post-processor/googlecompute-export/post-processor.go b/post-processor/googlecompute-export/post-processor.go
index c0ef8aa05..c5707266c 100644
--- a/post-processor/googlecompute-export/post-processor.go
+++ b/post-processor/googlecompute-export/post-processor.go
@@ -11,12 +11,12 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/googlecompute"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/post-processor/artifice"
 )
diff --git a/post-processor/googlecompute-import/post-processor.go b/post-processor/googlecompute-import/post-processor.go
index 09fcee685..c86ddbac3 100644
--- a/post-processor/googlecompute-import/post-processor.go
+++ b/post-processor/googlecompute-import/post-processor.go
@@ -16,9 +16,9 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/googlecompute"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/post-processor/artifice"
 	"github.com/hashicorp/packer/post-processor/compress"
diff --git a/post-processor/manifest/post-processor.go b/post-processor/manifest/post-processor.go
index 7b5fa88a9..0ee7cdb68 100644
--- a/post-processor/manifest/post-processor.go
+++ b/post-processor/manifest/post-processor.go
@@ -14,9 +14,9 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/post-processor/shell-local/post-processor.go b/post-processor/shell-local/post-processor.go
index a17ce67e3..b7ce71673 100644
--- a/post-processor/shell-local/post-processor.go
+++ b/post-processor/shell-local/post-processor.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	sl "github.com/hashicorp/packer/common/shell-local"
 	"github.com/hashicorp/packer/packer"
+	sl "github.com/hashicorp/packer/packer-plugin-sdk/shell-local"
 )
 
 type PostProcessor struct {
diff --git a/post-processor/ucloud-import/post-processor.go b/post-processor/ucloud-import/post-processor.go
index 9850c70e6..22fabbbf5 100644
--- a/post-processor/ucloud-import/post-processor.go
+++ b/post-processor/ucloud-import/post-processor.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/ucloud/ucloud-sdk-go/services/ufile"
 	"github.com/ucloud/ucloud-sdk-go/services/uhost"
diff --git a/post-processor/vagrant-cloud/client.go b/post-processor/vagrant-cloud/client.go
index 9234da935..b2df04035 100644
--- a/post-processor/vagrant-cloud/client.go
+++ b/post-processor/vagrant-cloud/client.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/hashicorp/packer/common/net"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 type VagrantCloudClient struct {
diff --git a/post-processor/vagrant-cloud/post-processor.go b/post-processor/vagrant-cloud/post-processor.go
index 5e4f9798e..8c91d5f3a 100644
--- a/post-processor/vagrant-cloud/post-processor.go
+++ b/post-processor/vagrant-cloud/post-processor.go
@@ -19,11 +19,11 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/post-processor/vagrant-cloud/step_upload.go b/post-processor/vagrant-cloud/step_upload.go
index a0b48d36c..ef0b59d19 100644
--- a/post-processor/vagrant-cloud/step_upload.go
+++ b/post-processor/vagrant-cloud/step_upload.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type stepUpload struct {
diff --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go
index f9a1d1f05..79fd37473 100644
--- a/post-processor/vagrant/post-processor.go
+++ b/post-processor/vagrant/post-processor.go
@@ -16,9 +16,9 @@ import (
 	"text/template"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 	"github.com/hashicorp/packer/post-processor/artifice"
diff --git a/post-processor/vagrant/virtualbox_test.go b/post-processor/vagrant/virtualbox_test.go
index cd088519c..3f072366d 100644
--- a/post-processor/vagrant/virtualbox_test.go
+++ b/post-processor/vagrant/virtualbox_test.go
@@ -18,7 +18,7 @@ func TestDecomressOVA(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(td)
 
-	fixture := "../../common/test-fixtures/decompress-tar/outside_parent.tar"
+	fixture := "../../packer-plugin-sdk/test-fixtures/decompress-tar/outside_parent.tar"
 	err = DecompressOva(td, fixture)
 	assert.NoError(t, err)
 	_, err = os.Stat(filepath.Join(filepath.Base(td), "demo.poc"))
diff --git a/post-processor/vsphere-template/post-processor.go b/post-processor/vsphere-template/post-processor.go
index 4986500eb..017529604 100644
--- a/post-processor/vsphere-template/post-processor.go
+++ b/post-processor/vsphere-template/post-processor.go
@@ -13,11 +13,11 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
 	vsphere "github.com/hashicorp/packer/builder/vsphere/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/post-processor/artifice"
 	vspherepost "github.com/hashicorp/packer/post-processor/vsphere"
diff --git a/post-processor/vsphere/post-processor.go b/post-processor/vsphere/post-processor.go
index 9c25dff10..f9661076c 100644
--- a/post-processor/vsphere/post-processor.go
+++ b/post-processor/vsphere/post-processor.go
@@ -15,10 +15,10 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	shelllocal "github.com/hashicorp/packer/common/shell-local"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	shelllocal "github.com/hashicorp/packer/packer-plugin-sdk/shell-local"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/post-processor/yandex-export/post-processor.go b/post-processor/yandex-export/post-processor.go
index 38741484c..48bf1b30e 100644
--- a/post-processor/yandex-export/post-processor.go
+++ b/post-processor/yandex-export/post-processor.go
@@ -13,12 +13,12 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/yandex"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/post-processor/artifice"
 )
diff --git a/post-processor/yandex-import/post-processor.go b/post-processor/yandex-import/post-processor.go
index e855fe5da..fa6f8ab2f 100644
--- a/post-processor/yandex-import/post-processor.go
+++ b/post-processor/yandex-import/post-processor.go
@@ -11,9 +11,9 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/file"
 	"github.com/hashicorp/packer/builder/yandex"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/post-processor/artifice"
 	"github.com/hashicorp/packer/post-processor/compress"
diff --git a/provisioner/ansible-local/provisioner.go b/provisioner/ansible-local/provisioner.go
index 33f18435c..96dfc3593 100644
--- a/provisioner/ansible-local/provisioner.go
+++ b/provisioner/ansible-local/provisioner.go
@@ -10,12 +10,12 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 const DefaultStagingDir = "/tmp/packer-provisioner-ansible-local"
diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go
index ed7a8b378..a0e5318ba 100644
--- a/provisioner/ansible/provisioner.go
+++ b/provisioner/ansible/provisioner.go
@@ -30,11 +30,11 @@ import (
 	"golang.org/x/crypto/ssh"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/adapter"
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/adapter"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
diff --git a/provisioner/ansible/provisioner_test.go b/provisioner/ansible/provisioner_test.go
index 18da6d92a..b3ebb2380 100644
--- a/provisioner/ansible/provisioner_test.go
+++ b/provisioner/ansible/provisioner_test.go
@@ -14,9 +14,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/packer/common/commonsteps"
 	confighelper "github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/provisioner/azure-dtlartifact/provisioner.go b/provisioner/azure-dtlartifact/provisioner.go
index 9065bd07e..034d29ee6 100644
--- a/provisioner/azure-dtlartifact/provisioner.go
+++ b/provisioner/azure-dtlartifact/provisioner.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/hashicorp/packer/packer"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/provisioner/breakpoint/provisioner.go b/provisioner/breakpoint/provisioner.go
index 2e5da91a8..8fa9b1e11 100644
--- a/provisioner/breakpoint/provisioner.go
+++ b/provisioner/breakpoint/provisioner.go
@@ -9,9 +9,9 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/provisioner/chef-client/provisioner.go b/provisioner/chef-client/provisioner.go
index ac9d0bdb9..22b9bd363 100644
--- a/provisioner/chef-client/provisioner.go
+++ b/provisioner/chef-client/provisioner.go
@@ -16,12 +16,12 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/guestexec"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/guestexec"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type guestOSTypeConfig struct {
diff --git a/provisioner/chef-solo/provisioner.go b/provisioner/chef-solo/provisioner.go
index 3775d8cf1..d9faa035c 100644
--- a/provisioner/chef-solo/provisioner.go
+++ b/provisioner/chef-solo/provisioner.go
@@ -16,10 +16,10 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/guestexec"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/guestexec"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/provisioner/converge/provisioner.go b/provisioner/converge/provisioner.go
index ee8aa25a0..1a60d2715 100644
--- a/provisioner/converge/provisioner.go
+++ b/provisioner/converge/provisioner.go
@@ -16,9 +16,9 @@ import (
 	"encoding/json"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/provisioner/file/provisioner.go b/provisioner/file/provisioner.go
index acbeebcf6..0715797e4 100644
--- a/provisioner/file/provisioner.go
+++ b/provisioner/file/provisioner.go
@@ -13,9 +13,9 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/provisioner/inspec/provisioner.go b/provisioner/inspec/provisioner.go
index edcda418f..1d8ab0606 100644
--- a/provisioner/inspec/provisioner.go
+++ b/provisioner/inspec/provisioner.go
@@ -28,10 +28,10 @@ import (
 	"golang.org/x/crypto/ssh"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/adapter"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/adapter"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go
index 53fac0e06..843093005 100644
--- a/provisioner/powershell/provisioner.go
+++ b/provisioner/powershell/provisioner.go
@@ -17,15 +17,15 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/guestexec"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/common/shell"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/guestexec"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 var retryableSleep = 2 * time.Second
diff --git a/provisioner/powershell/provisioner_test.go b/provisioner/powershell/provisioner_test.go
index f6eb73d64..6d395d285 100644
--- a/provisioner/powershell/provisioner_test.go
+++ b/provisioner/powershell/provisioner_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/provisioner/puppet-masterless/provisioner.go b/provisioner/puppet-masterless/provisioner.go
index 4ec0c36a5..6fc71e93f 100644
--- a/provisioner/puppet-masterless/provisioner.go
+++ b/provisioner/puppet-masterless/provisioner.go
@@ -13,10 +13,10 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/guestexec"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/guestexec"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/provisioner/puppet-server/provisioner.go b/provisioner/puppet-server/provisioner.go
index f971a1c49..070990926 100644
--- a/provisioner/puppet-server/provisioner.go
+++ b/provisioner/puppet-server/provisioner.go
@@ -12,10 +12,10 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/guestexec"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/guestexec"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go
index 638912f9f..64a850d6a 100644
--- a/provisioner/salt-masterless/provisioner.go
+++ b/provisioner/salt-masterless/provisioner.go
@@ -16,10 +16,10 @@ import (
 
 	"github.com/hashicorp/go-getter/v2"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/guestexec"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/guestexec"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
diff --git a/provisioner/shell-local/provisioner.go b/provisioner/shell-local/provisioner.go
index 991c94cea..566e4e344 100644
--- a/provisioner/shell-local/provisioner.go
+++ b/provisioner/shell-local/provisioner.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	sl "github.com/hashicorp/packer/common/shell-local"
 	"github.com/hashicorp/packer/packer"
+	sl "github.com/hashicorp/packer/packer-plugin-sdk/shell-local"
 )
 
 type Provisioner struct {
diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go
index e8c1aa2cb..90db6131c 100644
--- a/provisioner/shell/provisioner.go
+++ b/provisioner/shell/provisioner.go
@@ -18,11 +18,11 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/common/shell"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
diff --git a/provisioner/shell/provisioner_test.go b/provisioner/shell/provisioner_test.go
index b26f744c7..e6bc5a9d4 100644
--- a/provisioner/shell/provisioner_test.go
+++ b/provisioner/shell/provisioner_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/provisioner/windows-restart/provisioner.go b/provisioner/windows-restart/provisioner.go
index 3cbbc3518..b33ba29c4 100644
--- a/provisioner/windows-restart/provisioner.go
+++ b/provisioner/windows-restart/provisioner.go
@@ -14,10 +14,10 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/masterzen/winrm"
 )
diff --git a/provisioner/windows-shell/provisioner.go b/provisioner/windows-shell/provisioner.go
index 17520f77f..5fc36f9c6 100644
--- a/provisioner/windows-shell/provisioner.go
+++ b/provisioner/windows-shell/provisioner.go
@@ -16,11 +16,11 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common/commonsteps"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/common/shell"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell"
 	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
diff --git a/provisioner/windows-shell/provisioner_test.go b/provisioner/windows-shell/provisioner_test.go
index 158ce31f5..378e22d46 100644
--- a/provisioner/windows-shell/provisioner_test.go
+++ b/provisioner/windows-shell/provisioner_test.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/packer/common/commonsteps"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/commonsteps"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/website/pages/docs/builders/cloudstack.mdx b/website/pages/docs/builders/cloudstack.mdx
index 8dacb901f..0f59a8d98 100644
--- a/website/pages/docs/builders/cloudstack.mdx
+++ b/website/pages/docs/builders/cloudstack.mdx
@@ -215,11 +215,11 @@ The available variables are:
 
 ## Http directory configuration
 
-@include 'common/commonsteps/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx'
 
 ### Optional:
 
-@include 'common/commonsteps/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx'
 
 ## Basic Example
 
diff --git a/website/pages/docs/builders/hyperv/iso.mdx b/website/pages/docs/builders/hyperv/iso.mdx
index 39ecb2293..a9ff7fd86 100644
--- a/website/pages/docs/builders/hyperv/iso.mdx
+++ b/website/pages/docs/builders/hyperv/iso.mdx
@@ -49,15 +49,15 @@ power off the VM.
 
 ## ISO Configuration Reference
 
-@include 'common/commonsteps/ISOConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx'
 
 ### Required:
 
-@include 'common/commonsteps/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx'
 
 ### Optional:
 
-@include 'common/commonsteps/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx'
 
 ## Configuration Reference
 
@@ -85,29 +85,29 @@ builder.
 
 ## Http directory configuration reference
 
-@include 'common/commonsteps/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx'
 
 ### Optional:
 
-@include 'common/commonsteps/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx'
 
 ## Shutdown configuration reference
 
 ### Optional:
 
-@include 'common/shutdowncommand/ShutdownConfig-not-required.mdx'
+@include 'packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx'
 
 ## Floppy configuration reference
 
-@include 'common/commonsteps/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx'
 
 ### Optional:
 
-@include 'common/commonsteps/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration reference
 
-@include 'common/commonsteps/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx'
 
 ## Communicator configuration reference
 
@@ -127,11 +127,11 @@ builder.
 
 ## Boot Configuration Reference
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 ### Optional:
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 ## Integration Services
 
diff --git a/website/pages/docs/builders/hyperv/vmcx.mdx b/website/pages/docs/builders/hyperv/vmcx.mdx
index 4ff8ac9a0..5bcf09b5f 100644
--- a/website/pages/docs/builders/hyperv/vmcx.mdx
+++ b/website/pages/docs/builders/hyperv/vmcx.mdx
@@ -72,15 +72,15 @@ builder.
 
 ## ISO Configuration Reference
 
-@include 'common/commonsteps/ISOConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx'
 
 ### Required:
 
-@include 'common/commonsteps/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx'
 
 ### Optional:
 
-@include 'common/commonsteps/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx'
 
 ### Required for virtual machine import:
 
@@ -121,11 +121,11 @@ builder.
 
 ### CD configuration
 
-@include 'common/commonsteps/CDConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx'
 
 ## Boot Command
 
@@ -165,11 +165,11 @@ For more examples of various boot commands, see the sample projects from our
 
 ## Http directory configuration
 
-@include 'common/commonsteps/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx'
 
 ### Optional:
 
-@include 'common/commonsteps/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx'
 
 ## Integration Services
 
diff --git a/website/pages/docs/builders/parallels/iso.mdx b/website/pages/docs/builders/parallels/iso.mdx
index ac825c1ce..df7b07efc 100644
--- a/website/pages/docs/builders/parallels/iso.mdx
+++ b/website/pages/docs/builders/parallels/iso.mdx
@@ -62,15 +62,15 @@ can also be supplied to override the typical auto-generated key:
 
 ## ISO Configuration Reference
 
-@include 'common/commonsteps/ISOConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx'
 
 ### Required:
 
-@include 'common/commonsteps/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx'
 
 ### Optional:
 
-@include 'common/commonsteps/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx'
 
 ### Required:
 
diff --git a/website/pages/docs/builders/proxmox/iso.mdx b/website/pages/docs/builders/proxmox/iso.mdx
index c2c3de194..81515f579 100644
--- a/website/pages/docs/builders/proxmox/iso.mdx
+++ b/website/pages/docs/builders/proxmox/iso.mdx
@@ -297,11 +297,11 @@ For more examples of various boot commands, see the sample projects from our
 
 ## Http directory configuration
 
-@include 'common/commonsteps/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx'
 
 ### Optional:
 
-@include 'common/commonsteps/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx'
 
 ## Example: Fedora with kickstart
 
diff --git a/website/pages/docs/builders/qemu.mdx b/website/pages/docs/builders/qemu.mdx
index b8dfa5ef5..ea7ec1794 100644
--- a/website/pages/docs/builders/qemu.mdx
+++ b/website/pages/docs/builders/qemu.mdx
@@ -118,45 +118,45 @@ necessary for this build to succeed and can be found further down the page.
 
 ## ISO Configuration
 
-@include 'common/commonsteps/ISOConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx'
 
 ### Required:
 
-@include 'common/commonsteps/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx'
 
 ### Optional:
 
-@include 'common/commonsteps/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx'
 
 ## Http directory configuration
 
-@include 'common/commonsteps/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx'
 
 ### Optional:
 
-@include 'common/commonsteps/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx'
 
 ## Floppy configuration
 
-@include 'common/commonsteps/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx'
 
 ### Optional:
 
-@include 'common/commonsteps/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration
 
-@include 'common/commonsteps/CDConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx'
 
 ## Shutdown configuration
 
 ### Optional:
 
-@include 'common/shutdowncommand/ShutdownConfig-not-required.mdx'
+@include 'packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx'
 
 ## Communicator configuration
 
@@ -178,15 +178,15 @@ necessary for this build to succeed and can be found further down the page.
 
 ## Boot Configuration
 
-@include 'common/bootcommand/VNCConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/VNCConfig.mdx'
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 ### Optional:
 
-@include 'common/bootcommand/VNCConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx'
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 ### Communicator Configuration
 
diff --git a/website/pages/docs/builders/virtualbox/iso.mdx b/website/pages/docs/builders/virtualbox/iso.mdx
index ac0f13bd6..c08af93c4 100644
--- a/website/pages/docs/builders/virtualbox/iso.mdx
+++ b/website/pages/docs/builders/virtualbox/iso.mdx
@@ -95,39 +95,39 @@ necessary for this build to succeed and can be found further down the page.
 
 ### ISO Configuration
 
-@include 'common/commonsteps/ISOConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx'
 
 #### Required:
 
-@include 'common/commonsteps/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx'
 
 ### Http directory configuration
 
-@include 'common/commonsteps/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
-@include 'common/commonsteps/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration
 
-@include 'common/commonsteps/CDConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx'
 
 ### Export configuration
 
@@ -189,7 +189,7 @@ necessary for this build to succeed and can be found further down the page.
 
 ### Boot Configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 Please note that for the Virtuabox builder, the IP address of the HTTP server
 Packer launches for you to access files like the preseed file in the example
@@ -233,7 +233,7 @@ source "virtualbox-iso" "basic-example" {
 
 #### Optional:
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 @include 'builders/virtualbox-ssh-key-pair.mdx'
 
diff --git a/website/pages/docs/builders/virtualbox/ovf.mdx b/website/pages/docs/builders/virtualbox/ovf.mdx
index 11e1809e7..5f8dfe159 100644
--- a/website/pages/docs/builders/virtualbox/ovf.mdx
+++ b/website/pages/docs/builders/virtualbox/ovf.mdx
@@ -109,27 +109,27 @@ necessary for this build to succeed and can be found further down the page.
 
 ### Http directory configuration
 
-@include 'common/commonsteps/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
-@include 'common/commonsteps/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration
 
-@include 'common/commonsteps/CDConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx'
 
 ### Export configuration
 
@@ -181,7 +181,7 @@ necessary for this build to succeed and can be found further down the page.
 
 ### Boot Configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 Please note that for the Virtuabox builder, the IP address of the HTTP server
 Packer launches for you to access files like the preseed file in the example
@@ -224,7 +224,7 @@ source "virtualbox-ovf" "basic-example" {
 
 #### Optional:
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 @include 'builders/virtualbox-ssh-key-pair.mdx'
 
diff --git a/website/pages/docs/builders/virtualbox/vm.mdx b/website/pages/docs/builders/virtualbox/vm.mdx
index c520e20c7..626ad7a33 100644
--- a/website/pages/docs/builders/virtualbox/vm.mdx
+++ b/website/pages/docs/builders/virtualbox/vm.mdx
@@ -120,27 +120,27 @@ builder.
 
 ### Http directory configuration
 
-@include 'common/commonsteps/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
-@include 'common/commonsteps/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration
 
-@include 'common/commonsteps/CDConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx'
 
 ### Export configuration
 
@@ -196,7 +196,7 @@ builder.
 
 ### Boot Configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 Please note that for the Virtuabox builder, the IP address of the HTTP server
 Packer launches for you to access files like the preseed file in the example
@@ -239,7 +239,7 @@ source "virtualbox-vm" "basic-example" {
 
 #### Optional:
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 @include 'builders/virtualbox-ssh-key-pair.mdx'
 
diff --git a/website/pages/docs/builders/vmware/iso.mdx b/website/pages/docs/builders/vmware/iso.mdx
index 126052bbf..955c8be5e 100644
--- a/website/pages/docs/builders/vmware/iso.mdx
+++ b/website/pages/docs/builders/vmware/iso.mdx
@@ -104,40 +104,40 @@ necessary for this build to succeed and can be found further down the page.
 
 ### ISO Configuration
 
-@include 'common/commonsteps/ISOConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx'
 
 #### Required:
 
-@include 'common/commonsteps/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx'
 
 ### Http directory configuration
 
-@include 'common/commonsteps/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
-@include 'common/commonsteps/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration
-@include 'common/commonsteps/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx'
 
 ### Shutdown configuration
 
 #### Optional:
 
-@include 'common/shutdowncommand/ShutdownConfig-not-required.mdx'
+@include 'packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx'
 
 ### Driver configuration
 
@@ -199,9 +199,9 @@ necessary for this build to succeed and can be found further down the page.
 
 ## Boot Configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
-@include 'common/bootcommand/VNCConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/VNCConfig.mdx'
 
 -> **Note**: for the `HTTPIP` to be resolved correctly, your VM's network
 configuration has to include a `hostonly` or `nat` type network interface.
@@ -211,9 +211,9 @@ to modify the network configuration after the VM is done building.
 
 #### Optional:
 
-@include 'common/bootcommand/VNCConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx'
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 For more examples of various boot commands, see the sample projects from our
 [community templates page](/community-tools#templates).
diff --git a/website/pages/docs/builders/vmware/vmx.mdx b/website/pages/docs/builders/vmware/vmx.mdx
index 6ad72a3f8..a1b7d8b76 100644
--- a/website/pages/docs/builders/vmware/vmx.mdx
+++ b/website/pages/docs/builders/vmware/vmx.mdx
@@ -105,27 +105,27 @@ necessary for this build to succeed and can be found further down the page.
 
 ### Http directory configuration
 
-@include 'common/commonsteps/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
-@include 'common/commonsteps/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration
 
-@include 'common/commonsteps/CDConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx'
 
 ### Export configuration
 
@@ -181,13 +181,13 @@ necessary for this build to succeed and can be found further down the page.
 
 ## Shutdown Configuration
 
-@include 'common/shutdowncommand/ShutdownConfig-not-required.mdx'
+@include 'packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx'
 
 ## Boot Configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
-@include 'common/bootcommand/VNCConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/VNCConfig.mdx'
 
 -> **Note**: for the `HTTPIP` to be resolved correctly, your VM's network
 configuration has to include a `hostonly` or `nat` type network interface.
@@ -197,9 +197,9 @@ to modify the network configuration after the VM is done building.
 
 #### Optional:
 
-@include 'common/bootcommand/VNCConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx'
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 For more examples of various boot commands, see the sample projects from our
 [community templates page](/community-tools#templates).
diff --git a/website/pages/docs/builders/vmware/vsphere-clone.mdx b/website/pages/docs/builders/vmware/vsphere-clone.mdx
index 6201a9ace..ed2dbbecc 100644
--- a/website/pages/docs/builders/vmware/vsphere-clone.mdx
+++ b/website/pages/docs/builders/vmware/vsphere-clone.mdx
@@ -152,21 +152,21 @@ can be done via environment variable:
 
 ### Boot configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 #### Optional:
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 @include 'builder/vsphere/common/BootConfig-not-required.mdx'
 
 ### Http directory configuration
 
-@include 'common/commonsteps/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
@@ -198,11 +198,11 @@ can be done via environment variable:
 
 ### CDRom Configuration
 
-@include 'common/commonsteps/CDConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx'
 
 @include 'builder/vsphere/common/CDRomConfig-not-required.mdx'
 
diff --git a/website/pages/docs/builders/vmware/vsphere-iso.mdx b/website/pages/docs/builders/vmware/vsphere-iso.mdx
index c7df57f17..47c58db59 100644
--- a/website/pages/docs/builders/vmware/vsphere-iso.mdx
+++ b/website/pages/docs/builders/vmware/vsphere-iso.mdx
@@ -46,7 +46,7 @@ necessary for this build to succeed and can be found further down the page.
 
 ### Boot Configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 We send each character to the VM with a default delay of 100ms between groups.
 The delay alleviates possible issues with latency and CPU
@@ -83,17 +83,17 @@ source "vsphere-iso" "example" {
 
 #### Optional:
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 @include 'builder/vsphere/common/BootConfig-not-required.mdx'
 
 ### Http directory configuration
 
-@include 'common/commonsteps/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
@@ -125,15 +125,15 @@ source "vsphere-iso" "example" {
 
 ### ISO Configuration
 
-@include 'common/commonsteps/ISOConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig.mdx'
 
 #### Required:
 
-@include 'common/commonsteps/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-required.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx'
 
 ### CDRom Configuration
 
@@ -176,11 +176,11 @@ iso_paths = [
 
 @include 'builder/vsphere/common/RemoveCDRomConfig-not-required.mdx'
 
-@include 'common/commonsteps/CDConfig.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/commonsteps/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx'
 
 ### Create Configuration
 
diff --git a/website/pages/partials/common/bootcommand/BootConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx
similarity index 94%
rename from website/pages/partials/common/bootcommand/BootConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx
index c3ce262ac..1bf92b193 100644
--- a/website/pages/partials/common/bootcommand/BootConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the BootConfig struct in common/bootcommand/config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the BootConfig struct in packer-plugin-sdk/bootcommand/config.go; DO NOT EDIT MANUALLY -->
 
 - `boot_keygroup_interval` (duration string | ex: "1h5m2s") - Time to wait after sending a group of key pressses. The value of this
   should be a duration. Examples are `5s` and `1m30s` which will cause
diff --git a/website/pages/partials/common/bootcommand/BootConfig.mdx b/website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig.mdx
similarity index 98%
rename from website/pages/partials/common/bootcommand/BootConfig.mdx
rename to website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig.mdx
index f8115899c..8d41f834f 100644
--- a/website/pages/partials/common/bootcommand/BootConfig.mdx
+++ b/website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the BootConfig struct in common/bootcommand/config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the BootConfig struct in packer-plugin-sdk/bootcommand/config.go; DO NOT EDIT MANUALLY -->
 
 The boot configuration is very important: `boot_command` specifies the keys
 to type when the virtual machine is first booted in order to start the OS
diff --git a/website/pages/partials/common/bootcommand/VNCConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx
similarity index 81%
rename from website/pages/partials/common/bootcommand/VNCConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx
index 6c532fd4f..008fdb54a 100644
--- a/website/pages/partials/common/bootcommand/VNCConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the VNCConfig struct in common/bootcommand/config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the VNCConfig struct in packer-plugin-sdk/bootcommand/config.go; DO NOT EDIT MANUALLY -->
 
 - `disable_vnc` (bool) - Whether to create a VNC connection or not. A boot_command cannot be used
   when this is true. Defaults to false.
diff --git a/website/pages/partials/common/bootcommand/VNCConfig.mdx b/website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig.mdx
similarity index 87%
rename from website/pages/partials/common/bootcommand/VNCConfig.mdx
rename to website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig.mdx
index 34a6748ac..f539a6590 100644
--- a/website/pages/partials/common/bootcommand/VNCConfig.mdx
+++ b/website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the VNCConfig struct in common/bootcommand/config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the VNCConfig struct in packer-plugin-sdk/bootcommand/config.go; DO NOT EDIT MANUALLY -->
 
 The boot command "typed" character for character over a VNC connection to
 the machine, simulating a human actually typing the keyboard.
diff --git a/website/pages/partials/common/commonsteps/CDConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx
similarity index 95%
rename from website/pages/partials/common/commonsteps/CDConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx
index 9fc2cdc23..9486e4f03 100644
--- a/website/pages/partials/common/commonsteps/CDConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the CDConfig struct in common/commonsteps/extra_iso_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the CDConfig struct in packer-plugin-sdk/commonsteps/extra_iso_config.go; DO NOT EDIT MANUALLY -->
 
 - `cd_files` ([]string) - A list of files to place onto a CD that is attached when the VM is
   booted. This can include either files or directories; any directories
diff --git a/website/pages/partials/common/commonsteps/CDConfig.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig.mdx
similarity index 86%
rename from website/pages/partials/common/commonsteps/CDConfig.mdx
rename to website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig.mdx
index a139db6a4..e861c99f0 100644
--- a/website/pages/partials/common/commonsteps/CDConfig.mdx
+++ b/website/pages/partials/packer-plugin-sdk/commonsteps/CDConfig.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the CDConfig struct in common/commonsteps/extra_iso_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the CDConfig struct in packer-plugin-sdk/commonsteps/extra_iso_config.go; DO NOT EDIT MANUALLY -->
 
 An iso (CD) containing custom files can be made available for your build.
 
diff --git a/website/pages/partials/common/commonsteps/FloppyConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx
similarity index 92%
rename from website/pages/partials/common/commonsteps/FloppyConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx
index c81d3f61f..c261f96e2 100644
--- a/website/pages/partials/common/commonsteps/FloppyConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the FloppyConfig struct in common/commonsteps/floppy_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the FloppyConfig struct in packer-plugin-sdk/commonsteps/floppy_config.go; DO NOT EDIT MANUALLY -->
 
 - `floppy_files` ([]string) - A list of files to place onto a floppy disk that is attached when the VM
   is booted. Currently, no support exists for creating sub-directories on
diff --git a/website/pages/partials/common/commonsteps/FloppyConfig.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig.mdx
similarity index 88%
rename from website/pages/partials/common/commonsteps/FloppyConfig.mdx
rename to website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig.mdx
index 8db59da19..a6474cf6e 100644
--- a/website/pages/partials/common/commonsteps/FloppyConfig.mdx
+++ b/website/pages/partials/packer-plugin-sdk/commonsteps/FloppyConfig.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the FloppyConfig struct in common/commonsteps/floppy_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the FloppyConfig struct in packer-plugin-sdk/commonsteps/floppy_config.go; DO NOT EDIT MANUALLY -->
 
 A floppy can be made available for your build. This is most useful for
 unattended Windows installs, which look for an Autounattend.xml file on
diff --git a/website/pages/partials/common/commonsteps/HTTPConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx
similarity index 93%
rename from website/pages/partials/common/commonsteps/HTTPConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx
index aece4b6de..82bf23690 100644
--- a/website/pages/partials/common/commonsteps/HTTPConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the HTTPConfig struct in common/commonsteps/http_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the HTTPConfig struct in packer-plugin-sdk/commonsteps/http_config.go; DO NOT EDIT MANUALLY -->
 
 - `http_directory` (string) - Path to a directory to serve using an HTTP server. The files in this
   directory will be available over HTTP that will be requestable from the
diff --git a/website/pages/partials/common/commonsteps/HTTPConfig.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig.mdx
similarity index 83%
rename from website/pages/partials/common/commonsteps/HTTPConfig.mdx
rename to website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig.mdx
index f841432a8..8fad89d65 100644
--- a/website/pages/partials/common/commonsteps/HTTPConfig.mdx
+++ b/website/pages/partials/packer-plugin-sdk/commonsteps/HTTPConfig.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the HTTPConfig struct in common/commonsteps/http_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the HTTPConfig struct in packer-plugin-sdk/commonsteps/http_config.go; DO NOT EDIT MANUALLY -->
 
 Packer will create an http server serving `http_directory` when it is set, a
 random free port will be selected and the architecture of the directory
diff --git a/website/pages/partials/common/commonsteps/ISOConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx
similarity index 91%
rename from website/pages/partials/common/commonsteps/ISOConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx
index 9d0744786..60e976cbb 100644
--- a/website/pages/partials/common/commonsteps/ISOConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the ISOConfig struct in common/commonsteps/iso_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the ISOConfig struct in packer-plugin-sdk/commonsteps/iso_config.go; DO NOT EDIT MANUALLY -->
 
 - `iso_urls` ([]string) - Multiple URLs for the ISO to download. Packer will try these in order.
   If anything goes wrong attempting to download or while downloading a
diff --git a/website/pages/partials/common/commonsteps/ISOConfig-required.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-required.mdx
similarity index 94%
rename from website/pages/partials/common/commonsteps/ISOConfig-required.mdx
rename to website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-required.mdx
index a2c27df83..5e6624577 100644
--- a/website/pages/partials/common/commonsteps/ISOConfig-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the ISOConfig struct in common/commonsteps/iso_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the ISOConfig struct in packer-plugin-sdk/commonsteps/iso_config.go; DO NOT EDIT MANUALLY -->
 
 - `iso_checksum` (string) - The checksum for the ISO file or virtual hard drive file. The type of
   the checksum is specified within the checksum field as a prefix, ex:
diff --git a/website/pages/partials/common/commonsteps/ISOConfig.mdx b/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig.mdx
similarity index 95%
rename from website/pages/partials/common/commonsteps/ISOConfig.mdx
rename to website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig.mdx
index 548bffa0b..5e55a847e 100644
--- a/website/pages/partials/common/commonsteps/ISOConfig.mdx
+++ b/website/pages/partials/packer-plugin-sdk/commonsteps/ISOConfig.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the ISOConfig struct in common/commonsteps/iso_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the ISOConfig struct in packer-plugin-sdk/commonsteps/iso_config.go; DO NOT EDIT MANUALLY -->
 
 By default, Packer will symlink, download or copy image files to the Packer
 cache into a "`hash($iso_url+$iso_checksum).$iso_target_extension`" file.
diff --git a/website/pages/partials/common/shutdowncommand/ShutdownConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx
similarity index 92%
rename from website/pages/partials/common/shutdowncommand/ShutdownConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx
index 2b705dd61..0cd262f0d 100644
--- a/website/pages/partials/common/shutdowncommand/ShutdownConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the ShutdownConfig struct in common/shutdowncommand/config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the ShutdownConfig struct in packer-plugin-sdk/shutdowncommand/config.go; DO NOT EDIT MANUALLY -->
 
 - `shutdown_command` (string) - The command to use to gracefully shut down the machine once all
   provisioning is complete. By default this is an empty string, which
diff --git a/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig.mdx b/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig.mdx
new file mode 100644
index 000000000..e958c8ca3
--- /dev/null
+++ b/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig.mdx
@@ -0,0 +1,9 @@
+<!-- Code generated from the comments of the ShutdownConfig struct in packer-plugin-sdk/shutdowncommand/config.go; DO NOT EDIT MANUALLY -->
+
+ShutdownConfig defines implementation details for shutting down a VM once it
+is done provisioned.
+It is provided as a convenience to encourage builder developers to
+consider implementing these options, which we believe are valuable for all
+builders. It also helps guarantee that option names for similar options
+are the same across the various builders. Embed it in your builder config
+using the `mapstructure:",squash"` struct tag.