diff --git a/builder/vmware/artifact.go b/builder/vmware/iso/artifact.go
similarity index 100%
rename from builder/vmware/artifact.go
rename to builder/vmware/iso/artifact.go
diff --git a/builder/vmware/artifact_test.go b/builder/vmware/iso/artifact_test.go
similarity index 100%
rename from builder/vmware/artifact_test.go
rename to builder/vmware/iso/artifact_test.go
diff --git a/builder/vmware/builder.go b/builder/vmware/iso/builder.go
similarity index 100%
rename from builder/vmware/builder.go
rename to builder/vmware/iso/builder.go
diff --git a/builder/vmware/builder_test.go b/builder/vmware/iso/builder_test.go
similarity index 100%
rename from builder/vmware/builder_test.go
rename to builder/vmware/iso/builder_test.go
diff --git a/builder/vmware/driver.go b/builder/vmware/iso/driver.go
similarity index 100%
rename from builder/vmware/driver.go
rename to builder/vmware/iso/driver.go
diff --git a/builder/vmware/driver_esx5.go b/builder/vmware/iso/driver_esx5.go
similarity index 100%
rename from builder/vmware/driver_esx5.go
rename to builder/vmware/iso/driver_esx5.go
diff --git a/builder/vmware/driver_esx5_test.go b/builder/vmware/iso/driver_esx5_test.go
similarity index 100%
rename from builder/vmware/driver_esx5_test.go
rename to builder/vmware/iso/driver_esx5_test.go
diff --git a/builder/vmware/driver_fusion5.go b/builder/vmware/iso/driver_fusion5.go
similarity index 100%
rename from builder/vmware/driver_fusion5.go
rename to builder/vmware/iso/driver_fusion5.go
diff --git a/builder/vmware/driver_player5.go b/builder/vmware/iso/driver_player5.go
similarity index 100%
rename from builder/vmware/driver_player5.go
rename to builder/vmware/iso/driver_player5.go
diff --git a/builder/vmware/driver_workstation9.go b/builder/vmware/iso/driver_workstation9.go
similarity index 100%
rename from builder/vmware/driver_workstation9.go
rename to builder/vmware/iso/driver_workstation9.go
diff --git a/builder/vmware/driver_workstation9_unix.go b/builder/vmware/iso/driver_workstation9_unix.go
similarity index 100%
rename from builder/vmware/driver_workstation9_unix.go
rename to builder/vmware/iso/driver_workstation9_unix.go
diff --git a/builder/vmware/driver_workstation9_windows.go b/builder/vmware/iso/driver_workstation9_windows.go
similarity index 100%
rename from builder/vmware/driver_workstation9_windows.go
rename to builder/vmware/iso/driver_workstation9_windows.go
diff --git a/builder/vmware/guest_ip.go b/builder/vmware/iso/guest_ip.go
similarity index 100%
rename from builder/vmware/guest_ip.go
rename to builder/vmware/iso/guest_ip.go
diff --git a/builder/vmware/host_ip.go b/builder/vmware/iso/host_ip.go
similarity index 100%
rename from builder/vmware/host_ip.go
rename to builder/vmware/iso/host_ip.go
diff --git a/builder/vmware/host_ip_ifconfig.go b/builder/vmware/iso/host_ip_ifconfig.go
similarity index 100%
rename from builder/vmware/host_ip_ifconfig.go
rename to builder/vmware/iso/host_ip_ifconfig.go
diff --git a/builder/vmware/host_ip_ifconfig_test.go b/builder/vmware/iso/host_ip_ifconfig_test.go
similarity index 100%
rename from builder/vmware/host_ip_ifconfig_test.go
rename to builder/vmware/iso/host_ip_ifconfig_test.go
diff --git a/builder/vmware/host_ip_vmnetnatconf.go b/builder/vmware/iso/host_ip_vmnetnatconf.go
similarity index 100%
rename from builder/vmware/host_ip_vmnetnatconf.go
rename to builder/vmware/iso/host_ip_vmnetnatconf.go
diff --git a/builder/vmware/host_ip_vmnetnatconf_test.go b/builder/vmware/iso/host_ip_vmnetnatconf_test.go
similarity index 100%
rename from builder/vmware/host_ip_vmnetnatconf_test.go
rename to builder/vmware/iso/host_ip_vmnetnatconf_test.go
diff --git a/builder/vmware/output_dir.go b/builder/vmware/iso/output_dir.go
similarity index 100%
rename from builder/vmware/output_dir.go
rename to builder/vmware/iso/output_dir.go
diff --git a/builder/vmware/remote_driver.go b/builder/vmware/iso/remote_driver.go
similarity index 100%
rename from builder/vmware/remote_driver.go
rename to builder/vmware/iso/remote_driver.go
diff --git a/builder/vmware/ssh.go b/builder/vmware/iso/ssh.go
similarity index 100%
rename from builder/vmware/ssh.go
rename to builder/vmware/iso/ssh.go
diff --git a/builder/vmware/step_clean_files.go b/builder/vmware/iso/step_clean_files.go
similarity index 100%
rename from builder/vmware/step_clean_files.go
rename to builder/vmware/iso/step_clean_files.go
diff --git a/builder/vmware/step_clean_vmx.go b/builder/vmware/iso/step_clean_vmx.go
similarity index 100%
rename from builder/vmware/step_clean_vmx.go
rename to builder/vmware/iso/step_clean_vmx.go
diff --git a/builder/vmware/step_compact_disk.go b/builder/vmware/iso/step_compact_disk.go
similarity index 100%
rename from builder/vmware/step_compact_disk.go
rename to builder/vmware/iso/step_compact_disk.go
diff --git a/builder/vmware/step_configure_vmx.go b/builder/vmware/iso/step_configure_vmx.go
similarity index 100%
rename from builder/vmware/step_configure_vmx.go
rename to builder/vmware/iso/step_configure_vmx.go
diff --git a/builder/vmware/step_configure_vmx_test.go b/builder/vmware/iso/step_configure_vmx_test.go
similarity index 100%
rename from builder/vmware/step_configure_vmx_test.go
rename to builder/vmware/iso/step_configure_vmx_test.go
diff --git a/builder/vmware/step_configure_vnc.go b/builder/vmware/iso/step_configure_vnc.go
similarity index 100%
rename from builder/vmware/step_configure_vnc.go
rename to builder/vmware/iso/step_configure_vnc.go
diff --git a/builder/vmware/step_create_disk.go b/builder/vmware/iso/step_create_disk.go
similarity index 100%
rename from builder/vmware/step_create_disk.go
rename to builder/vmware/iso/step_create_disk.go
diff --git a/builder/vmware/step_create_vmx.go b/builder/vmware/iso/step_create_vmx.go
similarity index 100%
rename from builder/vmware/step_create_vmx.go
rename to builder/vmware/iso/step_create_vmx.go
diff --git a/builder/vmware/step_http_server.go b/builder/vmware/iso/step_http_server.go
similarity index 100%
rename from builder/vmware/step_http_server.go
rename to builder/vmware/iso/step_http_server.go
diff --git a/builder/vmware/step_prepare_output_dir.go b/builder/vmware/iso/step_prepare_output_dir.go
similarity index 100%
rename from builder/vmware/step_prepare_output_dir.go
rename to builder/vmware/iso/step_prepare_output_dir.go
diff --git a/builder/vmware/step_prepare_tools.go b/builder/vmware/iso/step_prepare_tools.go
similarity index 100%
rename from builder/vmware/step_prepare_tools.go
rename to builder/vmware/iso/step_prepare_tools.go
diff --git a/builder/vmware/step_remote_upload.go b/builder/vmware/iso/step_remote_upload.go
similarity index 100%
rename from builder/vmware/step_remote_upload.go
rename to builder/vmware/iso/step_remote_upload.go
diff --git a/builder/vmware/step_run.go b/builder/vmware/iso/step_run.go
similarity index 100%
rename from builder/vmware/step_run.go
rename to builder/vmware/iso/step_run.go
diff --git a/builder/vmware/step_shutdown.go b/builder/vmware/iso/step_shutdown.go
similarity index 100%
rename from builder/vmware/step_shutdown.go
rename to builder/vmware/iso/step_shutdown.go
diff --git a/builder/vmware/step_suppress_messages.go b/builder/vmware/iso/step_suppress_messages.go
similarity index 100%
rename from builder/vmware/step_suppress_messages.go
rename to builder/vmware/iso/step_suppress_messages.go
diff --git a/builder/vmware/step_test.go b/builder/vmware/iso/step_test.go
similarity index 100%
rename from builder/vmware/step_test.go
rename to builder/vmware/iso/step_test.go
diff --git a/builder/vmware/step_type_boot_command.go b/builder/vmware/iso/step_type_boot_command.go
similarity index 100%
rename from builder/vmware/step_type_boot_command.go
rename to builder/vmware/iso/step_type_boot_command.go
diff --git a/builder/vmware/step_upload_tools.go b/builder/vmware/iso/step_upload_tools.go
similarity index 100%
rename from builder/vmware/step_upload_tools.go
rename to builder/vmware/iso/step_upload_tools.go
diff --git a/builder/vmware/vmx.go b/builder/vmware/iso/vmx.go
similarity index 100%
rename from builder/vmware/vmx.go
rename to builder/vmware/iso/vmx.go
diff --git a/builder/vmware/vmx_test.go b/builder/vmware/iso/vmx_test.go
similarity index 100%
rename from builder/vmware/vmx_test.go
rename to builder/vmware/iso/vmx_test.go