diff --git a/.gitignore b/.gitignore
index 279aabcb4..d9d37c96f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 /src
 /website/.sass-cache
 /website/build
+.DS_Store
 .vagrant
 Vagrantfile
 test/.env
diff --git a/builder/virtualbox/artifact.go b/builder/virtualbox/iso/artifact.go
similarity index 100%
rename from builder/virtualbox/artifact.go
rename to builder/virtualbox/iso/artifact.go
diff --git a/builder/virtualbox/builder.go b/builder/virtualbox/iso/builder.go
similarity index 100%
rename from builder/virtualbox/builder.go
rename to builder/virtualbox/iso/builder.go
diff --git a/builder/virtualbox/builder_test.go b/builder/virtualbox/iso/builder_test.go
similarity index 100%
rename from builder/virtualbox/builder_test.go
rename to builder/virtualbox/iso/builder_test.go
diff --git a/builder/virtualbox/driver.go b/builder/virtualbox/iso/driver.go
similarity index 100%
rename from builder/virtualbox/driver.go
rename to builder/virtualbox/iso/driver.go
diff --git a/builder/virtualbox/ssh.go b/builder/virtualbox/iso/ssh.go
similarity index 100%
rename from builder/virtualbox/ssh.go
rename to builder/virtualbox/iso/ssh.go
diff --git a/builder/virtualbox/step_attach_floppy.go b/builder/virtualbox/iso/step_attach_floppy.go
similarity index 100%
rename from builder/virtualbox/step_attach_floppy.go
rename to builder/virtualbox/iso/step_attach_floppy.go
diff --git a/builder/virtualbox/step_attach_guest_additions.go b/builder/virtualbox/iso/step_attach_guest_additions.go
similarity index 100%
rename from builder/virtualbox/step_attach_guest_additions.go
rename to builder/virtualbox/iso/step_attach_guest_additions.go
diff --git a/builder/virtualbox/step_attach_iso.go b/builder/virtualbox/iso/step_attach_iso.go
similarity index 100%
rename from builder/virtualbox/step_attach_iso.go
rename to builder/virtualbox/iso/step_attach_iso.go
diff --git a/builder/virtualbox/step_create_disk.go b/builder/virtualbox/iso/step_create_disk.go
similarity index 100%
rename from builder/virtualbox/step_create_disk.go
rename to builder/virtualbox/iso/step_create_disk.go
diff --git a/builder/virtualbox/step_create_vm.go b/builder/virtualbox/iso/step_create_vm.go
similarity index 100%
rename from builder/virtualbox/step_create_vm.go
rename to builder/virtualbox/iso/step_create_vm.go
diff --git a/builder/virtualbox/step_download_guest_additions.go b/builder/virtualbox/iso/step_download_guest_additions.go
similarity index 100%
rename from builder/virtualbox/step_download_guest_additions.go
rename to builder/virtualbox/iso/step_download_guest_additions.go
diff --git a/builder/virtualbox/step_export.go b/builder/virtualbox/iso/step_export.go
similarity index 100%
rename from builder/virtualbox/step_export.go
rename to builder/virtualbox/iso/step_export.go
diff --git a/builder/virtualbox/step_forward_ssh.go b/builder/virtualbox/iso/step_forward_ssh.go
similarity index 100%
rename from builder/virtualbox/step_forward_ssh.go
rename to builder/virtualbox/iso/step_forward_ssh.go
diff --git a/builder/virtualbox/step_http_server.go b/builder/virtualbox/iso/step_http_server.go
similarity index 100%
rename from builder/virtualbox/step_http_server.go
rename to builder/virtualbox/iso/step_http_server.go
diff --git a/builder/virtualbox/step_prepare_output_dir.go b/builder/virtualbox/iso/step_prepare_output_dir.go
similarity index 100%
rename from builder/virtualbox/step_prepare_output_dir.go
rename to builder/virtualbox/iso/step_prepare_output_dir.go
diff --git a/builder/virtualbox/step_remove_devices.go b/builder/virtualbox/iso/step_remove_devices.go
similarity index 100%
rename from builder/virtualbox/step_remove_devices.go
rename to builder/virtualbox/iso/step_remove_devices.go
diff --git a/builder/virtualbox/step_run.go b/builder/virtualbox/iso/step_run.go
similarity index 100%
rename from builder/virtualbox/step_run.go
rename to builder/virtualbox/iso/step_run.go
diff --git a/builder/virtualbox/step_shutdown.go b/builder/virtualbox/iso/step_shutdown.go
similarity index 100%
rename from builder/virtualbox/step_shutdown.go
rename to builder/virtualbox/iso/step_shutdown.go
diff --git a/builder/virtualbox/step_suppress_messages.go b/builder/virtualbox/iso/step_suppress_messages.go
similarity index 100%
rename from builder/virtualbox/step_suppress_messages.go
rename to builder/virtualbox/iso/step_suppress_messages.go
diff --git a/builder/virtualbox/step_type_boot_command.go b/builder/virtualbox/iso/step_type_boot_command.go
similarity index 100%
rename from builder/virtualbox/step_type_boot_command.go
rename to builder/virtualbox/iso/step_type_boot_command.go
diff --git a/builder/virtualbox/step_upload_guest_additions.go b/builder/virtualbox/iso/step_upload_guest_additions.go
similarity index 100%
rename from builder/virtualbox/step_upload_guest_additions.go
rename to builder/virtualbox/iso/step_upload_guest_additions.go
diff --git a/builder/virtualbox/step_upload_version.go b/builder/virtualbox/iso/step_upload_version.go
similarity index 100%
rename from builder/virtualbox/step_upload_version.go
rename to builder/virtualbox/iso/step_upload_version.go
diff --git a/builder/virtualbox/step_vboxmanage.go b/builder/virtualbox/iso/step_vboxmanage.go
similarity index 100%
rename from builder/virtualbox/step_vboxmanage.go
rename to builder/virtualbox/iso/step_vboxmanage.go