File hashicorp-move-importpath.patch of Package golang-github-hashicorp-packer

Overview Repositories Revisions Requests Users Attributes Meta

File hashicorp-move-importpath.patch of Package golang-github-hashicorp-packer (Revision f96c3548583696fa78824dcae1d144b2)

Currently displaying revision f96c3548583696fa78824dcae1d144b2 , Show latest

diff -Nur packer-1.0.0.orig/builder/amazon/chroot/builder.go packer-1.0.0/builder/amazon/chroot/builder.go
--- packer-1.0.0.orig/builder/amazon/chroot/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/builder.go	2017-04-11 15:29:52.237225692 +0200
@@ -12,11 +12,11 @@
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // The unique ID for this builder
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/builder_test.go packer-1.0.0/builder/amazon/chroot/builder_test.go
--- packer-1.0.0.orig/builder/amazon/chroot/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/builder_test.go	2017-04-11 15:33:34.328675242 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/communicator.go packer-1.0.0/builder/amazon/chroot/communicator.go
--- packer-1.0.0.orig/builder/amazon/chroot/communicator.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/communicator.go	2017-04-11 15:33:34.332675233 +0200
@@ -12,7 +12,7 @@
 	"strings"
 	"syscall"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // Communicator is a special communicator that works by executing
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/communicator_test.go packer-1.0.0/builder/amazon/chroot/communicator_test.go
--- packer-1.0.0.orig/builder/amazon/chroot/communicator_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/communicator_test.go	2017-04-11 15:33:34.332675233 +0200
@@ -1,7 +1,7 @@
 package chroot
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/run_local_commands.go packer-1.0.0/builder/amazon/chroot/run_local_commands.go
--- packer-1.0.0.orig/builder/amazon/chroot/run_local_commands.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/run_local_commands.go	2017-04-11 15:33:34.332675233 +0200
@@ -3,9 +3,9 @@
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/post-processor/shell-local"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/post-processor/shell-local"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func RunLocalCommands(commands []string, wrappedCommand CommandWrapper, ctx interpolate.Context, ui packer.Ui) error {
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_attach_volume.go packer-1.0.0/builder/amazon/chroot/step_attach_volume.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_attach_volume.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_attach_volume.go	2017-04-11 15:31:29.436982806 +0200
@@ -8,8 +8,8 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepAttachVolume attaches the previously created volume to an
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_check_root_device.go packer-1.0.0/builder/amazon/chroot/step_check_root_device.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_check_root_device.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_check_root_device.go	2017-04-11 15:33:34.332675233 +0200
@@ -5,7 +5,7 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepCheckRootDevice makes sure the root device on the AMI is EBS-backed.
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_chroot_provision.go packer-1.0.0/builder/amazon/chroot/step_chroot_provision.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_chroot_provision.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_chroot_provision.go	2017-04-11 15:33:34.332675233 +0200
@@ -4,7 +4,7 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepChrootProvision provisions the instance within a chroot.
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_copy_files.go packer-1.0.0/builder/amazon/chroot/step_copy_files.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_copy_files.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_copy_files.go	2017-04-11 15:33:34.332675233 +0200
@@ -4,7 +4,7 @@
 	"bytes"
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"path/filepath"
 )
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_create_volume.go packer-1.0.0/builder/amazon/chroot/step_create_volume.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_create_volume.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_create_volume.go	2017-04-11 15:33:34.332675233 +0200
@@ -7,8 +7,8 @@
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepCreateVolume creates a new volume from the snapshot of the root
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_early_cleanup.go packer-1.0.0/builder/amazon/chroot/step_early_cleanup.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_early_cleanup.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_early_cleanup.go	2017-04-11 15:33:34.332675233 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_early_unflock.go packer-1.0.0/builder/amazon/chroot/step_early_unflock.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_early_unflock.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_early_unflock.go	2017-04-11 15:33:34.336675223 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_flock.go packer-1.0.0/builder/amazon/chroot/step_flock.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_flock.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_flock.go	2017-04-11 15:33:34.336675223 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"os"
 	"path/filepath"
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_instance_info.go packer-1.0.0/builder/amazon/chroot/step_instance_info.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_instance_info.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_instance_info.go	2017-04-11 15:33:34.336675223 +0200
@@ -6,8 +6,8 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepInstanceInfo verifies that this builder is running on an EC2 instance.
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_mount_device.go packer-1.0.0/builder/amazon/chroot/step_mount_device.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_mount_device.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_mount_device.go	2017-04-11 15:33:34.336675223 +0200
@@ -10,8 +10,8 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type mountPathData struct {
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_mount_extra.go packer-1.0.0/builder/amazon/chroot/step_mount_extra.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_mount_extra.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_mount_extra.go	2017-04-11 15:33:34.336675223 +0200
@@ -4,7 +4,7 @@
 	"bytes"
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"os"
 	"os/exec"
 	"syscall"
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_post_mount_commands.go packer-1.0.0/builder/amazon/chroot/step_post_mount_commands.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_post_mount_commands.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_post_mount_commands.go	2017-04-11 15:33:34.336675223 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type postMountCommandsData struct {
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_pre_mount_commands.go packer-1.0.0/builder/amazon/chroot/step_pre_mount_commands.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_pre_mount_commands.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_pre_mount_commands.go	2017-04-11 15:33:34.336675223 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type preMountCommandsData struct {
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_prepare_device.go packer-1.0.0/builder/amazon/chroot/step_prepare_device.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_prepare_device.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_prepare_device.go	2017-04-11 15:33:34.336675223 +0200
@@ -6,7 +6,7 @@
 	"os"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepPrepareDevice finds an available device and sets it.
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_register_ami.go packer-1.0.0/builder/amazon/chroot/step_register_ami.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_register_ami.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_register_ami.go	2017-04-11 15:33:34.336675223 +0200
@@ -6,8 +6,8 @@
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepRegisterAMI creates the AMI.
diff -Nur packer-1.0.0.orig/builder/amazon/chroot/step_snapshot.go packer-1.0.0/builder/amazon/chroot/step_snapshot.go
--- packer-1.0.0.orig/builder/amazon/chroot/step_snapshot.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/chroot/step_snapshot.go	2017-04-11 15:33:34.336675223 +0200
@@ -7,8 +7,8 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepSnapshot creates a snapshot of the created volume.
diff -Nur packer-1.0.0.orig/builder/amazon/common/access_config.go packer-1.0.0/builder/amazon/common/access_config.go
--- packer-1.0.0.orig/builder/amazon/common/access_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/access_config.go	2017-04-11 15:33:34.336675223 +0200
@@ -12,7 +12,7 @@
 	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // AccessConfig is for common configuration related to AWS access
diff -Nur packer-1.0.0.orig/builder/amazon/common/ami_config.go packer-1.0.0/builder/amazon/common/ami_config.go
--- packer-1.0.0.orig/builder/amazon/common/ami_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/ami_config.go	2017-04-11 15:33:34.384675106 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // AMIConfig is for common configuration related to creating AMIs.
diff -Nur packer-1.0.0.orig/builder/amazon/common/artifact.go packer-1.0.0/builder/amazon/common/artifact.go
--- packer-1.0.0.orig/builder/amazon/common/artifact.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/artifact.go	2017-04-11 15:33:34.384675106 +0200
@@ -9,7 +9,7 @@
 	"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/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // Artifact is an artifact implementation that contains built AMIs.
diff -Nur packer-1.0.0.orig/builder/amazon/common/artifact_test.go packer-1.0.0/builder/amazon/common/artifact_test.go
--- packer-1.0.0.orig/builder/amazon/common/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/artifact_test.go	2017-04-11 15:33:34.384675106 +0200
@@ -4,7 +4,7 @@
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifact_Impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/amazon/common/block_device.go packer-1.0.0/builder/amazon/common/block_device.go
--- packer-1.0.0.orig/builder/amazon/common/block_device.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/block_device.go	2017-04-11 15:33:34.384675106 +0200
@@ -5,7 +5,7 @@
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // BlockDevice
diff -Nur packer-1.0.0.orig/builder/amazon/common/run_config.go packer-1.0.0/builder/amazon/common/run_config.go
--- packer-1.0.0.orig/builder/amazon/common/run_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/run_config.go	2017-04-11 15:33:34.384675106 +0200
@@ -7,9 +7,9 @@
 	"regexp"
 	"time"
 
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$")
diff -Nur packer-1.0.0.orig/builder/amazon/common/run_config_test.go packer-1.0.0/builder/amazon/common/run_config_test.go
--- packer-1.0.0.orig/builder/amazon/common/run_config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/run_config_test.go	2017-04-11 15:33:34.384675106 +0200
@@ -6,7 +6,7 @@
 	"regexp"
 	"testing"
 
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func init() {
diff -Nur packer-1.0.0.orig/builder/amazon/common/ssh.go packer-1.0.0/builder/amazon/common/ssh.go
--- packer-1.0.0.orig/builder/amazon/common/ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/ssh.go	2017-04-11 15:33:34.384675106 +0200
@@ -9,7 +9,7 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	packerssh "github.com/mitchellh/packer/communicator/ssh"
+	packerssh "github.com/hashicorp/packer/communicator/ssh"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
 )
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_ami_region_copy.go packer-1.0.0/builder/amazon/common/step_ami_region_copy.go
--- packer-1.0.0.orig/builder/amazon/common/step_ami_region_copy.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_ami_region_copy.go	2017-04-11 15:33:34.384675106 +0200
@@ -9,7 +9,7 @@
 	"github.com/aws/aws-sdk-go/service/ec2"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepAMIRegionCopy struct {
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_create_tags.go packer-1.0.0/builder/amazon/common/step_create_tags.go
--- packer-1.0.0.orig/builder/amazon/common/step_create_tags.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_create_tags.go	2017-04-11 15:33:34.384675106 +0200
@@ -8,9 +8,9 @@
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	retry "github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	retry "github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type StepCreateTags struct {
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_deregister_ami.go packer-1.0.0/builder/amazon/common/step_deregister_ami.go
--- packer-1.0.0.orig/builder/amazon/common/step_deregister_ami.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_deregister_ami.go	2017-04-11 15:33:34.384675106 +0200
@@ -6,7 +6,7 @@
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepDeregisterAMI struct {
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_encrypted_ami.go packer-1.0.0/builder/amazon/common/step_encrypted_ami.go
--- packer-1.0.0.orig/builder/amazon/common/step_encrypted_ami.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_encrypted_ami.go	2017-04-11 15:33:34.384675106 +0200
@@ -7,7 +7,7 @@
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepCreateEncryptedAMICopy struct {
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_get_password.go packer-1.0.0/builder/amazon/common/step_get_password.go
--- packer-1.0.0.orig/builder/amazon/common/step_get_password.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_get_password.go	2017-04-11 15:33:34.388675096 +0200
@@ -12,8 +12,8 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepGetPassword reads the password from a Windows server and sets it
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_key_pair.go packer-1.0.0/builder/amazon/common/step_key_pair.go
--- packer-1.0.0.orig/builder/amazon/common/step_key_pair.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_key_pair.go	2017-04-11 15:33:34.388675096 +0200
@@ -8,7 +8,7 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepKeyPair struct {
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_modify_ami_attributes.go packer-1.0.0/builder/amazon/common/step_modify_ami_attributes.go
--- packer-1.0.0.orig/builder/amazon/common/step_modify_ami_attributes.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_modify_ami_attributes.go	2017-04-11 15:33:34.388675096 +0200
@@ -7,8 +7,8 @@
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type StepModifyAMIAttributes struct {
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_modify_ebs_instance.go packer-1.0.0/builder/amazon/common/step_modify_ebs_instance.go
--- packer-1.0.0.orig/builder/amazon/common/step_modify_ebs_instance.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_modify_ebs_instance.go	2017-04-11 15:33:34.388675096 +0200
@@ -6,7 +6,7 @@
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepModifyEBSBackedInstance struct {
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_pre_validate.go packer-1.0.0/builder/amazon/common/step_pre_validate.go
--- packer-1.0.0.orig/builder/amazon/common/step_pre_validate.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_pre_validate.go	2017-04-11 15:33:34.388675096 +0200
@@ -6,7 +6,7 @@
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepPreValidate provides an opportunity to pre-validate any configuration for
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_run_source_instance.go packer-1.0.0/builder/amazon/common/step_run_source_instance.go
--- packer-1.0.0.orig/builder/amazon/common/step_run_source_instance.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_run_source_instance.go	2017-04-11 15:33:34.424675008 +0200
@@ -12,8 +12,8 @@
 	"github.com/aws/aws-sdk-go/service/ec2"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type StepRunSourceInstance struct {
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_security_group.go packer-1.0.0/builder/amazon/common/step_security_group.go
--- packer-1.0.0.orig/builder/amazon/common/step_security_group.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_security_group.go	2017-04-11 15:33:34.388675096 +0200
@@ -9,9 +9,9 @@
 	"github.com/aws/aws-sdk-go/private/waiter"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepSecurityGroup struct {
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_source_ami_info.go packer-1.0.0/builder/amazon/common/step_source_ami_info.go
--- packer-1.0.0.orig/builder/amazon/common/step_source_ami_info.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_source_ami_info.go	2017-04-11 15:33:34.388675096 +0200
@@ -8,7 +8,7 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepSourceAMIInfo extracts critical information from the source AMI
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_stop_ebs_instance.go packer-1.0.0/builder/amazon/common/step_stop_ebs_instance.go
--- packer-1.0.0.orig/builder/amazon/common/step_stop_ebs_instance.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_stop_ebs_instance.go	2017-04-11 15:33:34.388675096 +0200
@@ -5,7 +5,7 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepStopEBSBackedInstance struct {
diff -Nur packer-1.0.0.orig/builder/amazon/common/step_tag_ebs_volumes.go packer-1.0.0/builder/amazon/common/step_tag_ebs_volumes.go
--- packer-1.0.0.orig/builder/amazon/common/step_tag_ebs_volumes.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/common/step_tag_ebs_volumes.go	2017-04-11 15:33:34.428674999 +0200
@@ -5,8 +5,8 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type StepTagEBSVolumes struct {
diff -Nur packer-1.0.0.orig/builder/amazon/ebs/builder.go packer-1.0.0/builder/amazon/ebs/builder.go
--- packer-1.0.0.orig/builder/amazon/ebs/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebs/builder.go	2017-04-11 15:33:34.432674989 +0200
@@ -12,12 +12,12 @@
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"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/template/interpolate"
 )
 
 // The unique ID for this builder
diff -Nur packer-1.0.0.orig/builder/amazon/ebs/builder_acc_test.go packer-1.0.0/builder/amazon/ebs/builder_acc_test.go
--- packer-1.0.0.orig/builder/amazon/ebs/builder_acc_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebs/builder_acc_test.go	2017-04-11 15:33:34.432674989 +0200
@@ -8,9 +8,9 @@
 	"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/mitchellh/packer/builder/amazon/common"
-	builderT "github.com/mitchellh/packer/helper/builder/testing"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/amazon/common"
+	builderT "github.com/hashicorp/packer/helper/builder/testing"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestBuilderAcc_basic(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/amazon/ebs/builder_test.go packer-1.0.0/builder/amazon/ebs/builder_test.go
--- packer-1.0.0.orig/builder/amazon/ebs/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebs/builder_test.go	2017-04-11 15:33:34.432674989 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/builder/amazon/ebs/step_cleanup_volumes.go packer-1.0.0/builder/amazon/ebs/step_cleanup_volumes.go
--- packer-1.0.0.orig/builder/amazon/ebs/step_cleanup_volumes.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebs/step_cleanup_volumes.go	2017-04-11 15:33:34.432674989 +0200
@@ -6,8 +6,8 @@
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // stepCleanupVolumes cleans up any orphaned volumes that were not designated to
diff -Nur packer-1.0.0.orig/builder/amazon/ebs/step_create_ami.go packer-1.0.0/builder/amazon/ebs/step_create_ami.go
--- packer-1.0.0.orig/builder/amazon/ebs/step_create_ami.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebs/step_create_ami.go	2017-04-11 15:33:34.432674989 +0200
@@ -5,8 +5,8 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepCreateAMI struct {
diff -Nur packer-1.0.0.orig/builder/amazon/ebs/tags_acc_test.go packer-1.0.0/builder/amazon/ebs/tags_acc_test.go
--- packer-1.0.0.orig/builder/amazon/ebs/tags_acc_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebs/tags_acc_test.go	2017-04-11 15:33:34.432674989 +0200
@@ -7,9 +7,9 @@
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mitchellh/packer/builder/amazon/common"
-	builderT "github.com/mitchellh/packer/helper/builder/testing"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/amazon/common"
+	builderT "github.com/hashicorp/packer/helper/builder/testing"
+	"github.com/hashicorp/packer/packer"
 )
 
 type TFBuilder struct {
diff -Nur packer-1.0.0.orig/builder/amazon/ebssurrogate/builder.go packer-1.0.0/builder/amazon/ebssurrogate/builder.go
--- packer-1.0.0.orig/builder/amazon/ebssurrogate/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebssurrogate/builder.go	2017-04-11 15:33:34.432674989 +0200
@@ -11,12 +11,12 @@
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/errwrap"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"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/template/interpolate"
 )
 
 const BuilderId = "mitchellh.amazon.ebssurrogate"
diff -Nur packer-1.0.0.orig/builder/amazon/ebssurrogate/builder_test.go packer-1.0.0/builder/amazon/ebssurrogate/builder_test.go
--- packer-1.0.0.orig/builder/amazon/ebssurrogate/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebssurrogate/builder_test.go	2017-04-11 15:33:34.432674989 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/builder/amazon/ebssurrogate/root_block_device.go packer-1.0.0/builder/amazon/ebssurrogate/root_block_device.go
--- packer-1.0.0.orig/builder/amazon/ebssurrogate/root_block_device.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebssurrogate/root_block_device.go	2017-04-11 15:33:34.432674989 +0200
@@ -4,7 +4,7 @@
 	"errors"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type RootBlockDevice struct {
diff -Nur packer-1.0.0.orig/builder/amazon/ebssurrogate/step_register_ami.go packer-1.0.0/builder/amazon/ebssurrogate/step_register_ami.go
--- packer-1.0.0.orig/builder/amazon/ebssurrogate/step_register_ami.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebssurrogate/step_register_ami.go	2017-04-11 15:33:34.432674989 +0200
@@ -6,8 +6,8 @@
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepRegisterAMI creates the AMI.
diff -Nur packer-1.0.0.orig/builder/amazon/ebssurrogate/step_snapshot_new_root.go packer-1.0.0/builder/amazon/ebssurrogate/step_snapshot_new_root.go
--- packer-1.0.0.orig/builder/amazon/ebssurrogate/step_snapshot_new_root.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebssurrogate/step_snapshot_new_root.go	2017-04-11 15:33:34.432674989 +0200
@@ -7,8 +7,8 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepSnapshotNewRootVolume creates a snapshot of the created volume.
diff -Nur packer-1.0.0.orig/builder/amazon/ebsvolume/artifact.go packer-1.0.0/builder/amazon/ebsvolume/artifact.go
--- packer-1.0.0.orig/builder/amazon/ebsvolume/artifact.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebsvolume/artifact.go	2017-04-11 15:33:34.432674989 +0200
@@ -7,7 +7,7 @@
 	"strings"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // map of region to list of volume IDs
diff -Nur packer-1.0.0.orig/builder/amazon/ebsvolume/block_device.go packer-1.0.0/builder/amazon/ebsvolume/block_device.go
--- packer-1.0.0.orig/builder/amazon/ebsvolume/block_device.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebsvolume/block_device.go	2017-04-11 15:33:34.432674989 +0200
@@ -1,8 +1,8 @@
 package ebsvolume
 
 import (
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/template/interpolate"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type BlockDevice struct {
diff -Nur packer-1.0.0.orig/builder/amazon/ebsvolume/builder.go packer-1.0.0/builder/amazon/ebsvolume/builder.go
--- packer-1.0.0.orig/builder/amazon/ebsvolume/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebsvolume/builder.go	2017-04-11 15:33:34.432674989 +0200
@@ -10,12 +10,12 @@
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/errwrap"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"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/template/interpolate"
 )
 
 const BuilderId = "mitchellh.amazon.ebsvolume"
diff -Nur packer-1.0.0.orig/builder/amazon/ebsvolume/builder_test.go packer-1.0.0/builder/amazon/ebsvolume/builder_test.go
--- packer-1.0.0.orig/builder/amazon/ebsvolume/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebsvolume/builder_test.go	2017-04-11 15:33:34.432674989 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/builder/amazon/ebsvolume/step_tag_ebs_volumes.go packer-1.0.0/builder/amazon/ebsvolume/step_tag_ebs_volumes.go
--- packer-1.0.0.orig/builder/amazon/ebsvolume/step_tag_ebs_volumes.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/ebsvolume/step_tag_ebs_volumes.go	2017-04-11 15:33:34.432674989 +0200
@@ -5,9 +5,9 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type stepTagEBSVolumes struct {
diff -Nur packer-1.0.0.orig/builder/amazon/instance/builder.go packer-1.0.0/builder/amazon/instance/builder.go
--- packer-1.0.0.orig/builder/amazon/instance/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/instance/builder.go	2017-04-11 15:33:34.432674989 +0200
@@ -12,12 +12,12 @@
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"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/template/interpolate"
 )
 
 // The unique ID for this builder
diff -Nur packer-1.0.0.orig/builder/amazon/instance/builder_test.go packer-1.0.0/builder/amazon/instance/builder_test.go
--- packer-1.0.0.orig/builder/amazon/instance/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/instance/builder_test.go	2017-04-11 15:33:34.432674989 +0200
@@ -1,7 +1,7 @@
 package instance
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"testing"
diff -Nur packer-1.0.0.orig/builder/amazon/instance/step_bundle_volume.go packer-1.0.0/builder/amazon/instance/step_bundle_volume.go
--- packer-1.0.0.orig/builder/amazon/instance/step_bundle_volume.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/instance/step_bundle_volume.go	2017-04-11 15:33:34.456674930 +0200
@@ -5,8 +5,8 @@
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type bundleCmdData struct {
diff -Nur packer-1.0.0.orig/builder/amazon/instance/step_register_ami.go packer-1.0.0/builder/amazon/instance/step_register_ami.go
--- packer-1.0.0.orig/builder/amazon/instance/step_register_ami.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/instance/step_register_ami.go	2017-04-11 15:33:34.468674901 +0200
@@ -6,8 +6,8 @@
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepRegisterAMI struct{}
diff -Nur packer-1.0.0.orig/builder/amazon/instance/step_upload_bundle.go packer-1.0.0/builder/amazon/instance/step_upload_bundle.go
--- packer-1.0.0.orig/builder/amazon/instance/step_upload_bundle.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/instance/step_upload_bundle.go	2017-04-11 15:33:34.468674901 +0200
@@ -4,8 +4,8 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type uploadCmdData struct {
diff -Nur packer-1.0.0.orig/builder/amazon/instance/step_upload_x509_cert.go packer-1.0.0/builder/amazon/instance/step_upload_x509_cert.go
--- packer-1.0.0.orig/builder/amazon/instance/step_upload_x509_cert.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/amazon/instance/step_upload_x509_cert.go	2017-04-11 15:33:34.468674901 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"os"
 )
 
diff -Nur packer-1.0.0.orig/builder/azure/arm/azure_client.go packer-1.0.0/builder/azure/arm/azure_client.go
--- packer-1.0.0.orig/builder/azure/arm/azure_client.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/azure_client.go	2017-04-11 15:27:07.589644604 +0200
@@ -19,8 +19,8 @@
 	"github.com/Azure/azure-sdk-for-go/storage"
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/azure"
-	"github.com/mitchellh/packer/builder/azure/common"
-	"github.com/mitchellh/packer/version"
+	"github.com/hashicorp/packer/builder/azure/common"
+	"github.com/hashicorp/packer/version"
 )
 
 const (
diff -Nur packer-1.0.0.orig/builder/azure/arm/builder.go packer-1.0.0/builder/azure/arm/builder.go
--- packer-1.0.0.orig/builder/azure/arm/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/builder.go	2017-04-11 15:27:33.245578684 +0200
@@ -10,17 +10,17 @@
 	"strings"
 	"time"
 
-	packerAzureCommon "github.com/mitchellh/packer/builder/azure/common"
+	packerAzureCommon "github.com/hashicorp/packer/builder/azure/common"
 
 	"github.com/Azure/go-autorest/autorest/azure"
 
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/builder/azure/common/lin"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/lin"
 
 	"github.com/mitchellh/multistep"
-	packerCommon "github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	packerCommon "github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 )
 
 type Builder struct {
diff -Nur packer-1.0.0.orig/builder/azure/arm/builder_test.go packer-1.0.0/builder/azure/arm/builder_test.go
--- packer-1.0.0.orig/builder/azure/arm/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/builder_test.go	2017-04-11 15:33:34.468674901 +0200
@@ -6,7 +6,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 )
 
 func TestStateBagShouldBePopulatedExpectedValues(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/azure/arm/config.go packer-1.0.0/builder/azure/arm/config.go
--- packer-1.0.0.orig/builder/azure/arm/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/config.go	2017-04-11 15:28:12.517478249 +0200
@@ -22,13 +22,13 @@
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/masterzen/winrm"
 
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/builder/azure/pkcs12"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/template/interpolate"
 
 	"golang.org/x/crypto/ssh"
 )
diff -Nur packer-1.0.0.orig/builder/azure/arm/config_retriever.go packer-1.0.0/builder/azure/arm/config_retriever.go
--- packer-1.0.0.orig/builder/azure/arm/config_retriever.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/config_retriever.go	2017-04-11 15:31:39.172958649 +0200
@@ -9,7 +9,7 @@
 
 import (
 	"github.com/Azure/go-autorest/autorest/azure"
-	"github.com/mitchellh/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common"
 )
 
 type configRetriever struct {
diff -Nur packer-1.0.0.orig/builder/azure/arm/config_test.go packer-1.0.0/builder/azure/arm/config_test.go
--- packer-1.0.0.orig/builder/azure/arm/config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/config_test.go	2017-04-11 15:33:34.480674871 +0200
@@ -9,8 +9,8 @@
 	"testing"
 	"time"
 
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 )
 
 // List of configuration parameters that are required by the ARM builder.
diff -Nur packer-1.0.0.orig/builder/azure/arm/inspector.go packer-1.0.0/builder/azure/arm/inspector.go
--- packer-1.0.0.orig/builder/azure/arm/inspector.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/inspector.go	2017-04-11 15:27:51.013533174 +0200
@@ -8,7 +8,7 @@
 
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/azure"
-	"github.com/mitchellh/packer/builder/azure/common/logutil"
+	"github.com/hashicorp/packer/builder/azure/common/logutil"
 	"io"
 )
 
diff -Nur packer-1.0.0.orig/builder/azure/arm/step.go packer-1.0.0/builder/azure/arm/step.go
--- packer-1.0.0.orig/builder/azure/arm/step.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step.go	2017-04-11 15:33:34.496674832 +0200
@@ -5,8 +5,8 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 )
 
 func processInterruptibleResult(
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_capture_image.go packer-1.0.0/builder/azure/arm/step_capture_image.go
--- packer-1.0.0.orig/builder/azure/arm/step_capture_image.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_capture_image.go	2017-04-11 15:33:34.468674901 +0200
@@ -8,9 +8,9 @@
 
 	"github.com/Azure/azure-sdk-for-go/arm/compute"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepCaptureImage struct {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_capture_image_test.go packer-1.0.0/builder/azure/arm/step_capture_image_test.go
--- packer-1.0.0.orig/builder/azure/arm/step_capture_image_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_capture_image_test.go	2017-04-11 15:33:34.468674901 +0200
@@ -9,7 +9,7 @@
 
 	"github.com/Azure/azure-sdk-for-go/arm/compute"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 )
 
 func TestStepCaptureImageShouldFailIfCaptureFails(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_create_resource_group.go packer-1.0.0/builder/azure/arm/step_create_resource_group.go
--- packer-1.0.0.orig/builder/azure/arm/step_create_resource_group.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_create_resource_group.go	2017-04-11 15:33:34.468674901 +0200
@@ -8,8 +8,8 @@
 
 	"github.com/Azure/azure-sdk-for-go/arm/resources/resources"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepCreateResourceGroup struct {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_create_resource_group_test.go packer-1.0.0/builder/azure/arm/step_create_resource_group_test.go
--- packer-1.0.0.orig/builder/azure/arm/step_create_resource_group_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_create_resource_group_test.go	2017-04-11 15:33:34.468674901 +0200
@@ -8,7 +8,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 )
 
 func TestStepCreateResourceGroupShouldFailIfCreateFails(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_delete_os_disk.go packer-1.0.0/builder/azure/arm/step_delete_os_disk.go
--- packer-1.0.0.orig/builder/azure/arm/step_delete_os_disk.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_delete_os_disk.go	2017-04-11 15:33:34.468674901 +0200
@@ -8,10 +8,10 @@
 	"net/url"
 	"strings"
 
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepDeleteOSDisk struct {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_delete_os_disk_test.go packer-1.0.0/builder/azure/arm/step_delete_os_disk_test.go
--- packer-1.0.0.orig/builder/azure/arm/step_delete_os_disk_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_delete_os_disk_test.go	2017-04-11 15:33:34.468674901 +0200
@@ -8,7 +8,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 )
 
 func TestStepDeleteOSDiskShouldFailIfGetFails(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_delete_resource_group.go packer-1.0.0/builder/azure/arm/step_delete_resource_group.go
--- packer-1.0.0.orig/builder/azure/arm/step_delete_resource_group.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_delete_resource_group.go	2017-04-11 15:33:34.468674901 +0200
@@ -7,9 +7,9 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepDeleteResourceGroup struct {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_delete_resource_group_test.go packer-1.0.0/builder/azure/arm/step_delete_resource_group_test.go
--- packer-1.0.0.orig/builder/azure/arm/step_delete_resource_group_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_delete_resource_group_test.go	2017-04-11 15:33:34.468674901 +0200
@@ -8,7 +8,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 )
 
 func TestStepDeleteResourceGroupShouldFailIfDeleteFails(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_deploy_template.go packer-1.0.0/builder/azure/arm/step_deploy_template.go
--- packer-1.0.0.orig/builder/azure/arm/step_deploy_template.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_deploy_template.go	2017-04-11 15:33:34.468674901 +0200
@@ -7,9 +7,9 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepDeployTemplate struct {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_deploy_template_test.go packer-1.0.0/builder/azure/arm/step_deploy_template_test.go
--- packer-1.0.0.orig/builder/azure/arm/step_deploy_template_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_deploy_template_test.go	2017-04-11 15:33:34.468674901 +0200
@@ -8,7 +8,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 )
 
 func TestStepDeployTemplateShouldFailIfDeployFails(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_get_certificate.go packer-1.0.0/builder/azure/arm/step_get_certificate.go
--- packer-1.0.0.orig/builder/azure/arm/step_get_certificate.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_get_certificate.go	2017-04-11 15:33:34.468674901 +0200
@@ -8,8 +8,8 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepGetCertificate struct {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_get_certificate_test.go packer-1.0.0/builder/azure/arm/step_get_certificate_test.go
--- packer-1.0.0.orig/builder/azure/arm/step_get_certificate_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_get_certificate_test.go	2017-04-11 15:33:34.468674901 +0200
@@ -8,7 +8,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 )
 
 func TestStepGetCertificateShouldFailIfGetFails(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_get_ip_address.go packer-1.0.0/builder/azure/arm/step_get_ip_address.go
--- packer-1.0.0.orig/builder/azure/arm/step_get_ip_address.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_get_ip_address.go	2017-04-11 15:33:34.468674901 +0200
@@ -7,8 +7,8 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 )
 
 type EndpointType int
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_get_ip_address_test.go packer-1.0.0/builder/azure/arm/step_get_ip_address_test.go
--- packer-1.0.0.orig/builder/azure/arm/step_get_ip_address_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_get_ip_address_test.go	2017-04-11 15:33:34.468674901 +0200
@@ -8,7 +8,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 )
 
 func TestStepGetIPAddressShouldFailIfGetFails(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_get_os_disk.go packer-1.0.0/builder/azure/arm/step_get_os_disk.go
--- packer-1.0.0.orig/builder/azure/arm/step_get_os_disk.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_get_os_disk.go	2017-04-11 15:33:34.496674832 +0200
@@ -8,10 +8,10 @@
 
 	"github.com/Azure/azure-sdk-for-go/arm/compute"
 
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepGetOSDisk struct {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_get_os_disk_test.go packer-1.0.0/builder/azure/arm/step_get_os_disk_test.go
--- packer-1.0.0.orig/builder/azure/arm/step_get_os_disk_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_get_os_disk_test.go	2017-04-11 15:33:34.480674871 +0200
@@ -9,7 +9,7 @@
 
 	"github.com/Azure/azure-sdk-for-go/arm/compute"
 
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 
 	"github.com/mitchellh/multistep"
 )
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_power_off_compute.go packer-1.0.0/builder/azure/arm/step_power_off_compute.go
--- packer-1.0.0.orig/builder/azure/arm/step_power_off_compute.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_power_off_compute.go	2017-04-11 15:33:34.496674832 +0200
@@ -7,9 +7,9 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepPowerOffCompute struct {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_power_off_compute_test.go packer-1.0.0/builder/azure/arm/step_power_off_compute_test.go
--- packer-1.0.0.orig/builder/azure/arm/step_power_off_compute_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_power_off_compute_test.go	2017-04-11 15:33:34.496674832 +0200
@@ -8,7 +8,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 )
 
 func TestStepPowerOffComputeShouldFailIfPowerOffFails(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_set_certificate.go packer-1.0.0/builder/azure/arm/step_set_certificate.go
--- packer-1.0.0.orig/builder/azure/arm/step_set_certificate.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_set_certificate.go	2017-04-11 15:33:34.496674832 +0200
@@ -5,8 +5,8 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepSetCertificate struct {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_set_certificate_test.go packer-1.0.0/builder/azure/arm/step_set_certificate_test.go
--- packer-1.0.0.orig/builder/azure/arm/step_set_certificate_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_set_certificate_test.go	2017-04-11 15:33:34.496674832 +0200
@@ -7,7 +7,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 )
 
 func TestStepSetCertificateShouldPassIfGetPasses(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_test.go packer-1.0.0/builder/azure/arm/step_test.go
--- packer-1.0.0.orig/builder/azure/arm/step_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_test.go	2017-04-11 15:33:34.496674832 +0200
@@ -6,8 +6,8 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_validate_template.go packer-1.0.0/builder/azure/arm/step_validate_template.go
--- packer-1.0.0.orig/builder/azure/arm/step_validate_template.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_validate_template.go	2017-04-11 15:33:34.496674832 +0200
@@ -7,8 +7,8 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepValidateTemplate struct {
diff -Nur packer-1.0.0.orig/builder/azure/arm/step_validate_template_test.go packer-1.0.0/builder/azure/arm/step_validate_template_test.go
--- packer-1.0.0.orig/builder/azure/arm/step_validate_template_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/step_validate_template_test.go	2017-04-11 15:33:34.496674832 +0200
@@ -8,7 +8,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 )
 
 func TestStepValidateTemplateShouldFailIfValidateFails(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/azure/arm/template_factory.go packer-1.0.0/builder/azure/arm/template_factory.go
--- packer-1.0.0.orig/builder/azure/arm/template_factory.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/template_factory.go	2017-04-11 15:28:02.653503422 +0200
@@ -6,8 +6,8 @@
 	"github.com/Azure/azure-sdk-for-go/arm/compute"
 	"github.com/Azure/azure-sdk-for-go/arm/resources/resources"
 
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/builder/azure/common/template"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/template"
 )
 
 type templateFactoryFunc func(*Config) (*resources.Deployment, error)
diff -Nur packer-1.0.0.orig/builder/azure/arm/template_factory_test.go packer-1.0.0/builder/azure/arm/template_factory_test.go
--- packer-1.0.0.orig/builder/azure/arm/template_factory_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/template_factory_test.go	2017-04-11 15:33:34.520674774 +0200
@@ -7,8 +7,8 @@
 
 	"github.com/Azure/azure-sdk-for-go/arm/resources/resources"
 	"github.com/approvals/go-approval-tests"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/builder/azure/common/template"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/template"
 )
 
 // Ensure the link values are not set, and the concrete values are set.
diff -Nur packer-1.0.0.orig/builder/azure/arm/tempname.go packer-1.0.0/builder/azure/arm/tempname.go
--- packer-1.0.0.orig/builder/azure/arm/tempname.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/arm/tempname.go	2017-04-11 15:33:34.496674832 +0200
@@ -6,7 +6,7 @@
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common"
 )
 
 const (
diff -Nur packer-1.0.0.orig/builder/azure/common/devicelogin.go packer-1.0.0/builder/azure/common/devicelogin.go
--- packer-1.0.0.orig/builder/azure/common/devicelogin.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/common/devicelogin.go	2017-04-11 15:33:34.496674832 +0200
@@ -12,7 +12,7 @@
 	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/mitchellh/go-homedir"
-	"github.com/mitchellh/packer/version"
+	"github.com/hashicorp/packer/version"
 )
 
 var (
diff -Nur packer-1.0.0.orig/builder/azure/common/lin/ssh.go packer-1.0.0/builder/azure/common/lin/ssh.go
--- packer-1.0.0.orig/builder/azure/common/lin/ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/common/lin/ssh.go	2017-04-11 15:31:49.796932326 +0200
@@ -6,7 +6,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/azure/common/lin/step_create_cert.go packer-1.0.0/builder/azure/common/lin/step_create_cert.go
--- packer-1.0.0.orig/builder/azure/common/lin/step_create_cert.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/common/lin/step_create_cert.go	2017-04-11 15:33:34.496674832 +0200
@@ -15,10 +15,10 @@
 	"math/big"
 	"time"
 
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepCreateCert struct {
diff -Nur packer-1.0.0.orig/builder/azure/common/lin/step_generalize_os.go packer-1.0.0/builder/azure/common/lin/step_generalize_os.go
--- packer-1.0.0.orig/builder/azure/common/lin/step_generalize_os.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/common/lin/step_generalize_os.go	2017-04-11 15:33:34.496674832 +0200
@@ -7,7 +7,7 @@
 	"bytes"
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/azure/pkcs12/crypto.go packer-1.0.0/builder/azure/pkcs12/crypto.go
--- packer-1.0.0.orig/builder/azure/pkcs12/crypto.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/azure/pkcs12/crypto.go	2017-04-11 15:33:38.116665991 +0200
@@ -12,7 +12,7 @@
 	"errors"
 	"io"
 
-	"github.com/mitchellh/packer/builder/azure/pkcs12/rc2"
+	"github.com/hashicorp/packer/builder/azure/pkcs12/rc2"
 )
 
 const (
diff -Nur packer-1.0.0.orig/builder/cloudstack/artifact_test.go packer-1.0.0/builder/cloudstack/artifact_test.go
--- packer-1.0.0.orig/builder/cloudstack/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/cloudstack/artifact_test.go	2017-04-11 15:33:34.496674832 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff -Nur packer-1.0.0.orig/builder/cloudstack/builder.go packer-1.0.0/builder/cloudstack/builder.go
--- packer-1.0.0.orig/builder/cloudstack/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/cloudstack/builder.go	2017-04-11 15:33:34.496674832 +0200
@@ -2,9 +2,9 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff -Nur packer-1.0.0.orig/builder/cloudstack/builder_test.go packer-1.0.0/builder/cloudstack/builder_test.go
--- packer-1.0.0.orig/builder/cloudstack/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/cloudstack/builder_test.go	2017-04-11 15:33:34.496674832 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestBuilder_Impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/cloudstack/config.go packer-1.0.0/builder/cloudstack/config.go
--- packer-1.0.0.orig/builder/cloudstack/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/cloudstack/config.go	2017-04-11 15:33:34.496674832 +0200
@@ -6,12 +6,12 @@
 	"os"
 	"time"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/template/interpolate"
 )
 
 // Config holds all the details needed to configure the builder.
diff -Nur packer-1.0.0.orig/builder/cloudstack/ssh.go packer-1.0.0/builder/cloudstack/ssh.go
--- packer-1.0.0.orig/builder/cloudstack/ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/cloudstack/ssh.go	2017-04-11 15:33:34.520674774 +0200
@@ -5,7 +5,7 @@
 	"io/ioutil"
 
 	"github.com/mitchellh/multistep"
-	packerssh "github.com/mitchellh/packer/communicator/ssh"
+	packerssh "github.com/hashicorp/packer/communicator/ssh"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 	"golang.org/x/crypto/ssh"
 )
diff -Nur packer-1.0.0.orig/builder/cloudstack/step_configure_networking.go packer-1.0.0/builder/cloudstack/step_configure_networking.go
--- packer-1.0.0.orig/builder/cloudstack/step_configure_networking.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/cloudstack/step_configure_networking.go	2017-04-11 15:33:34.528674754 +0200
@@ -7,7 +7,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff -Nur packer-1.0.0.orig/builder/cloudstack/step_create_instance.go packer-1.0.0/builder/cloudstack/step_create_instance.go
--- packer-1.0.0.orig/builder/cloudstack/step_create_instance.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/cloudstack/step_create_instance.go	2017-04-11 15:33:34.548674705 +0200
@@ -6,7 +6,7 @@
 	"strings"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff -Nur packer-1.0.0.orig/builder/cloudstack/step_create_template.go packer-1.0.0/builder/cloudstack/step_create_template.go
--- packer-1.0.0.orig/builder/cloudstack/step_create_template.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/cloudstack/step_create_template.go	2017-04-11 15:33:34.548674705 +0200
@@ -5,7 +5,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff -Nur packer-1.0.0.orig/builder/cloudstack/step_prepare_config.go packer-1.0.0/builder/cloudstack/step_prepare_config.go
--- packer-1.0.0.orig/builder/cloudstack/step_prepare_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/cloudstack/step_prepare_config.go	2017-04-11 15:33:34.548674705 +0200
@@ -6,7 +6,7 @@
 	"regexp"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff -Nur packer-1.0.0.orig/builder/cloudstack/step_shutdown_instance.go packer-1.0.0/builder/cloudstack/step_shutdown_instance.go
--- packer-1.0.0.orig/builder/cloudstack/step_shutdown_instance.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/cloudstack/step_shutdown_instance.go	2017-04-11 15:33:34.548674705 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff -Nur packer-1.0.0.orig/builder/digitalocean/artifact_test.go packer-1.0.0/builder/digitalocean/artifact_test.go
--- packer-1.0.0.orig/builder/digitalocean/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/digitalocean/artifact_test.go	2017-04-11 15:33:34.548674705 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifact_Impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/digitalocean/builder.go packer-1.0.0/builder/digitalocean/builder.go
--- packer-1.0.0.orig/builder/digitalocean/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/digitalocean/builder.go	2017-04-11 15:33:34.548674705 +0200
@@ -10,9 +10,9 @@
 
 	"github.com/digitalocean/godo"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"golang.org/x/oauth2"
 )
 
diff -Nur packer-1.0.0.orig/builder/digitalocean/builder_acc_test.go packer-1.0.0/builder/digitalocean/builder_acc_test.go
--- packer-1.0.0.orig/builder/digitalocean/builder_acc_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/digitalocean/builder_acc_test.go	2017-04-11 15:33:34.548674705 +0200
@@ -4,7 +4,7 @@
 	"os"
 	"testing"
 
-	builderT "github.com/mitchellh/packer/helper/builder/testing"
+	builderT "github.com/hashicorp/packer/helper/builder/testing"
 )
 
 func TestBuilderAcc_basic(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/digitalocean/builder_test.go packer-1.0.0/builder/digitalocean/builder_test.go
--- packer-1.0.0.orig/builder/digitalocean/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/digitalocean/builder_test.go	2017-04-11 15:33:34.548674705 +0200
@@ -5,7 +5,7 @@
 	"testing"
 	"time"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/builder/digitalocean/config.go packer-1.0.0/builder/digitalocean/config.go
--- packer-1.0.0.orig/builder/digitalocean/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/digitalocean/config.go	2017-04-11 15:33:34.548674705 +0200
@@ -7,12 +7,12 @@
 	"time"
 
 	"github.com/mitchellh/mapstructure"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/builder/digitalocean/step_create_droplet.go packer-1.0.0/builder/digitalocean/step_create_droplet.go
--- packer-1.0.0.orig/builder/digitalocean/step_create_droplet.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/digitalocean/step_create_droplet.go	2017-04-11 15:33:34.552674695 +0200
@@ -7,7 +7,7 @@
 
 	"github.com/digitalocean/godo"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepCreateDroplet struct {
diff -Nur packer-1.0.0.orig/builder/digitalocean/step_create_ssh_key.go packer-1.0.0/builder/digitalocean/step_create_ssh_key.go
--- packer-1.0.0.orig/builder/digitalocean/step_create_ssh_key.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/digitalocean/step_create_ssh_key.go	2017-04-11 15:33:34.552674695 +0200
@@ -12,8 +12,8 @@
 
 	"github.com/digitalocean/godo"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/digitalocean/step_droplet_info.go packer-1.0.0/builder/digitalocean/step_droplet_info.go
--- packer-1.0.0.orig/builder/digitalocean/step_droplet_info.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/digitalocean/step_droplet_info.go	2017-04-11 15:33:34.552674695 +0200
@@ -5,7 +5,7 @@
 
 	"github.com/digitalocean/godo"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepDropletInfo struct{}
diff -Nur packer-1.0.0.orig/builder/digitalocean/step_power_off.go packer-1.0.0/builder/digitalocean/step_power_off.go
--- packer-1.0.0.orig/builder/digitalocean/step_power_off.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/digitalocean/step_power_off.go	2017-04-11 15:33:34.552674695 +0200
@@ -6,7 +6,7 @@
 
 	"github.com/digitalocean/godo"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepPowerOff struct{}
diff -Nur packer-1.0.0.orig/builder/digitalocean/step_shutdown.go packer-1.0.0/builder/digitalocean/step_shutdown.go
--- packer-1.0.0.orig/builder/digitalocean/step_shutdown.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/digitalocean/step_shutdown.go	2017-04-11 15:33:34.552674695 +0200
@@ -7,7 +7,7 @@
 
 	"github.com/digitalocean/godo"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepShutdown struct{}
diff -Nur packer-1.0.0.orig/builder/digitalocean/step_snapshot.go packer-1.0.0/builder/digitalocean/step_snapshot.go
--- packer-1.0.0.orig/builder/digitalocean/step_snapshot.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/digitalocean/step_snapshot.go	2017-04-11 15:33:34.552674695 +0200
@@ -8,7 +8,7 @@
 
 	"github.com/digitalocean/godo"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepSnapshot struct{}
diff -Nur packer-1.0.0.orig/builder/docker/artifact_export_test.go packer-1.0.0/builder/docker/artifact_export_test.go
--- packer-1.0.0.orig/builder/docker/artifact_export_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/artifact_export_test.go	2017-04-11 15:33:34.552674695 +0200
@@ -1,7 +1,7 @@
 package docker
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/docker/artifact_import_test.go packer-1.0.0/builder/docker/artifact_import_test.go
--- packer-1.0.0.orig/builder/docker/artifact_import_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/artifact_import_test.go	2017-04-11 15:33:34.552674695 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"errors"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/docker/builder.go packer-1.0.0/builder/docker/builder.go
--- packer-1.0.0.orig/builder/docker/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/builder.go	2017-04-11 15:33:34.572674647 +0200
@@ -4,9 +4,9 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 )
 
 const (
diff -Nur packer-1.0.0.orig/builder/docker/builder_test.go packer-1.0.0/builder/docker/builder_test.go
--- packer-1.0.0.orig/builder/docker/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/builder_test.go	2017-04-11 15:33:34.560674676 +0200
@@ -1,7 +1,7 @@
 package docker
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/docker/comm.go packer-1.0.0/builder/docker/comm.go
--- packer-1.0.0.orig/builder/docker/comm.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/comm.go	2017-04-11 15:33:34.576674637 +0200
@@ -5,8 +5,8 @@
 	"io/ioutil"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/communicator/ssh"
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/communicator/ssh"
+	"github.com/hashicorp/packer/helper/communicator"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/docker/communicator.go packer-1.0.0/builder/docker/communicator.go
--- packer-1.0.0.orig/builder/docker/communicator.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/communicator.go	2017-04-11 15:33:34.588674607 +0200
@@ -14,7 +14,7 @@
 	"syscall"
 
 	"github.com/hashicorp/go-version"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type Communicator struct {
diff -Nur packer-1.0.0.orig/builder/docker/communicator_test.go packer-1.0.0/builder/docker/communicator_test.go
--- packer-1.0.0.orig/builder/docker/communicator_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/communicator_test.go	2017-04-11 15:33:34.588674607 +0200
@@ -8,10 +8,10 @@
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/provisioner/file"
-	"github.com/mitchellh/packer/provisioner/shell"
-	"github.com/mitchellh/packer/template"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/provisioner/file"
+	"github.com/hashicorp/packer/provisioner/shell"
+	"github.com/hashicorp/packer/template"
 )
 
 func TestCommunicator_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/docker/config.go packer-1.0.0/builder/docker/config.go
--- packer-1.0.0.orig/builder/docker/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/config.go	2017-04-11 15:33:34.588674607 +0200
@@ -5,11 +5,11 @@
 	"os"
 
 	"github.com/mitchellh/mapstructure"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/template/interpolate"
 )
 
 var (
diff -Nur packer-1.0.0.orig/builder/docker/driver_docker.go packer-1.0.0/builder/docker/driver_docker.go
--- packer-1.0.0.orig/builder/docker/driver_docker.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/driver_docker.go	2017-04-11 15:33:34.588674607 +0200
@@ -12,8 +12,8 @@
 	"sync"
 
 	"github.com/hashicorp/go-version"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type DockerDriver struct {
diff -Nur packer-1.0.0.orig/builder/docker/exec.go packer-1.0.0/builder/docker/exec.go
--- packer-1.0.0.orig/builder/docker/exec.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/exec.go	2017-04-11 15:33:34.588674607 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/iochan"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io"
 	"log"
 	"os/exec"
diff -Nur packer-1.0.0.orig/builder/docker/step_commit.go packer-1.0.0/builder/docker/step_commit.go
--- packer-1.0.0.orig/builder/docker/step_commit.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/step_commit.go	2017-04-11 15:33:34.588674607 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepCommit commits the container to a image.
diff -Nur packer-1.0.0.orig/builder/docker/step_export.go packer-1.0.0/builder/docker/step_export.go
--- packer-1.0.0.orig/builder/docker/step_export.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/step_export.go	2017-04-11 15:33:34.588674607 +0200
@@ -6,7 +6,7 @@
 	"path/filepath"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepExport exports the container to a flat tar file.
diff -Nur packer-1.0.0.orig/builder/docker/step_pull.go packer-1.0.0/builder/docker/step_pull.go
--- packer-1.0.0.orig/builder/docker/step_pull.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/step_pull.go	2017-04-11 15:33:34.588674607 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/docker/step_run.go packer-1.0.0/builder/docker/step_run.go
--- packer-1.0.0.orig/builder/docker/step_run.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/step_run.go	2017-04-11 15:33:34.588674607 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepRun struct {
diff -Nur packer-1.0.0.orig/builder/docker/step_temp_dir.go packer-1.0.0/builder/docker/step_temp_dir.go
--- packer-1.0.0.orig/builder/docker/step_temp_dir.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/step_temp_dir.go	2017-04-11 15:33:34.588674607 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 )
diff -Nur packer-1.0.0.orig/builder/docker/step_temp_dir_test.go packer-1.0.0/builder/docker/step_temp_dir_test.go
--- packer-1.0.0.orig/builder/docker/step_temp_dir_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/step_temp_dir_test.go	2017-04-11 15:33:34.588674607 +0200
@@ -6,7 +6,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestStepTempDir_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/docker/step_test.go packer-1.0.0/builder/docker/step_test.go
--- packer-1.0.0.orig/builder/docker/step_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/docker/step_test.go	2017-04-11 15:33:34.588674607 +0200
@@ -3,7 +3,7 @@
 import (
 	"bytes"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/file/artifact_test.go packer-1.0.0/builder/file/artifact_test.go
--- packer-1.0.0.orig/builder/file/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/file/artifact_test.go	2017-04-11 15:33:34.588674607 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestNullArtifact(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/file/builder.go packer-1.0.0/builder/file/builder.go
--- packer-1.0.0.orig/builder/file/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/file/builder.go	2017-04-11 15:33:34.592674598 +0200
@@ -12,7 +12,7 @@
 	"os"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 const BuilderId = "packer.file"
diff -Nur packer-1.0.0.orig/builder/file/builder_test.go packer-1.0.0/builder/file/builder_test.go
--- packer-1.0.0.orig/builder/file/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/file/builder_test.go	2017-04-11 15:33:34.588674607 +0200
@@ -5,8 +5,8 @@
 	"io/ioutil"
 	"testing"
 
-	builderT "github.com/mitchellh/packer/helper/builder/testing"
-	"github.com/mitchellh/packer/packer"
+	builderT "github.com/hashicorp/packer/helper/builder/testing"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestBuilder_implBuilder(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/file/config.go packer-1.0.0/builder/file/config.go
--- packer-1.0.0.orig/builder/file/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/file/config.go	2017-04-11 15:33:34.592674598 +0200
@@ -3,10 +3,10 @@
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 var ErrTargetRequired = fmt.Errorf("target required")
diff -Nur packer-1.0.0.orig/builder/googlecompute/artifact_test.go packer-1.0.0/builder/googlecompute/artifact_test.go
--- packer-1.0.0.orig/builder/googlecompute/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/artifact_test.go	2017-04-11 15:33:34.592674598 +0200
@@ -1,7 +1,7 @@
 package googlecompute
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/googlecompute/builder.go packer-1.0.0/builder/googlecompute/builder.go
--- packer-1.0.0.orig/builder/googlecompute/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/builder.go	2017-04-11 15:33:34.600674578 +0200
@@ -7,9 +7,9 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 )
 
 // The unique ID for this builder.
diff -Nur packer-1.0.0.orig/builder/googlecompute/config.go packer-1.0.0/builder/googlecompute/config.go
--- packer-1.0.0.orig/builder/googlecompute/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/config.go	2017-04-11 15:33:34.604674569 +0200
@@ -6,12 +6,12 @@
 	"regexp"
 	"time"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/template/interpolate"
 )
 
 var reImageFamily = regexp.MustCompile(`^[a-z]([-a-z0-9]{0,61}[a-z0-9])?$`)
diff -Nur packer-1.0.0.orig/builder/googlecompute/driver_gce.go packer-1.0.0/builder/googlecompute/driver_gce.go
--- packer-1.0.0.orig/builder/googlecompute/driver_gce.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/driver_gce.go	2017-04-11 15:33:34.604674569 +0200
@@ -16,9 +16,9 @@
 
 	"google.golang.org/api/compute/v1"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/version"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/version"
 
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
diff -Nur packer-1.0.0.orig/builder/googlecompute/step_check_existing_image.go packer-1.0.0/builder/googlecompute/step_check_existing_image.go
--- packer-1.0.0.orig/builder/googlecompute/step_check_existing_image.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/step_check_existing_image.go	2017-04-11 15:33:34.608674559 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepCheckExistingImage represents a Packer build step that checks if the
diff -Nur packer-1.0.0.orig/builder/googlecompute/step_create_image.go packer-1.0.0/builder/googlecompute/step_create_image.go
--- packer-1.0.0.orig/builder/googlecompute/step_create_image.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/step_create_image.go	2017-04-11 15:33:34.608674559 +0200
@@ -6,7 +6,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepCreateImage represents a Packer build step that creates GCE machine
diff -Nur packer-1.0.0.orig/builder/googlecompute/step_create_instance.go packer-1.0.0/builder/googlecompute/step_create_instance.go
--- packer-1.0.0.orig/builder/googlecompute/step_create_instance.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/step_create_instance.go	2017-04-11 15:33:34.608674559 +0200
@@ -7,7 +7,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepCreateInstance represents a Packer build step that creates GCE instances.
diff -Nur packer-1.0.0.orig/builder/googlecompute/step_create_ssh_key.go packer-1.0.0/builder/googlecompute/step_create_ssh_key.go
--- packer-1.0.0.orig/builder/googlecompute/step_create_ssh_key.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/step_create_ssh_key.go	2017-04-11 15:33:34.608674559 +0200
@@ -10,7 +10,7 @@
 	"os"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/googlecompute/step_create_windows_password.go packer-1.0.0/builder/googlecompute/step_create_windows_password.go
--- packer-1.0.0.orig/builder/googlecompute/step_create_windows_password.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/step_create_windows_password.go	2017-04-11 15:33:34.608674559 +0200
@@ -13,7 +13,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepCreateWindowsPassword represents a Packer build step that sets the windows password on a Windows GCE instance.
diff -Nur packer-1.0.0.orig/builder/googlecompute/step_instance_info.go packer-1.0.0/builder/googlecompute/step_instance_info.go
--- packer-1.0.0.orig/builder/googlecompute/step_instance_info.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/step_instance_info.go	2017-04-11 15:33:34.608674559 +0200
@@ -6,7 +6,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // stepInstanceInfo represents a Packer build step that gathers GCE instance info.
diff -Nur packer-1.0.0.orig/builder/googlecompute/step_teardown_instance.go packer-1.0.0/builder/googlecompute/step_teardown_instance.go
--- packer-1.0.0.orig/builder/googlecompute/step_teardown_instance.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/step_teardown_instance.go	2017-04-11 15:33:34.608674559 +0200
@@ -6,7 +6,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepTeardownInstance represents a Packer build step that tears down GCE
diff -Nur packer-1.0.0.orig/builder/googlecompute/step_test.go packer-1.0.0/builder/googlecompute/step_test.go
--- packer-1.0.0.orig/builder/googlecompute/step_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/step_test.go	2017-04-11 15:33:34.608674559 +0200
@@ -5,7 +5,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff -Nur packer-1.0.0.orig/builder/googlecompute/step_wait_startup_script.go packer-1.0.0/builder/googlecompute/step_wait_startup_script.go
--- packer-1.0.0.orig/builder/googlecompute/step_wait_startup_script.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/step_wait_startup_script.go	2017-04-11 15:33:34.608674559 +0200
@@ -5,8 +5,8 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepWaitStartupScript int
diff -Nur packer-1.0.0.orig/builder/googlecompute/winrm.go packer-1.0.0/builder/googlecompute/winrm.go
--- packer-1.0.0.orig/builder/googlecompute/winrm.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/googlecompute/winrm.go	2017-04-11 15:33:34.608674559 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 // winrmConfig returns the WinRM configuration.
diff -Nur packer-1.0.0.orig/builder/hyperv/common/artifact.go packer-1.0.0/builder/hyperv/common/artifact.go
--- packer-1.0.0.orig/builder/hyperv/common/artifact.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/artifact.go	2017-04-11 15:33:34.608674559 +0200
@@ -5,7 +5,7 @@
 	"os"
 	"path/filepath"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This is the common builder ID to all of these artifacts.
diff -Nur packer-1.0.0.orig/builder/hyperv/common/artifact_test.go packer-1.0.0/builder/hyperv/common/artifact_test.go
--- packer-1.0.0.orig/builder/hyperv/common/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/artifact_test.go	2017-04-11 15:33:34.608674559 +0200
@@ -6,7 +6,7 @@
 	"path/filepath"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifact_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/config_test.go packer-1.0.0/builder/hyperv/common/config_test.go
--- packer-1.0.0.orig/builder/hyperv/common/config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/config_test.go	2017-04-11 15:33:34.608674559 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func testConfigTemplate(t *testing.T) *interpolate.Context {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/driver_ps_4.go packer-1.0.0/builder/hyperv/common/driver_ps_4.go
--- packer-1.0.0.orig/builder/hyperv/common/driver_ps_4.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/driver_ps_4.go	2017-04-11 15:33:34.608674559 +0200
@@ -7,8 +7,8 @@
 	"strconv"
 	"strings"
 
-	"github.com/mitchellh/packer/common/powershell"
-	"github.com/mitchellh/packer/common/powershell/hyperv"
+	"github.com/hashicorp/packer/common/powershell"
+	"github.com/hashicorp/packer/common/powershell/hyperv"
 )
 
 type HypervPS4Driver struct {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/floppy_config.go packer-1.0.0/builder/hyperv/common/floppy_config.go
--- packer-1.0.0.orig/builder/hyperv/common/floppy_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/floppy_config.go	2017-04-11 15:33:34.608674559 +0200
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // FloppyConfig is configuration related to created floppy disks and attaching
diff -Nur packer-1.0.0.orig/builder/hyperv/common/output_config.go packer-1.0.0/builder/hyperv/common/output_config.go
--- packer-1.0.0.orig/builder/hyperv/common/output_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/output_config.go	2017-04-11 15:33:34.608674559 +0200
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type OutputConfig struct {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/output_config_test.go packer-1.0.0/builder/hyperv/common/output_config_test.go
--- packer-1.0.0.orig/builder/hyperv/common/output_config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/output_config_test.go	2017-04-11 15:33:34.608674559 +0200
@@ -5,7 +5,7 @@
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/common"
+	"github.com/hashicorp/packer/common"
 )
 
 func TestOutputConfigPrepare(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/run_config.go packer-1.0.0/builder/hyperv/common/run_config.go
--- packer-1.0.0.orig/builder/hyperv/common/run_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/run_config.go	2017-04-11 15:33:34.620674530 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 	"time"
 )
 
diff -Nur packer-1.0.0.orig/builder/hyperv/common/shutdown_config.go packer-1.0.0/builder/hyperv/common/shutdown_config.go
--- packer-1.0.0.orig/builder/hyperv/common/shutdown_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/shutdown_config.go	2017-04-11 15:33:34.620674530 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type ShutdownConfig struct {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/ssh.go packer-1.0.0/builder/hyperv/common/ssh.go
--- packer-1.0.0.orig/builder/hyperv/common/ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/ssh.go	2017-04-11 15:33:34.632674500 +0200
@@ -2,8 +2,8 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	"github.com/mitchellh/packer/communicator/ssh"
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/hyperv/common/ssh_config.go packer-1.0.0/builder/hyperv/common/ssh_config.go
--- packer-1.0.0.orig/builder/hyperv/common/ssh_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/ssh_config.go	2017-04-11 15:33:34.620674530 +0200
@@ -1,8 +1,8 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type SSHConfig struct {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_configure_ip.go packer-1.0.0/builder/hyperv/common/step_configure_ip.go
--- packer-1.0.0.orig/builder/hyperv/common/step_configure_ip.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_configure_ip.go	2017-04-11 15:33:34.632674500 +0200
@@ -7,7 +7,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepConfigureIp struct {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_configure_vlan.go packer-1.0.0/builder/hyperv/common/step_configure_vlan.go
--- packer-1.0.0.orig/builder/hyperv/common/step_configure_vlan.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_configure_vlan.go	2017-04-11 15:33:34.632674500 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepConfigureVlan struct {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_create_external_switch.go packer-1.0.0/builder/hyperv/common/step_create_external_switch.go
--- packer-1.0.0.orig/builder/hyperv/common/step_create_external_switch.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_create_external_switch.go	2017-04-11 15:33:34.632674500 +0200
@@ -4,8 +4,8 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step creates switch for VM.
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_create_switch.go packer-1.0.0/builder/hyperv/common/step_create_switch.go
--- packer-1.0.0.orig/builder/hyperv/common/step_create_switch.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_create_switch.go	2017-04-11 15:33:34.632674500 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 const (
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_create_tempdir.go packer-1.0.0/builder/hyperv/common/step_create_tempdir.go
--- packer-1.0.0.orig/builder/hyperv/common/step_create_tempdir.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_create_tempdir.go	2017-04-11 15:33:34.632674500 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 )
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_create_vm.go packer-1.0.0/builder/hyperv/common/step_create_vm.go
--- packer-1.0.0.orig/builder/hyperv/common/step_create_vm.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_create_vm.go	2017-04-11 15:33:34.632674500 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step creates the actual virtual machine.
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_disable_vlan.go packer-1.0.0/builder/hyperv/common/step_disable_vlan.go
--- packer-1.0.0.orig/builder/hyperv/common/step_disable_vlan.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_disable_vlan.go	2017-04-11 15:33:34.632674500 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepDisableVlan struct {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_enable_integration_service.go packer-1.0.0/builder/hyperv/common/step_enable_integration_service.go
--- packer-1.0.0.orig/builder/hyperv/common/step_enable_integration_service.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_enable_integration_service.go	2017-04-11 15:33:34.632674500 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepEnableIntegrationService struct {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_export_vm.go packer-1.0.0/builder/hyperv/common/step_export_vm.go
--- packer-1.0.0.orig/builder/hyperv/common/step_export_vm.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_export_vm.go	2017-04-11 15:33:34.632674500 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"path/filepath"
 )
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_mount_dvddrive.go packer-1.0.0/builder/hyperv/common/step_mount_dvddrive.go
--- packer-1.0.0.orig/builder/hyperv/common/step_mount_dvddrive.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_mount_dvddrive.go	2017-04-11 15:33:34.632674500 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_mount_floppydrive.go packer-1.0.0/builder/hyperv/common/step_mount_floppydrive.go
--- packer-1.0.0.orig/builder/hyperv/common/step_mount_floppydrive.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_mount_floppydrive.go	2017-04-11 15:33:34.632674500 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io"
 	"io/ioutil"
 	"log"
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_mount_guest_additions.go packer-1.0.0/builder/hyperv/common/step_mount_guest_additions.go
--- packer-1.0.0.orig/builder/hyperv/common/step_mount_guest_additions.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_mount_guest_additions.go	2017-04-11 15:33:34.632674500 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_mount_secondary_dvd_images.go packer-1.0.0/builder/hyperv/common/step_mount_secondary_dvd_images.go
--- packer-1.0.0.orig/builder/hyperv/common/step_mount_secondary_dvd_images.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_mount_secondary_dvd_images.go	2017-04-11 15:33:34.632674500 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_output_dir.go packer-1.0.0/builder/hyperv/common/step_output_dir.go
--- packer-1.0.0.orig/builder/hyperv/common/step_output_dir.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_output_dir.go	2017-04-11 15:33:34.632674500 +0200
@@ -8,7 +8,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepOutputDir sets up the output directory by creating it if it does
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_polling_installation.go packer-1.0.0/builder/hyperv/common/step_polling_installation.go
--- packer-1.0.0.orig/builder/hyperv/common/step_polling_installation.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_polling_installation.go	2017-04-11 15:33:34.632674500 +0200
@@ -9,7 +9,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 const port string = "13000"
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_reboot_vm.go packer-1.0.0/builder/hyperv/common/step_reboot_vm.go
--- packer-1.0.0.orig/builder/hyperv/common/step_reboot_vm.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_reboot_vm.go	2017-04-11 15:33:34.632674500 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"time"
 )
 
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_run.go packer-1.0.0/builder/hyperv/common/step_run.go
--- packer-1.0.0.orig/builder/hyperv/common/step_run.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_run.go	2017-04-11 15:33:34.636674490 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"time"
 )
 
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_shutdown.go packer-1.0.0/builder/hyperv/common/step_shutdown.go
--- packer-1.0.0.orig/builder/hyperv/common/step_shutdown.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_shutdown.go	2017-04-11 15:33:34.636674490 +0200
@@ -8,7 +8,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step shuts down the machine. It first attempts to do so gracefully,
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_sleep.go packer-1.0.0/builder/hyperv/common/step_sleep.go
--- packer-1.0.0.orig/builder/hyperv/common/step_sleep.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_sleep.go	2017-04-11 15:33:34.640674481 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"time"
 )
 
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_type_boot_command.go packer-1.0.0/builder/hyperv/common/step_type_boot_command.go
--- packer-1.0.0.orig/builder/hyperv/common/step_type_boot_command.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_type_boot_command.go	2017-04-11 15:33:34.660674431 +0200
@@ -8,9 +8,9 @@
 	"unicode/utf8"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type bootCommandTemplateData struct {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_unmount_dvddrive.go packer-1.0.0/builder/hyperv/common/step_unmount_dvddrive.go
--- packer-1.0.0.orig/builder/hyperv/common/step_unmount_dvddrive.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_unmount_dvddrive.go	2017-04-11 15:33:34.660674431 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepUnmountDvdDrive struct {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_unmount_floppydrive.go packer-1.0.0/builder/hyperv/common/step_unmount_floppydrive.go
--- packer-1.0.0.orig/builder/hyperv/common/step_unmount_floppydrive.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_unmount_floppydrive.go	2017-04-11 15:33:34.660674431 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepUnmountFloppyDrive struct {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_unmount_guest_additions.go packer-1.0.0/builder/hyperv/common/step_unmount_guest_additions.go
--- packer-1.0.0.orig/builder/hyperv/common/step_unmount_guest_additions.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_unmount_guest_additions.go	2017-04-11 15:33:34.660674431 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepUnmountGuestAdditions struct {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_unmount_secondary_dvd_images.go packer-1.0.0/builder/hyperv/common/step_unmount_secondary_dvd_images.go
--- packer-1.0.0.orig/builder/hyperv/common/step_unmount_secondary_dvd_images.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_unmount_secondary_dvd_images.go	2017-04-11 15:33:34.660674431 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepUnmountSecondaryDvdImages struct {
diff -Nur packer-1.0.0.orig/builder/hyperv/common/step_wait_for_install_to_complete.go packer-1.0.0/builder/hyperv/common/step_wait_for_install_to_complete.go
--- packer-1.0.0.orig/builder/hyperv/common/step_wait_for_install_to_complete.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/common/step_wait_for_install_to_complete.go	2017-04-11 15:33:34.660674431 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"time"
 )
 
diff -Nur packer-1.0.0.orig/builder/hyperv/iso/builder.go packer-1.0.0/builder/hyperv/iso/builder.go
--- packer-1.0.0.orig/builder/hyperv/iso/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/iso/builder.go	2017-04-11 15:30:20.989153514 +0200
@@ -8,14 +8,14 @@
 	"strings"
 
 	"github.com/mitchellh/multistep"
-	hypervcommon "github.com/mitchellh/packer/builder/hyperv/common"
-	"github.com/mitchellh/packer/common"
-	powershell "github.com/mitchellh/packer/common/powershell"
-	"github.com/mitchellh/packer/common/powershell/hyperv"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	hypervcommon "github.com/hashicorp/packer/builder/hyperv/common"
+	"github.com/hashicorp/packer/common"
+	powershell "github.com/hashicorp/packer/common/powershell"
+	"github.com/hashicorp/packer/common/powershell/hyperv"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const (
diff -Nur packer-1.0.0.orig/builder/hyperv/iso/builder_test.go packer-1.0.0/builder/hyperv/iso/builder_test.go
--- packer-1.0.0.orig/builder/hyperv/iso/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/hyperv/iso/builder_test.go	2017-04-11 15:33:34.660674431 +0200
@@ -4,7 +4,7 @@
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/builder/null/artifact_export_test.go packer-1.0.0/builder/null/artifact_export_test.go
--- packer-1.0.0.orig/builder/null/artifact_export_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/null/artifact_export_test.go	2017-04-11 15:33:34.660674431 +0200
@@ -1,7 +1,7 @@
 package null
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/null/builder.go packer-1.0.0/builder/null/builder.go
--- packer-1.0.0.orig/builder/null/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/null/builder.go	2017-04-11 15:33:34.660674431 +0200
@@ -4,9 +4,9 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 )
 
 const BuilderId = "fnoeding.null"
diff -Nur packer-1.0.0.orig/builder/null/builder_test.go packer-1.0.0/builder/null/builder_test.go
--- packer-1.0.0.orig/builder/null/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/null/builder_test.go	2017-04-11 15:33:34.660674431 +0200
@@ -1,7 +1,7 @@
 package null
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/null/config.go packer-1.0.0/builder/null/config.go
--- packer-1.0.0.orig/builder/null/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/null/config.go	2017-04-11 15:33:34.660674431 +0200
@@ -3,11 +3,11 @@
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/builder/null/config_test.go packer-1.0.0/builder/null/config_test.go
--- packer-1.0.0.orig/builder/null/config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/null/config_test.go	2017-04-11 15:33:34.660674431 +0200
@@ -4,7 +4,7 @@
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/builder/null/ssh.go packer-1.0.0/builder/null/ssh.go
--- packer-1.0.0.orig/builder/null/ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/null/ssh.go	2017-04-11 15:33:34.660674431 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/communicator/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 	"io/ioutil"
 )
diff -Nur packer-1.0.0.orig/builder/oneandone/builder.go packer-1.0.0/builder/oneandone/builder.go
--- packer-1.0.0.orig/builder/oneandone/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/oneandone/builder.go	2017-04-11 15:33:34.664674422 +0200
@@ -4,9 +4,9 @@
 	"errors"
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/oneandone/builder_acc_test.go packer-1.0.0/builder/oneandone/builder_acc_test.go
--- packer-1.0.0.orig/builder/oneandone/builder_acc_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/oneandone/builder_acc_test.go	2017-04-11 15:33:34.660674431 +0200
@@ -4,7 +4,7 @@
 	"os"
 	"testing"
 
-	builderT "github.com/mitchellh/packer/helper/builder/testing"
+	builderT "github.com/hashicorp/packer/helper/builder/testing"
 )
 
 func TestBuilderAcc_basic(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/oneandone/builder_test.go packer-1.0.0/builder/oneandone/builder_test.go
--- packer-1.0.0.orig/builder/oneandone/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/oneandone/builder_test.go	2017-04-11 15:33:34.664674422 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/oneandone/config.go packer-1.0.0/builder/oneandone/config.go
--- packer-1.0.0.orig/builder/oneandone/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/oneandone/config.go	2017-04-11 15:33:34.664674422 +0200
@@ -4,11 +4,11 @@
 	"errors"
 	"github.com/1and1/oneandone-cloudserver-sdk-go"
 	"github.com/mitchellh/mapstructure"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/template/interpolate"
 	"os"
 	"strings"
 )
diff -Nur packer-1.0.0.orig/builder/oneandone/ssh.go packer-1.0.0/builder/oneandone/ssh.go
--- packer-1.0.0.orig/builder/oneandone/ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/oneandone/ssh.go	2017-04-11 15:33:34.672674402 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/communicator/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/oneandone/step_create_server.go packer-1.0.0/builder/oneandone/step_create_server.go
--- packer-1.0.0.orig/builder/oneandone/step_create_server.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/oneandone/step_create_server.go	2017-04-11 15:33:34.672674402 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 	"github.com/1and1/oneandone-cloudserver-sdk-go"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"strings"
 	"time"
 )
diff -Nur packer-1.0.0.orig/builder/oneandone/step_create_sshkey.go packer-1.0.0/builder/oneandone/step_create_sshkey.go
--- packer-1.0.0.orig/builder/oneandone/step_create_sshkey.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/oneandone/step_create_sshkey.go	2017-04-11 15:33:34.680674383 +0200
@@ -5,7 +5,7 @@
 	"encoding/pem"
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"golang.org/x/crypto/ssh"
 	"io/ioutil"
 )
diff -Nur packer-1.0.0.orig/builder/oneandone/step_take_snapshot.go packer-1.0.0/builder/oneandone/step_take_snapshot.go
--- packer-1.0.0.orig/builder/oneandone/step_take_snapshot.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/oneandone/step_take_snapshot.go	2017-04-11 15:33:34.684674373 +0200
@@ -3,7 +3,7 @@
 import (
 	"github.com/1and1/oneandone-cloudserver-sdk-go"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepTakeSnapshot struct{}
diff -Nur packer-1.0.0.orig/builder/openstack/access_config.go packer-1.0.0/builder/openstack/access_config.go
--- packer-1.0.0.orig/builder/openstack/access_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/access_config.go	2017-04-11 15:33:34.684674373 +0200
@@ -8,7 +8,7 @@
 
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // AccessConfig is for common configuration related to openstack access
diff -Nur packer-1.0.0.orig/builder/openstack/artifact_test.go packer-1.0.0/builder/openstack/artifact_test.go
--- packer-1.0.0.orig/builder/openstack/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/artifact_test.go	2017-04-11 15:33:34.684674373 +0200
@@ -1,7 +1,7 @@
 package openstack
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/openstack/builder.go packer-1.0.0/builder/openstack/builder.go
--- packer-1.0.0.orig/builder/openstack/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/builder.go	2017-04-11 15:33:34.684674373 +0200
@@ -8,11 +8,11 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/template/interpolate"
 )
 
 // The unique ID for this builder
diff -Nur packer-1.0.0.orig/builder/openstack/builder_test.go packer-1.0.0/builder/openstack/builder_test.go
--- packer-1.0.0.orig/builder/openstack/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/builder_test.go	2017-04-11 15:33:34.684674373 +0200
@@ -1,7 +1,7 @@
 package openstack
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/openstack/image_config.go packer-1.0.0/builder/openstack/image_config.go
--- packer-1.0.0.orig/builder/openstack/image_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/image_config.go	2017-04-11 15:33:34.684674373 +0200
@@ -5,7 +5,7 @@
 	"strings"
 
 	imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // ImageConfig is for common configuration related to creating Images.
@@ -26,7 +26,7 @@
 	// "snapshot", since it came from snapshotting a VM. A "snapshot" looks
 	// slightly different in the OpenStack UI and OpenStack won't show "snapshot"
 	// images as a choice in the list of images to boot from for a new instance.
-	// See https://github.com/mitchellh/packer/issues/3038
+	// See https://github.com/hashicorp/packer/issues/3038
 	if c.ImageMetadata == nil {
 		c.ImageMetadata = map[string]string{"image_type": "image"}
 	} else if c.ImageMetadata["image_type"] == "" {
diff -Nur packer-1.0.0.orig/builder/openstack/run_config.go packer-1.0.0/builder/openstack/run_config.go
--- packer-1.0.0.orig/builder/openstack/run_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/run_config.go	2017-04-11 15:33:34.688674363 +0200
@@ -4,8 +4,8 @@
 	"errors"
 	"fmt"
 
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // RunConfig contains configuration for running an instance from a source
diff -Nur packer-1.0.0.orig/builder/openstack/run_config_test.go packer-1.0.0/builder/openstack/run_config_test.go
--- packer-1.0.0.orig/builder/openstack/run_config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/run_config_test.go	2017-04-11 15:33:34.684674373 +0200
@@ -4,7 +4,7 @@
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func init() {
diff -Nur packer-1.0.0.orig/builder/openstack/ssh.go packer-1.0.0/builder/openstack/ssh.go
--- packer-1.0.0.orig/builder/openstack/ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/ssh.go	2017-04-11 15:33:34.688674363 +0200
@@ -10,7 +10,7 @@
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
-	packerssh "github.com/mitchellh/packer/communicator/ssh"
+	packerssh "github.com/hashicorp/packer/communicator/ssh"
 	"golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/openstack/step_add_image_members.go packer-1.0.0/builder/openstack/step_add_image_members.go
--- packer-1.0.0.orig/builder/openstack/step_add_image_members.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/step_add_image_members.go	2017-04-11 15:33:34.688674363 +0200
@@ -5,7 +5,7 @@
 
 	"github.com/gophercloud/gophercloud/openstack/imageservice/v2/members"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepAddImageMembers struct{}
diff -Nur packer-1.0.0.orig/builder/openstack/step_allocate_ip.go packer-1.0.0/builder/openstack/step_allocate_ip.go
--- packer-1.0.0.orig/builder/openstack/step_allocate_ip.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/step_allocate_ip.go	2017-04-11 15:33:34.688674363 +0200
@@ -7,7 +7,7 @@
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/gophercloud/gophercloud/pagination"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepAllocateIp struct {
diff -Nur packer-1.0.0.orig/builder/openstack/step_create_image.go packer-1.0.0/builder/openstack/step_create_image.go
--- packer-1.0.0.orig/builder/openstack/step_create_image.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/step_create_image.go	2017-04-11 15:33:34.688674363 +0200
@@ -9,7 +9,7 @@
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/images"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepCreateImage struct{}
diff -Nur packer-1.0.0.orig/builder/openstack/step_get_password.go packer-1.0.0/builder/openstack/step_get_password.go
--- packer-1.0.0.orig/builder/openstack/step_get_password.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/step_get_password.go	2017-04-11 15:33:34.688674363 +0200
@@ -8,8 +8,8 @@
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/openstack/step_key_pair.go packer-1.0.0/builder/openstack/step_key_pair.go
--- packer-1.0.0.orig/builder/openstack/step_key_pair.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/step_key_pair.go	2017-04-11 15:33:34.688674363 +0200
@@ -10,8 +10,8 @@
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
@@ -110,7 +110,7 @@
 	return multistep.ActionContinue
 }
 
-// Work around for https://github.com/mitchellh/packer/issues/2526
+// Work around for https://github.com/hashicorp/packer/issues/2526
 func berToDer(ber string, ui packer.Ui) string {
 	// Check if x/crypto/ssh can parse the key
 	_, err := ssh.ParsePrivateKey([]byte(ber))
diff -Nur packer-1.0.0.orig/builder/openstack/step_key_pair_test.go packer-1.0.0/builder/openstack/step_key_pair_test.go
--- packer-1.0.0.orig/builder/openstack/step_key_pair_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/step_key_pair_test.go	2017-04-11 15:33:34.688674363 +0200
@@ -5,7 +5,7 @@
 	"os/exec"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/openstack/step_load_extensions.go packer-1.0.0/builder/openstack/step_load_extensions.go
--- packer-1.0.0.orig/builder/openstack/step_load_extensions.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/step_load_extensions.go	2017-04-11 15:33:34.688674363 +0200
@@ -7,7 +7,7 @@
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions"
 	"github.com/gophercloud/gophercloud/pagination"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepLoadExtensions gets the FlavorRef from a Flavor. It first assumes
diff -Nur packer-1.0.0.orig/builder/openstack/step_load_flavor.go packer-1.0.0/builder/openstack/step_load_flavor.go
--- packer-1.0.0.orig/builder/openstack/step_load_flavor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/step_load_flavor.go	2017-04-11 15:33:34.688674363 +0200
@@ -6,7 +6,7 @@
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepLoadFlavor gets the FlavorRef from a Flavor. It first assumes
diff -Nur packer-1.0.0.orig/builder/openstack/step_run_source_server.go packer-1.0.0/builder/openstack/step_run_source_server.go
--- packer-1.0.0.orig/builder/openstack/step_run_source_server.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/step_run_source_server.go	2017-04-11 15:33:34.700674334 +0200
@@ -8,7 +8,7 @@
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepRunSourceServer struct {
diff -Nur packer-1.0.0.orig/builder/openstack/step_stop_server.go packer-1.0.0/builder/openstack/step_stop_server.go
--- packer-1.0.0.orig/builder/openstack/step_stop_server.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/step_stop_server.go	2017-04-11 15:33:34.700674334 +0200
@@ -6,7 +6,7 @@
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/startstop"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepStopServer struct{}
diff -Nur packer-1.0.0.orig/builder/openstack/step_update_image_visibility.go packer-1.0.0/builder/openstack/step_update_image_visibility.go
--- packer-1.0.0.orig/builder/openstack/step_update_image_visibility.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/step_update_image_visibility.go	2017-04-11 15:33:34.700674334 +0200
@@ -5,7 +5,7 @@
 
 	imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepUpdateImageVisibility struct{}
diff -Nur packer-1.0.0.orig/builder/openstack/step_wait_for_rackconnect.go packer-1.0.0/builder/openstack/step_wait_for_rackconnect.go
--- packer-1.0.0.orig/builder/openstack/step_wait_for_rackconnect.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/openstack/step_wait_for_rackconnect.go	2017-04-11 15:33:34.704674324 +0200
@@ -6,7 +6,7 @@
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepWaitForRackConnect struct {
diff -Nur packer-1.0.0.orig/builder/parallels/common/artifact.go packer-1.0.0/builder/parallels/common/artifact.go
--- packer-1.0.0.orig/builder/parallels/common/artifact.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/artifact.go	2017-04-11 15:33:34.704674324 +0200
@@ -6,7 +6,7 @@
 	"path/filepath"
 	"regexp"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // BuilderId is the common builder ID to all of these artifacts.
diff -Nur packer-1.0.0.orig/builder/parallels/common/artifact_test.go packer-1.0.0/builder/parallels/common/artifact_test.go
--- packer-1.0.0.orig/builder/parallels/common/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/artifact_test.go	2017-04-11 15:33:34.704674324 +0200
@@ -6,7 +6,7 @@
 	"path/filepath"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifact_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/parallels/common/config_test.go packer-1.0.0/builder/parallels/common/config_test.go
--- packer-1.0.0.orig/builder/parallels/common/config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/config_test.go	2017-04-11 15:33:34.704674324 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func testConfigTemplate(t *testing.T) *interpolate.Context {
diff -Nur packer-1.0.0.orig/builder/parallels/common/output_config.go packer-1.0.0/builder/parallels/common/output_config.go
--- packer-1.0.0.orig/builder/parallels/common/output_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/output_config.go	2017-04-11 15:33:34.704674324 +0200
@@ -5,8 +5,8 @@
 	"os"
 	"path"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // OutputConfig contains the configuration for builder's output.
diff -Nur packer-1.0.0.orig/builder/parallels/common/output_config_test.go packer-1.0.0/builder/parallels/common/output_config_test.go
--- packer-1.0.0.orig/builder/parallels/common/output_config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/output_config_test.go	2017-04-11 15:33:34.704674324 +0200
@@ -5,7 +5,7 @@
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/common"
+	"github.com/hashicorp/packer/common"
 )
 
 func TestOutputConfigPrepare(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/parallels/common/prlctl_config.go packer-1.0.0/builder/parallels/common/prlctl_config.go
--- packer-1.0.0.orig/builder/parallels/common/prlctl_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/prlctl_config.go	2017-04-11 15:33:34.704674324 +0200
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // PrlctlConfig contains the configuration for running "prlctl" commands
diff -Nur packer-1.0.0.orig/builder/parallels/common/prlctl_post_config.go packer-1.0.0/builder/parallels/common/prlctl_post_config.go
--- packer-1.0.0.orig/builder/parallels/common/prlctl_post_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/prlctl_post_config.go	2017-04-11 15:33:34.704674324 +0200
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // PrlctlPostConfig contains the configuration for running "prlctl" commands
diff -Nur packer-1.0.0.orig/builder/parallels/common/prlctl_version_config.go packer-1.0.0/builder/parallels/common/prlctl_version_config.go
--- packer-1.0.0.orig/builder/parallels/common/prlctl_version_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/prlctl_version_config.go	2017-04-11 15:33:34.704674324 +0200
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // PrlctlVersionConfig contains the configuration for `prlctl` version.
diff -Nur packer-1.0.0.orig/builder/parallels/common/run_config.go packer-1.0.0/builder/parallels/common/run_config.go
--- packer-1.0.0.orig/builder/parallels/common/run_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/run_config.go	2017-04-11 15:33:34.704674324 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // RunConfig contains the configuration for VM run.
diff -Nur packer-1.0.0.orig/builder/parallels/common/shutdown_config.go packer-1.0.0/builder/parallels/common/shutdown_config.go
--- packer-1.0.0.orig/builder/parallels/common/shutdown_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/shutdown_config.go	2017-04-11 15:33:34.704674324 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // ShutdownConfig contains the configuration for VM shutdown.
diff -Nur packer-1.0.0.orig/builder/parallels/common/ssh.go packer-1.0.0/builder/parallels/common/ssh.go
--- packer-1.0.0.orig/builder/parallels/common/ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/ssh.go	2017-04-11 15:33:34.704674324 +0200
@@ -2,8 +2,8 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	packerssh "github.com/mitchellh/packer/communicator/ssh"
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	packerssh "github.com/hashicorp/packer/communicator/ssh"
 	"golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/parallels/common/ssh_config.go packer-1.0.0/builder/parallels/common/ssh_config.go
--- packer-1.0.0.orig/builder/parallels/common/ssh_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/ssh_config.go	2017-04-11 15:33:34.704674324 +0200
@@ -3,8 +3,8 @@
 import (
 	"time"
 
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // SSHConfig contains the configuration for SSH communicator.
diff -Nur packer-1.0.0.orig/builder/parallels/common/ssh_config_test.go packer-1.0.0/builder/parallels/common/ssh_config_test.go
--- packer-1.0.0.orig/builder/parallels/common/ssh_config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/ssh_config_test.go	2017-04-11 15:33:34.704674324 +0200
@@ -5,7 +5,7 @@
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func testSSHConfig() *SSHConfig {
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_attach_floppy.go packer-1.0.0/builder/parallels/common/step_attach_floppy.go
--- packer-1.0.0.orig/builder/parallels/common/step_attach_floppy.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_attach_floppy.go	2017-04-11 15:33:34.704674324 +0200
@@ -5,7 +5,7 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepAttachFloppy is a step that attaches a floppy to the virtual machine.
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_attach_parallels_tools.go packer-1.0.0/builder/parallels/common/step_attach_parallels_tools.go
--- packer-1.0.0.orig/builder/parallels/common/step_attach_parallels_tools.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_attach_parallels_tools.go	2017-04-11 15:33:34.704674324 +0200
@@ -5,7 +5,7 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepAttachParallelsTools is a step that attaches Parallels Tools ISO image
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_compact_disk.go packer-1.0.0/builder/parallels/common/step_compact_disk.go
--- packer-1.0.0.orig/builder/parallels/common/step_compact_disk.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_compact_disk.go	2017-04-11 15:33:34.704674324 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepCompactDisk is a step that removes all empty blocks from expanding
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_output_dir.go packer-1.0.0/builder/parallels/common/step_output_dir.go
--- packer-1.0.0.orig/builder/parallels/common/step_output_dir.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_output_dir.go	2017-04-11 15:33:34.708674314 +0200
@@ -8,7 +8,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepOutputDir sets up the output directory by creating it if it does
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_prlctl.go packer-1.0.0/builder/parallels/common/step_prlctl.go
--- packer-1.0.0.orig/builder/parallels/common/step_prlctl.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_prlctl.go	2017-04-11 15:33:34.708674314 +0200
@@ -5,8 +5,8 @@
 	"strings"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type commandTemplate struct {
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_run.go packer-1.0.0/builder/parallels/common/step_run.go
--- packer-1.0.0.orig/builder/parallels/common/step_run.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_run.go	2017-04-11 15:33:34.712674305 +0200
@@ -5,7 +5,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepRun is a step that starts the virtual machine.
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_shutdown.go packer-1.0.0/builder/parallels/common/step_shutdown.go
--- packer-1.0.0.orig/builder/parallels/common/step_shutdown.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_shutdown.go	2017-04-11 15:33:34.720674285 +0200
@@ -8,7 +8,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepShutdown is a step that shuts down the machine. It first attempts to do
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_shutdown_test.go packer-1.0.0/builder/parallels/common/step_shutdown_test.go
--- packer-1.0.0.orig/builder/parallels/common/step_shutdown_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_shutdown_test.go	2017-04-11 15:33:34.720674285 +0200
@@ -5,7 +5,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestStepShutdown_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_test.go packer-1.0.0/builder/parallels/common/step_test.go
--- packer-1.0.0.orig/builder/parallels/common/step_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_test.go	2017-04-11 15:33:34.720674285 +0200
@@ -5,7 +5,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_type_boot_command.go packer-1.0.0/builder/parallels/common/step_type_boot_command.go
--- packer-1.0.0.orig/builder/parallels/common/step_type_boot_command.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_type_boot_command.go	2017-04-11 15:33:34.728674266 +0200
@@ -9,9 +9,9 @@
 	"unicode/utf8"
 
 	"github.com/mitchellh/multistep"
-	packer_common "github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	packer_common "github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type bootCommandTemplateData struct {
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_type_boot_command_test.go packer-1.0.0/builder/parallels/common/step_type_boot_command_test.go
--- packer-1.0.0.orig/builder/parallels/common/step_type_boot_command_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_type_boot_command_test.go	2017-04-11 15:33:34.720674285 +0200
@@ -5,7 +5,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestStepTypeBootCommand(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_upload_parallels_tools.go packer-1.0.0/builder/parallels/common/step_upload_parallels_tools.go
--- packer-1.0.0.orig/builder/parallels/common/step_upload_parallels_tools.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_upload_parallels_tools.go	2017-04-11 15:33:34.724674276 +0200
@@ -6,8 +6,8 @@
 	"os"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // This step uploads the Parallels Tools ISO to the virtual machine.
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_upload_parallels_tools_test.go packer-1.0.0/builder/parallels/common/step_upload_parallels_tools_test.go
--- packer-1.0.0.orig/builder/parallels/common/step_upload_parallels_tools_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_upload_parallels_tools_test.go	2017-04-11 15:33:34.720674285 +0200
@@ -4,7 +4,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestStepUploadParallelsTools_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_upload_version.go packer-1.0.0/builder/parallels/common/step_upload_version.go
--- packer-1.0.0.orig/builder/parallels/common/step_upload_version.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_upload_version.go	2017-04-11 15:33:34.724674276 +0200
@@ -6,7 +6,7 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepUploadVersion is a step that uploads a file containing the version of
diff -Nur packer-1.0.0.orig/builder/parallels/common/step_upload_version_test.go packer-1.0.0/builder/parallels/common/step_upload_version_test.go
--- packer-1.0.0.orig/builder/parallels/common/step_upload_version_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/step_upload_version_test.go	2017-04-11 15:33:34.724674276 +0200
@@ -4,7 +4,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestStepUploadVersion_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/parallels/common/tools_config.go packer-1.0.0/builder/parallels/common/tools_config.go
--- packer-1.0.0.orig/builder/parallels/common/tools_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/common/tools_config.go	2017-04-11 15:33:34.724674276 +0200
@@ -4,7 +4,7 @@
 	"errors"
 	"fmt"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // These are the different valid mode values for "parallels_tools_mode" which
diff -Nur packer-1.0.0.orig/builder/parallels/iso/builder.go packer-1.0.0/builder/parallels/iso/builder.go
--- packer-1.0.0.orig/builder/parallels/iso/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/iso/builder.go	2017-04-11 15:29:01.693353266 +0200
@@ -6,12 +6,12 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"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/template/interpolate"
 )
 
 const BuilderId = "rickard-von-essen.parallels"
diff -Nur packer-1.0.0.orig/builder/parallels/iso/builder_test.go packer-1.0.0/builder/parallels/iso/builder_test.go
--- packer-1.0.0.orig/builder/parallels/iso/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/iso/builder_test.go	2017-04-11 15:33:34.724674276 +0200
@@ -5,7 +5,7 @@
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/builder/parallels/iso/step_attach_iso.go packer-1.0.0/builder/parallels/iso/step_attach_iso.go
--- packer-1.0.0.orig/builder/parallels/iso/step_attach_iso.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/iso/step_attach_iso.go	2017-04-11 15:33:34.724674276 +0200
@@ -5,8 +5,8 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/packer"
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step attaches the ISO to the virtual machine.
diff -Nur packer-1.0.0.orig/builder/parallels/iso/step_create_disk.go packer-1.0.0/builder/parallels/iso/step_create_disk.go
--- packer-1.0.0.orig/builder/parallels/iso/step_create_disk.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/iso/step_create_disk.go	2017-04-11 15:33:34.724674276 +0200
@@ -5,8 +5,8 @@
 	"strconv"
 
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/packer"
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step creates the virtual disk that will be used as the
diff -Nur packer-1.0.0.orig/builder/parallels/iso/step_create_vm.go packer-1.0.0/builder/parallels/iso/step_create_vm.go
--- packer-1.0.0.orig/builder/parallels/iso/step_create_vm.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/iso/step_create_vm.go	2017-04-11 15:33:34.724674276 +0200
@@ -4,8 +4,8 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/packer"
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step creates the actual virtual machine.
diff -Nur packer-1.0.0.orig/builder/parallels/iso/step_set_boot_order.go packer-1.0.0/builder/parallels/iso/step_set_boot_order.go
--- packer-1.0.0.orig/builder/parallels/iso/step_set_boot_order.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/iso/step_set_boot_order.go	2017-04-11 15:33:34.724674276 +0200
@@ -4,8 +4,8 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/packer"
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step sets the device boot order for the virtual machine.
diff -Nur packer-1.0.0.orig/builder/parallels/pvm/builder.go packer-1.0.0/builder/parallels/pvm/builder.go
--- packer-1.0.0.orig/builder/parallels/pvm/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/pvm/builder.go	2017-04-11 15:33:34.724674276 +0200
@@ -6,10 +6,10 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 )
 
 // Builder implements packer.Builder and builds the actual Parallels
diff -Nur packer-1.0.0.orig/builder/parallels/pvm/config.go packer-1.0.0/builder/parallels/pvm/config.go
--- packer-1.0.0.orig/builder/parallels/pvm/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/pvm/config.go	2017-04-11 15:33:34.732674255 +0200
@@ -4,11 +4,11 @@
 	"fmt"
 	"os"
 
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // Config is the configuration structure for the builder.
diff -Nur packer-1.0.0.orig/builder/parallels/pvm/config_test.go packer-1.0.0/builder/parallels/pvm/config_test.go
--- packer-1.0.0.orig/builder/parallels/pvm/config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/pvm/config_test.go	2017-04-11 15:33:34.724674276 +0200
@@ -6,7 +6,7 @@
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig(t *testing.T) map[string]interface{} {
diff -Nur packer-1.0.0.orig/builder/parallels/pvm/step_import.go packer-1.0.0/builder/parallels/pvm/step_import.go
--- packer-1.0.0.orig/builder/parallels/pvm/step_import.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/pvm/step_import.go	2017-04-11 15:33:34.732674255 +0200
@@ -4,8 +4,8 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/packer"
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step imports an PVM VM into Parallels.
diff -Nur packer-1.0.0.orig/builder/parallels/pvm/step_test.go packer-1.0.0/builder/parallels/pvm/step_test.go
--- packer-1.0.0.orig/builder/parallels/pvm/step_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/parallels/pvm/step_test.go	2017-04-11 15:33:34.736674246 +0200
@@ -5,8 +5,8 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/packer"
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff -Nur packer-1.0.0.orig/builder/profitbricks/artifact_test.go packer-1.0.0/builder/profitbricks/artifact_test.go
--- packer-1.0.0.orig/builder/profitbricks/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/profitbricks/artifact_test.go	2017-04-11 15:33:34.736674246 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifact_Impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/profitbricks/builder.go packer-1.0.0/builder/profitbricks/builder.go
--- packer-1.0.0.orig/builder/profitbricks/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/profitbricks/builder.go	2017-04-11 15:33:34.736674246 +0200
@@ -3,9 +3,9 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/profitbricks/builder_acc_test.go packer-1.0.0/builder/profitbricks/builder_acc_test.go
--- packer-1.0.0.orig/builder/profitbricks/builder_acc_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/profitbricks/builder_acc_test.go	2017-04-11 15:33:34.736674246 +0200
@@ -4,7 +4,7 @@
 	"os"
 	"testing"
 
-	builderT "github.com/mitchellh/packer/helper/builder/testing"
+	builderT "github.com/hashicorp/packer/helper/builder/testing"
 )
 
 func TestBuilderAcc_basic(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/profitbricks/builder_test.go packer-1.0.0/builder/profitbricks/builder_test.go
--- packer-1.0.0.orig/builder/profitbricks/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/profitbricks/builder_test.go	2017-04-11 15:33:34.736674246 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/profitbricks/config.go packer-1.0.0/builder/profitbricks/config.go
--- packer-1.0.0.orig/builder/profitbricks/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/profitbricks/config.go	2017-04-11 15:33:34.736674246 +0200
@@ -3,11 +3,11 @@
 import (
 	"errors"
 	"github.com/mitchellh/mapstructure"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/template/interpolate"
 	"os"
 )
 
diff -Nur packer-1.0.0.orig/builder/profitbricks/ssh.go packer-1.0.0/builder/profitbricks/ssh.go
--- packer-1.0.0.orig/builder/profitbricks/ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/profitbricks/ssh.go	2017-04-11 15:33:34.736674246 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/communicator/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/profitbricks/step_create_server.go packer-1.0.0/builder/profitbricks/step_create_server.go
--- packer-1.0.0.orig/builder/profitbricks/step_create_server.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/profitbricks/step_create_server.go	2017-04-11 15:33:34.736674246 +0200
@@ -9,7 +9,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/profitbricks/profitbricks-sdk-go"
 )
 
diff -Nur packer-1.0.0.orig/builder/profitbricks/step_create_ssh_key.go packer-1.0.0/builder/profitbricks/step_create_ssh_key.go
--- packer-1.0.0.orig/builder/profitbricks/step_create_ssh_key.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/profitbricks/step_create_ssh_key.go	2017-04-11 15:33:34.736674246 +0200
@@ -5,7 +5,7 @@
 	"encoding/pem"
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"golang.org/x/crypto/ssh"
 	"io/ioutil"
 )
diff -Nur packer-1.0.0.orig/builder/profitbricks/step_take_snapshot.go packer-1.0.0/builder/profitbricks/step_take_snapshot.go
--- packer-1.0.0.orig/builder/profitbricks/step_take_snapshot.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/profitbricks/step_take_snapshot.go	2017-04-11 15:33:34.736674246 +0200
@@ -5,7 +5,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/profitbricks/profitbricks-sdk-go"
 )
 
diff -Nur packer-1.0.0.orig/builder/qemu/builder.go packer-1.0.0/builder/qemu/builder.go
--- packer-1.0.0.orig/builder/qemu/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/builder.go	2017-04-11 15:33:34.756674197 +0200
@@ -11,11 +11,11 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/template/interpolate"
 )
 
 const BuilderId = "transcend.qemu"
diff -Nur packer-1.0.0.orig/builder/qemu/builder_test.go packer-1.0.0/builder/qemu/builder_test.go
--- packer-1.0.0.orig/builder/qemu/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/builder_test.go	2017-04-11 15:33:34.756674197 +0200
@@ -7,7 +7,7 @@
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 var testPem = `
diff -Nur packer-1.0.0.orig/builder/qemu/ssh.go packer-1.0.0/builder/qemu/ssh.go
--- packer-1.0.0.orig/builder/qemu/ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/ssh.go	2017-04-11 15:33:34.736674246 +0200
@@ -2,8 +2,8 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	"github.com/mitchellh/packer/communicator/ssh"
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/qemu/step_boot_wait.go packer-1.0.0/builder/qemu/step_boot_wait.go
--- packer-1.0.0.orig/builder/qemu/step_boot_wait.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/step_boot_wait.go	2017-04-11 15:33:34.736674246 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"time"
 )
 
diff -Nur packer-1.0.0.orig/builder/qemu/step_configure_vnc.go packer-1.0.0/builder/qemu/step_configure_vnc.go
--- packer-1.0.0.orig/builder/qemu/step_configure_vnc.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/step_configure_vnc.go	2017-04-11 15:33:34.736674246 +0200
@@ -7,7 +7,7 @@
 	"net"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step configures the VM to enable the VNC server.
diff -Nur packer-1.0.0.orig/builder/qemu/step_convert_disk.go packer-1.0.0/builder/qemu/step_convert_disk.go
--- packer-1.0.0.orig/builder/qemu/step_convert_disk.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/step_convert_disk.go	2017-04-11 15:33:34.736674246 +0200
@@ -5,7 +5,7 @@
 	"path/filepath"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 
 	"os"
 )
diff -Nur packer-1.0.0.orig/builder/qemu/step_copy_disk.go packer-1.0.0/builder/qemu/step_copy_disk.go
--- packer-1.0.0.orig/builder/qemu/step_copy_disk.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/step_copy_disk.go	2017-04-11 15:33:34.740674236 +0200
@@ -5,7 +5,7 @@
 	"path/filepath"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step copies the virtual disk that will be used as the
diff -Nur packer-1.0.0.orig/builder/qemu/step_create_disk.go packer-1.0.0/builder/qemu/step_create_disk.go
--- packer-1.0.0.orig/builder/qemu/step_create_disk.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/step_create_disk.go	2017-04-11 15:33:34.740674236 +0200
@@ -5,7 +5,7 @@
 	"path/filepath"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step creates the virtual disk that will be used as the
diff -Nur packer-1.0.0.orig/builder/qemu/step_forward_ssh.go packer-1.0.0/builder/qemu/step_forward_ssh.go
--- packer-1.0.0.orig/builder/qemu/step_forward_ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/step_forward_ssh.go	2017-04-11 15:33:34.760674188 +0200
@@ -7,7 +7,7 @@
 	"net"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step adds a NAT port forwarding definition so that SSH is available
diff -Nur packer-1.0.0.orig/builder/qemu/step_prepare_output_dir.go packer-1.0.0/builder/qemu/step_prepare_output_dir.go
--- packer-1.0.0.orig/builder/qemu/step_prepare_output_dir.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/step_prepare_output_dir.go	2017-04-11 15:33:34.760674188 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"os"
 	"time"
diff -Nur packer-1.0.0.orig/builder/qemu/step_resize_disk.go packer-1.0.0/builder/qemu/step_resize_disk.go
--- packer-1.0.0.orig/builder/qemu/step_resize_disk.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/step_resize_disk.go	2017-04-11 15:33:34.760674188 +0200
@@ -5,7 +5,7 @@
 	"path/filepath"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step resizes the virtual disk that will be used as the
diff -Nur packer-1.0.0.orig/builder/qemu/step_run.go packer-1.0.0/builder/qemu/step_run.go
--- packer-1.0.0.orig/builder/qemu/step_run.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/step_run.go	2017-04-11 15:33:34.768674168 +0200
@@ -8,8 +8,8 @@
 	"strings"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // stepRun runs the virtual machine
diff -Nur packer-1.0.0.orig/builder/qemu/step_set_iso.go packer-1.0.0/builder/qemu/step_set_iso.go
--- packer-1.0.0.orig/builder/qemu/step_set_iso.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/step_set_iso.go	2017-04-11 15:33:34.768674168 +0200
@@ -5,7 +5,7 @@
 	"net/http"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step set iso_patch to available url
diff -Nur packer-1.0.0.orig/builder/qemu/step_shutdown.go packer-1.0.0/builder/qemu/step_shutdown.go
--- packer-1.0.0.orig/builder/qemu/step_shutdown.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/step_shutdown.go	2017-04-11 15:33:34.768674168 +0200
@@ -7,7 +7,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step shuts down the machine. It first attempts to do so gracefully,
diff -Nur packer-1.0.0.orig/builder/qemu/step_type_boot_command.go packer-1.0.0/builder/qemu/step_type_boot_command.go
--- packer-1.0.0.orig/builder/qemu/step_type_boot_command.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/qemu/step_type_boot_command.go	2017-04-11 15:33:34.768674168 +0200
@@ -12,9 +12,9 @@
 
 	"github.com/mitchellh/go-vnc"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"os"
 )
 
diff -Nur packer-1.0.0.orig/builder/triton/access_config.go packer-1.0.0/builder/triton/access_config.go
--- packer-1.0.0.orig/builder/triton/access_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/triton/access_config.go	2017-04-11 15:33:34.768674168 +0200
@@ -9,8 +9,8 @@
 	"github.com/joyent/gocommon/client"
 	"github.com/joyent/gosdc/cloudapi"
 	"github.com/joyent/gosign/auth"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // AccessConfig is for common configuration related to Triton access
diff -Nur packer-1.0.0.orig/builder/triton/builder.go packer-1.0.0/builder/triton/builder.go
--- packer-1.0.0.orig/builder/triton/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/triton/builder.go	2017-04-11 15:33:34.768674168 +0200
@@ -5,10 +5,10 @@
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
 )
 
 const (
diff -Nur packer-1.0.0.orig/builder/triton/config.go packer-1.0.0/builder/triton/config.go
--- packer-1.0.0.orig/builder/triton/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/triton/config.go	2017-04-11 15:33:34.768674168 +0200
@@ -1,9 +1,9 @@
 package triton
 
 import (
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/builder/triton/driver_triton.go packer-1.0.0/builder/triton/driver_triton.go
--- packer-1.0.0.orig/builder/triton/driver_triton.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/triton/driver_triton.go	2017-04-11 15:33:34.768674168 +0200
@@ -6,7 +6,7 @@
 	"time"
 
 	"github.com/joyent/gosdc/cloudapi"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type driverTriton struct {
diff -Nur packer-1.0.0.orig/builder/triton/source_machine_config.go packer-1.0.0/builder/triton/source_machine_config.go
--- packer-1.0.0.orig/builder/triton/source_machine_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/triton/source_machine_config.go	2017-04-11 15:33:34.768674168 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // SourceMachineConfig represents the configuration to run a machine using
diff -Nur packer-1.0.0.orig/builder/triton/ssh.go packer-1.0.0/builder/triton/ssh.go
--- packer-1.0.0.orig/builder/triton/ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/triton/ssh.go	2017-04-11 15:33:34.768674168 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 
 	"github.com/mitchellh/multistep"
-	packerssh "github.com/mitchellh/packer/communicator/ssh"
+	packerssh "github.com/hashicorp/packer/communicator/ssh"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
 	"io/ioutil"
diff -Nur packer-1.0.0.orig/builder/triton/step_create_image_from_machine.go packer-1.0.0/builder/triton/step_create_image_from_machine.go
--- packer-1.0.0.orig/builder/triton/step_create_image_from_machine.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/triton/step_create_image_from_machine.go	2017-04-11 15:33:34.768674168 +0200
@@ -5,7 +5,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepCreateImageFromMachine creates an image with the specified attributes
diff -Nur packer-1.0.0.orig/builder/triton/step_create_source_machine.go packer-1.0.0/builder/triton/step_create_source_machine.go
--- packer-1.0.0.orig/builder/triton/step_create_source_machine.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/triton/step_create_source_machine.go	2017-04-11 15:33:34.768674168 +0200
@@ -5,7 +5,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepCreateSourceMachine creates an machine with the specified attributes
diff -Nur packer-1.0.0.orig/builder/triton/step_delete_machine.go packer-1.0.0/builder/triton/step_delete_machine.go
--- packer-1.0.0.orig/builder/triton/step_delete_machine.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/triton/step_delete_machine.go	2017-04-11 15:33:34.768674168 +0200
@@ -5,7 +5,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepDeleteMachine deletes the machine with the ID specified in state["machine"]
diff -Nur packer-1.0.0.orig/builder/triton/step_stop_machine.go packer-1.0.0/builder/triton/step_stop_machine.go
--- packer-1.0.0.orig/builder/triton/step_stop_machine.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/triton/step_stop_machine.go	2017-04-11 15:33:34.768674168 +0200
@@ -5,7 +5,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepStopMachine stops the machine with the given Machine ID, and waits
diff -Nur packer-1.0.0.orig/builder/triton/step_test.go packer-1.0.0/builder/triton/step_test.go
--- packer-1.0.0.orig/builder/triton/step_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/triton/step_test.go	2017-04-11 15:33:34.772674158 +0200
@@ -3,7 +3,7 @@
 import (
 	"bytes"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/triton/step_wait_for_stop_to_not_fail.go packer-1.0.0/builder/triton/step_wait_for_stop_to_not_fail.go
--- packer-1.0.0.orig/builder/triton/step_wait_for_stop_to_not_fail.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/triton/step_wait_for_stop_to_not_fail.go	2017-04-11 15:33:34.776674148 +0200
@@ -4,7 +4,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepWaitForStopNotToFail waits for 10 seconds before returning with continue
diff -Nur packer-1.0.0.orig/builder/triton/target_image_config.go packer-1.0.0/builder/triton/target_image_config.go
--- packer-1.0.0.orig/builder/triton/target_image_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/triton/target_image_config.go	2017-04-11 15:33:34.776674148 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // TargetImageConfig represents the configuration for the image to be created
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/artifact.go packer-1.0.0/builder/virtualbox/common/artifact.go
--- packer-1.0.0.orig/builder/virtualbox/common/artifact.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/artifact.go	2017-04-11 15:33:34.776674148 +0200
@@ -5,7 +5,7 @@
 	"os"
 	"path/filepath"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This is the common builder ID to all of these artifacts.
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/artifact_test.go packer-1.0.0/builder/virtualbox/common/artifact_test.go
--- packer-1.0.0.orig/builder/virtualbox/common/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/artifact_test.go	2017-04-11 15:33:34.776674148 +0200
@@ -6,7 +6,7 @@
 	"path/filepath"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifact_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/config_test.go packer-1.0.0/builder/virtualbox/common/config_test.go
--- packer-1.0.0.orig/builder/virtualbox/common/config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/config_test.go	2017-04-11 15:33:34.788674119 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func testConfigTemplate(t *testing.T) *interpolate.Context {
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/export_config.go packer-1.0.0/builder/virtualbox/common/export_config.go
--- packer-1.0.0.orig/builder/virtualbox/common/export_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/export_config.go	2017-04-11 15:33:34.796674100 +0200
@@ -3,7 +3,7 @@
 import (
 	"errors"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type ExportConfig struct {
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/export_opts.go packer-1.0.0/builder/virtualbox/common/export_opts.go
--- packer-1.0.0.orig/builder/virtualbox/common/export_opts.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/export_opts.go	2017-04-11 15:33:34.796674100 +0200
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type ExportOpts struct {
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/output_config.go packer-1.0.0/builder/virtualbox/common/output_config.go
--- packer-1.0.0.orig/builder/virtualbox/common/output_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/output_config.go	2017-04-11 15:33:34.796674100 +0200
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type OutputConfig struct {
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/output_config_test.go packer-1.0.0/builder/virtualbox/common/output_config_test.go
--- packer-1.0.0.orig/builder/virtualbox/common/output_config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/output_config_test.go	2017-04-11 15:33:34.796674100 +0200
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/common"
+	"github.com/hashicorp/packer/common"
 	"io/ioutil"
 	"os"
 	"testing"
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/run_config.go packer-1.0.0/builder/virtualbox/common/run_config.go
--- packer-1.0.0.orig/builder/virtualbox/common/run_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/run_config.go	2017-04-11 15:33:34.796674100 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type RunConfig struct {
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/shutdown_config.go packer-1.0.0/builder/virtualbox/common/shutdown_config.go
--- packer-1.0.0.orig/builder/virtualbox/common/shutdown_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/shutdown_config.go	2017-04-11 15:33:34.796674100 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type ShutdownConfig struct {
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/ssh.go packer-1.0.0/builder/virtualbox/common/ssh.go
--- packer-1.0.0.orig/builder/virtualbox/common/ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/ssh.go	2017-04-11 15:33:34.796674100 +0200
@@ -2,8 +2,8 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	"github.com/mitchellh/packer/communicator/ssh"
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/ssh_config.go packer-1.0.0/builder/virtualbox/common/ssh_config.go
--- packer-1.0.0.orig/builder/virtualbox/common/ssh_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/ssh_config.go	2017-04-11 15:33:34.796674100 +0200
@@ -4,8 +4,8 @@
 	"errors"
 	"time"
 
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type SSHConfig struct {
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/ssh_config_test.go packer-1.0.0/builder/virtualbox/common/ssh_config_test.go
--- packer-1.0.0.orig/builder/virtualbox/common/ssh_config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/ssh_config_test.go	2017-04-11 15:33:34.796674100 +0200
@@ -5,7 +5,7 @@
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func testSSHConfig() *SSHConfig {
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_attach_floppy.go packer-1.0.0/builder/virtualbox/common/step_attach_floppy.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_attach_floppy.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_attach_floppy.go	2017-04-11 15:33:34.796674100 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io"
 	"io/ioutil"
 	"log"
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_attach_guest_additions.go packer-1.0.0/builder/virtualbox/common/step_attach_guest_additions.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_attach_guest_additions.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_attach_guest_additions.go	2017-04-11 15:33:34.796674100 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_configure_vrdp.go packer-1.0.0/builder/virtualbox/common/step_configure_vrdp.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_configure_vrdp.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_configure_vrdp.go	2017-04-11 15:33:34.796674100 +0200
@@ -7,7 +7,7 @@
 	"net"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step configures the VM to enable the VRDP server
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_download_guest_additions.go packer-1.0.0/builder/virtualbox/common/step_download_guest_additions.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_download_guest_additions.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_download_guest_additions.go	2017-04-11 15:33:34.796674100 +0200
@@ -10,9 +10,9 @@
 	"strings"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 var additionsVersionMap = map[string]string{
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_export.go packer-1.0.0/builder/virtualbox/common/step_export.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_export.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_export.go	2017-04-11 15:33:34.796674100 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"path/filepath"
 	"strings"
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_forward_ssh.go packer-1.0.0/builder/virtualbox/common/step_forward_ssh.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_forward_ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_forward_ssh.go	2017-04-11 15:33:34.800674090 +0200
@@ -7,8 +7,8 @@
 	"net"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step adds a NAT port forwarding definition so that SSH is available
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_output_dir.go packer-1.0.0/builder/virtualbox/common/step_output_dir.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_output_dir.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_output_dir.go	2017-04-11 15:33:34.800674090 +0200
@@ -8,7 +8,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepOutputDir sets up the output directory by creating it if it does
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_remove_devices.go packer-1.0.0/builder/virtualbox/common/step_remove_devices.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_remove_devices.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_remove_devices.go	2017-04-11 15:33:34.800674090 +0200
@@ -5,8 +5,8 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step removes any devices (floppy disks, ISOs, etc.) from the
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_run.go packer-1.0.0/builder/virtualbox/common/step_run.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_run.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_run.go	2017-04-11 15:33:34.800674090 +0200
@@ -5,7 +5,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step starts the virtual machine.
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_shutdown.go packer-1.0.0/builder/virtualbox/common/step_shutdown.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_shutdown.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_shutdown.go	2017-04-11 15:33:34.812674060 +0200
@@ -4,7 +4,7 @@
 	"errors"
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"time"
 )
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_shutdown_test.go packer-1.0.0/builder/virtualbox/common/step_shutdown_test.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_shutdown_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_shutdown_test.go	2017-04-11 15:33:34.800674090 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 	"time"
 )
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_suppress_messages.go packer-1.0.0/builder/virtualbox/common/step_suppress_messages.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_suppress_messages.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_suppress_messages.go	2017-04-11 15:33:34.816674050 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_test.go packer-1.0.0/builder/virtualbox/common/step_test.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_test.go	2017-04-11 15:33:34.816674050 +0200
@@ -3,7 +3,7 @@
 import (
 	"bytes"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_type_boot_command.go packer-1.0.0/builder/virtualbox/common/step_type_boot_command.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_type_boot_command.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_type_boot_command.go	2017-04-11 15:33:34.816674050 +0200
@@ -9,9 +9,9 @@
 	"unicode/utf8"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const KeyLeftShift uint32 = 0xFFE1
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_upload_guest_additions.go packer-1.0.0/builder/virtualbox/common/step_upload_guest_additions.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_upload_guest_additions.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_upload_guest_additions.go	2017-04-11 15:33:34.816674050 +0200
@@ -6,8 +6,8 @@
 	"os"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type guestAdditionsPathTemplate struct {
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_upload_version.go packer-1.0.0/builder/virtualbox/common/step_upload_version.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_upload_version.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_upload_version.go	2017-04-11 15:33:34.816674050 +0200
@@ -4,7 +4,7 @@
 	"bytes"
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_upload_version_test.go packer-1.0.0/builder/virtualbox/common/step_upload_version_test.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_upload_version_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_upload_version_test.go	2017-04-11 15:33:34.816674050 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/step_vboxmanage.go packer-1.0.0/builder/virtualbox/common/step_vboxmanage.go
--- packer-1.0.0.orig/builder/virtualbox/common/step_vboxmanage.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/step_vboxmanage.go	2017-04-11 15:33:34.816674050 +0200
@@ -5,8 +5,8 @@
 	"strings"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type commandTemplate struct {
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/vbox_version_config.go packer-1.0.0/builder/virtualbox/common/vbox_version_config.go
--- packer-1.0.0.orig/builder/virtualbox/common/vbox_version_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/vbox_version_config.go	2017-04-11 15:33:34.816674050 +0200
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type VBoxVersionConfig struct {
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/vboxmanage_config.go packer-1.0.0/builder/virtualbox/common/vboxmanage_config.go
--- packer-1.0.0.orig/builder/virtualbox/common/vboxmanage_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/vboxmanage_config.go	2017-04-11 15:33:34.816674050 +0200
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type VBoxManageConfig struct {
diff -Nur packer-1.0.0.orig/builder/virtualbox/common/vboxmanage_post_config.go packer-1.0.0/builder/virtualbox/common/vboxmanage_post_config.go
--- packer-1.0.0.orig/builder/virtualbox/common/vboxmanage_post_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/common/vboxmanage_post_config.go	2017-04-11 15:33:34.816674050 +0200
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type VBoxManagePostConfig struct {
diff -Nur packer-1.0.0.orig/builder/virtualbox/iso/builder.go packer-1.0.0/builder/virtualbox/iso/builder.go
--- packer-1.0.0.orig/builder/virtualbox/iso/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/iso/builder.go	2017-04-11 15:29:13.765322715 +0200
@@ -7,12 +7,12 @@
 	"strings"
 
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"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/template/interpolate"
 )
 
 const BuilderId = "mitchellh.virtualbox"
diff -Nur packer-1.0.0.orig/builder/virtualbox/iso/builder_acc_test.go packer-1.0.0/builder/virtualbox/iso/builder_acc_test.go
--- packer-1.0.0.orig/builder/virtualbox/iso/builder_acc_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/iso/builder_acc_test.go	2017-04-11 15:33:34.816674050 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	builderT "github.com/mitchellh/packer/helper/builder/testing"
+	builderT "github.com/hashicorp/packer/helper/builder/testing"
 )
 
 func TestBuilderAcc_basic(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/virtualbox/iso/builder_test.go packer-1.0.0/builder/virtualbox/iso/builder_test.go
--- packer-1.0.0.orig/builder/virtualbox/iso/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/iso/builder_test.go	2017-04-11 15:33:34.816674050 +0200
@@ -5,8 +5,8 @@
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/builder/virtualbox/iso/step_attach_iso.go packer-1.0.0/builder/virtualbox/iso/step_attach_iso.go
--- packer-1.0.0.orig/builder/virtualbox/iso/step_attach_iso.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/iso/step_attach_iso.go	2017-04-11 15:33:34.816674050 +0200
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/packer"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step attaches the ISO to the virtual machine.
diff -Nur packer-1.0.0.orig/builder/virtualbox/iso/step_create_disk.go packer-1.0.0/builder/virtualbox/iso/step_create_disk.go
--- packer-1.0.0.orig/builder/virtualbox/iso/step_create_disk.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/iso/step_create_disk.go	2017-04-11 15:33:34.816674050 +0200
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/packer"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/packer"
 	"path/filepath"
 	"strconv"
 	"strings"
diff -Nur packer-1.0.0.orig/builder/virtualbox/iso/step_create_vm.go packer-1.0.0/builder/virtualbox/iso/step_create_vm.go
--- packer-1.0.0.orig/builder/virtualbox/iso/step_create_vm.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/iso/step_create_vm.go	2017-04-11 15:33:34.816674050 +0200
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/packer"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/packer"
 	"time"
 )
 
diff -Nur packer-1.0.0.orig/builder/virtualbox/ovf/builder.go packer-1.0.0/builder/virtualbox/ovf/builder.go
--- packer-1.0.0.orig/builder/virtualbox/ovf/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/ovf/builder.go	2017-04-11 15:33:34.820674041 +0200
@@ -6,10 +6,10 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 )
 
 // Builder implements packer.Builder and builds the actual VirtualBox
diff -Nur packer-1.0.0.orig/builder/virtualbox/ovf/config.go packer-1.0.0/builder/virtualbox/ovf/config.go
--- packer-1.0.0.orig/builder/virtualbox/ovf/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/ovf/config.go	2017-04-11 15:33:34.820674041 +0200
@@ -4,11 +4,11 @@
 	"fmt"
 	"strings"
 
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // Config is the configuration structure for the builder.
diff -Nur packer-1.0.0.orig/builder/virtualbox/ovf/config_test.go packer-1.0.0/builder/virtualbox/ovf/config_test.go
--- packer-1.0.0.orig/builder/virtualbox/ovf/config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/ovf/config_test.go	2017-04-11 15:33:34.820674041 +0200
@@ -6,7 +6,7 @@
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig(t *testing.T) map[string]interface{} {
diff -Nur packer-1.0.0.orig/builder/virtualbox/ovf/step_import.go packer-1.0.0/builder/virtualbox/ovf/step_import.go
--- packer-1.0.0.orig/builder/virtualbox/ovf/step_import.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/ovf/step_import.go	2017-04-11 15:33:34.832674012 +0200
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/packer"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step imports an OVF VM into VirtualBox.
diff -Nur packer-1.0.0.orig/builder/virtualbox/ovf/step_import_test.go packer-1.0.0/builder/virtualbox/ovf/step_import_test.go
--- packer-1.0.0.orig/builder/virtualbox/ovf/step_import_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/ovf/step_import_test.go	2017-04-11 15:33:34.820674041 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/virtualbox/ovf/step_test.go packer-1.0.0/builder/virtualbox/ovf/step_test.go
--- packer-1.0.0.orig/builder/virtualbox/ovf/step_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/virtualbox/ovf/step_test.go	2017-04-11 15:33:34.832674012 +0200
@@ -3,8 +3,8 @@
 import (
 	"bytes"
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/packer"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/vmware/common/artifact.go packer-1.0.0/builder/vmware/common/artifact.go
--- packer-1.0.0.orig/builder/vmware/common/artifact.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/artifact.go	2017-04-11 15:33:34.832674012 +0200
@@ -5,7 +5,7 @@
 	"os"
 	"path/filepath"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // BuilderId for the local artifacts
diff -Nur packer-1.0.0.orig/builder/vmware/common/artifact_test.go packer-1.0.0/builder/vmware/common/artifact_test.go
--- packer-1.0.0.orig/builder/vmware/common/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/artifact_test.go	2017-04-11 15:33:34.832674012 +0200
@@ -6,7 +6,7 @@
 	"path/filepath"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestLocalArtifact_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/vmware/common/config_test.go packer-1.0.0/builder/vmware/common/config_test.go
--- packer-1.0.0.orig/builder/vmware/common/config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/config_test.go	2017-04-11 15:33:34.832674012 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func testConfigTemplate(t *testing.T) *interpolate.Context {
diff -Nur packer-1.0.0.orig/builder/vmware/common/driver_config.go packer-1.0.0/builder/vmware/common/driver_config.go
--- packer-1.0.0.orig/builder/vmware/common/driver_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/driver_config.go	2017-04-11 15:33:34.836674002 +0200
@@ -3,7 +3,7 @@
 import (
 	"os"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type DriverConfig struct {
diff -Nur packer-1.0.0.orig/builder/vmware/common/output_config.go packer-1.0.0/builder/vmware/common/output_config.go
--- packer-1.0.0.orig/builder/vmware/common/output_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/output_config.go	2017-04-11 15:33:34.836674002 +0200
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type OutputConfig struct {
diff -Nur packer-1.0.0.orig/builder/vmware/common/output_config_test.go packer-1.0.0/builder/vmware/common/output_config_test.go
--- packer-1.0.0.orig/builder/vmware/common/output_config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/output_config_test.go	2017-04-11 15:33:34.836674002 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/common"
+	"github.com/hashicorp/packer/common"
 )
 
 func TestOutputConfigPrepare(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/vmware/common/run_config.go packer-1.0.0/builder/vmware/common/run_config.go
--- packer-1.0.0.orig/builder/vmware/common/run_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/run_config.go	2017-04-11 15:33:34.836674002 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type RunConfig struct {
diff -Nur packer-1.0.0.orig/builder/vmware/common/shutdown_config.go packer-1.0.0/builder/vmware/common/shutdown_config.go
--- packer-1.0.0.orig/builder/vmware/common/shutdown_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/shutdown_config.go	2017-04-11 15:33:34.836674002 +0200
@@ -4,7 +4,7 @@
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type ShutdownConfig struct {
diff -Nur packer-1.0.0.orig/builder/vmware/common/ssh.go packer-1.0.0/builder/vmware/common/ssh.go
--- packer-1.0.0.orig/builder/vmware/common/ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/ssh.go	2017-04-11 15:33:34.836674002 +0200
@@ -8,8 +8,8 @@
 	"os"
 
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	"github.com/mitchellh/packer/communicator/ssh"
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/vmware/common/ssh_config.go packer-1.0.0/builder/vmware/common/ssh_config.go
--- packer-1.0.0.orig/builder/vmware/common/ssh_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/ssh_config.go	2017-04-11 15:33:34.836674002 +0200
@@ -3,8 +3,8 @@
 import (
 	"time"
 
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type SSHConfig struct {
diff -Nur packer-1.0.0.orig/builder/vmware/common/ssh_config_test.go packer-1.0.0/builder/vmware/common/ssh_config_test.go
--- packer-1.0.0.orig/builder/vmware/common/ssh_config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/ssh_config_test.go	2017-04-11 15:33:34.836674002 +0200
@@ -5,7 +5,7 @@
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func testSSHConfig() *SSHConfig {
diff -Nur packer-1.0.0.orig/builder/vmware/common/step_clean_files.go packer-1.0.0/builder/vmware/common/step_clean_files.go
--- packer-1.0.0.orig/builder/vmware/common/step_clean_files.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/step_clean_files.go	2017-04-11 15:33:34.836674002 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"os"
 	"path/filepath"
 )
diff -Nur packer-1.0.0.orig/builder/vmware/common/step_clean_vmx.go packer-1.0.0/builder/vmware/common/step_clean_vmx.go
--- packer-1.0.0.orig/builder/vmware/common/step_clean_vmx.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/step_clean_vmx.go	2017-04-11 15:33:34.836674002 +0200
@@ -7,7 +7,7 @@
 	"strings"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step cleans up the VMX by removing or changing this prior to
diff -Nur packer-1.0.0.orig/builder/vmware/common/step_compact_disk.go packer-1.0.0/builder/vmware/common/step_compact_disk.go
--- packer-1.0.0.orig/builder/vmware/common/step_compact_disk.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/step_compact_disk.go	2017-04-11 15:33:34.836674002 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/vmware/common/step_configure_vmx.go packer-1.0.0/builder/vmware/common/step_configure_vmx.go
--- packer-1.0.0.orig/builder/vmware/common/step_configure_vmx.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/step_configure_vmx.go	2017-04-11 15:33:34.836674002 +0200
@@ -8,7 +8,7 @@
 	"strings"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step configures a VMX by setting some default settings as well
diff -Nur packer-1.0.0.orig/builder/vmware/common/step_configure_vnc.go packer-1.0.0/builder/vmware/common/step_configure_vnc.go
--- packer-1.0.0.orig/builder/vmware/common/step_configure_vnc.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/step_configure_vnc.go	2017-04-11 15:33:34.836674002 +0200
@@ -9,7 +9,7 @@
 	"os"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step configures the VM to enable the VNC server.
diff -Nur packer-1.0.0.orig/builder/vmware/common/step_output_dir.go packer-1.0.0/builder/vmware/common/step_output_dir.go
--- packer-1.0.0.orig/builder/vmware/common/step_output_dir.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/step_output_dir.go	2017-04-11 15:33:34.836674002 +0200
@@ -6,7 +6,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepOutputDir sets up the output directory by creating it if it does
diff -Nur packer-1.0.0.orig/builder/vmware/common/step_run.go packer-1.0.0/builder/vmware/common/step_run.go
--- packer-1.0.0.orig/builder/vmware/common/step_run.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/step_run.go	2017-04-11 15:33:34.836674002 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"time"
 )
 
diff -Nur packer-1.0.0.orig/builder/vmware/common/step_shutdown.go packer-1.0.0/builder/vmware/common/step_shutdown.go
--- packer-1.0.0.orig/builder/vmware/common/step_shutdown.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/step_shutdown.go	2017-04-11 15:33:34.868673924 +0200
@@ -5,7 +5,7 @@
 	"errors"
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"regexp"
 	"runtime"
diff -Nur packer-1.0.0.orig/builder/vmware/common/step_shutdown_test.go packer-1.0.0/builder/vmware/common/step_shutdown_test.go
--- packer-1.0.0.orig/builder/vmware/common/step_shutdown_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/step_shutdown_test.go	2017-04-11 15:33:34.864673933 +0200
@@ -8,7 +8,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testStepShutdownState(t *testing.T) multistep.StateBag {
diff -Nur packer-1.0.0.orig/builder/vmware/common/step_suppress_messages.go packer-1.0.0/builder/vmware/common/step_suppress_messages.go
--- packer-1.0.0.orig/builder/vmware/common/step_suppress_messages.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/step_suppress_messages.go	2017-04-11 15:33:34.868673924 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/vmware/common/step_test.go packer-1.0.0/builder/vmware/common/step_test.go
--- packer-1.0.0.orig/builder/vmware/common/step_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/step_test.go	2017-04-11 15:33:34.868673924 +0200
@@ -3,7 +3,7 @@
 import (
 	"bytes"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/vmware/common/step_type_boot_command.go packer-1.0.0/builder/vmware/common/step_type_boot_command.go
--- packer-1.0.0.orig/builder/vmware/common/step_type_boot_command.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/step_type_boot_command.go	2017-04-11 15:33:34.868673924 +0200
@@ -13,9 +13,9 @@
 
 	"github.com/mitchellh/go-vnc"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const KeyLeftShift uint32 = 0xFFE1
diff -Nur packer-1.0.0.orig/builder/vmware/common/step_upload_tools.go packer-1.0.0/builder/vmware/common/step_upload_tools.go
--- packer-1.0.0.orig/builder/vmware/common/step_upload_tools.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/step_upload_tools.go	2017-04-11 15:33:34.868673924 +0200
@@ -5,8 +5,8 @@
 	"os"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type toolsUploadPathTemplate struct {
diff -Nur packer-1.0.0.orig/builder/vmware/common/tools_config.go packer-1.0.0/builder/vmware/common/tools_config.go
--- packer-1.0.0.orig/builder/vmware/common/tools_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/tools_config.go	2017-04-11 15:33:34.868673924 +0200
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type ToolsConfig struct {
diff -Nur packer-1.0.0.orig/builder/vmware/common/vmx_config.go packer-1.0.0/builder/vmware/common/vmx_config.go
--- packer-1.0.0.orig/builder/vmware/common/vmx_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/common/vmx_config.go	2017-04-11 15:33:34.868673924 +0200
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type VMXConfig struct {
diff -Nur packer-1.0.0.orig/builder/vmware/iso/artifact_test.go packer-1.0.0/builder/vmware/iso/artifact_test.go
--- packer-1.0.0.orig/builder/vmware/iso/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/artifact_test.go	2017-04-11 15:33:34.868673924 +0200
@@ -1,7 +1,7 @@
 package iso
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/vmware/iso/builder.go packer-1.0.0/builder/vmware/iso/builder.go
--- packer-1.0.0.orig/builder/vmware/iso/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/builder.go	2017-04-11 15:29:24.965294416 +0200
@@ -9,12 +9,12 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"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/template/interpolate"
 )
 
 const BuilderIdESX = "mitchellh.vmware-esx"
diff -Nur packer-1.0.0.orig/builder/vmware/iso/builder_test.go packer-1.0.0/builder/vmware/iso/builder_test.go
--- packer-1.0.0.orig/builder/vmware/iso/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/builder_test.go	2017-04-11 15:33:34.868673924 +0200
@@ -7,7 +7,7 @@
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/builder/vmware/iso/driver.go packer-1.0.0/builder/vmware/iso/driver.go
--- packer-1.0.0.orig/builder/vmware/iso/driver.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/driver.go	2017-04-11 15:33:34.868673924 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
 )
 
 // NewDriver returns a new driver implementation for this operating
diff -Nur packer-1.0.0.orig/builder/vmware/iso/driver_esx5.go packer-1.0.0/builder/vmware/iso/driver_esx5.go
--- packer-1.0.0.orig/builder/vmware/iso/driver_esx5.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/driver_esx5.go	2017-04-11 15:33:34.880673894 +0200
@@ -15,9 +15,9 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	"github.com/mitchellh/packer/communicator/ssh"
-	"github.com/mitchellh/packer/packer"
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
+	"github.com/hashicorp/packer/packer"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/builder/vmware/iso/driver_esx5_test.go packer-1.0.0/builder/vmware/iso/driver_esx5_test.go
--- packer-1.0.0.orig/builder/vmware/iso/driver_esx5_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/driver_esx5_test.go	2017-04-11 15:33:34.868673924 +0200
@@ -6,7 +6,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
 )
 
 func TestESX5Driver_implDriver(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/vmware/iso/remote_driver.go packer-1.0.0/builder/vmware/iso/remote_driver.go
--- packer-1.0.0.orig/builder/vmware/iso/remote_driver.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/remote_driver.go	2017-04-11 15:33:34.872673914 +0200
@@ -1,7 +1,7 @@
 package iso
 
 import (
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
 )
 
 type RemoteDriver interface {
diff -Nur packer-1.0.0.orig/builder/vmware/iso/remote_driver_mock.go packer-1.0.0/builder/vmware/iso/remote_driver_mock.go
--- packer-1.0.0.orig/builder/vmware/iso/remote_driver_mock.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/remote_driver_mock.go	2017-04-11 15:33:34.868673924 +0200
@@ -1,7 +1,7 @@
 package iso
 
 import (
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
 )
 
 type RemoteDriverMock struct {
diff -Nur packer-1.0.0.orig/builder/vmware/iso/remote_driver_mock_test.go packer-1.0.0/builder/vmware/iso/remote_driver_mock_test.go
--- packer-1.0.0.orig/builder/vmware/iso/remote_driver_mock_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/remote_driver_mock_test.go	2017-04-11 15:33:34.868673924 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
 )
 
 func TestRemoteDriverMock_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/vmware/iso/step_create_disk.go packer-1.0.0/builder/vmware/iso/step_create_disk.go
--- packer-1.0.0.orig/builder/vmware/iso/step_create_disk.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/step_create_disk.go	2017-04-11 15:33:34.880673894 +0200
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 	"path/filepath"
 )
 
diff -Nur packer-1.0.0.orig/builder/vmware/iso/step_create_vmx.go packer-1.0.0/builder/vmware/iso/step_create_vmx.go
--- packer-1.0.0.orig/builder/vmware/iso/step_create_vmx.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/step_create_vmx.go	2017-04-11 15:33:34.880673894 +0200
@@ -7,9 +7,9 @@
 	"path/filepath"
 
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type vmxTemplateData struct {
diff -Nur packer-1.0.0.orig/builder/vmware/iso/step_export.go packer-1.0.0/builder/vmware/iso/step_export.go
--- packer-1.0.0.orig/builder/vmware/iso/step_export.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/step_export.go	2017-04-11 15:33:34.880673894 +0200
@@ -11,7 +11,7 @@
 	"strings"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepExport struct {
diff -Nur packer-1.0.0.orig/builder/vmware/iso/step_register.go packer-1.0.0/builder/vmware/iso/step_register.go
--- packer-1.0.0.orig/builder/vmware/iso/step_register.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/step_register.go	2017-04-11 15:33:34.880673894 +0200
@@ -5,8 +5,8 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepRegister struct {
diff -Nur packer-1.0.0.orig/builder/vmware/iso/step_remote_upload.go packer-1.0.0/builder/vmware/iso/step_remote_upload.go
--- packer-1.0.0.orig/builder/vmware/iso/step_remote_upload.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/step_remote_upload.go	2017-04-11 15:33:34.888673875 +0200
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/builder/vmware/iso/step_test.go packer-1.0.0/builder/vmware/iso/step_test.go
--- packer-1.0.0.orig/builder/vmware/iso/step_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/step_test.go	2017-04-11 15:33:34.904673836 +0200
@@ -3,8 +3,8 @@
 import (
 	"bytes"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/builder/vmware/iso/step_upload_vmx.go packer-1.0.0/builder/vmware/iso/step_upload_vmx.go
--- packer-1.0.0.orig/builder/vmware/iso/step_upload_vmx.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/iso/step_upload_vmx.go	2017-04-11 15:33:34.904673836 +0200
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 	"path/filepath"
 )
 
diff -Nur packer-1.0.0.orig/builder/vmware/vmx/builder.go packer-1.0.0/builder/vmware/vmx/builder.go
--- packer-1.0.0.orig/builder/vmware/vmx/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/vmx/builder.go	2017-04-11 15:33:34.904673836 +0200
@@ -7,10 +7,10 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 )
 
 // Builder implements packer.Builder and builds the actual VMware
diff -Nur packer-1.0.0.orig/builder/vmware/vmx/builder_test.go packer-1.0.0/builder/vmware/vmx/builder_test.go
--- packer-1.0.0.orig/builder/vmware/vmx/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/vmx/builder_test.go	2017-04-11 15:33:34.904673836 +0200
@@ -7,7 +7,7 @@
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestBuilderPrepare_FloppyFiles(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/vmware/vmx/config.go packer-1.0.0/builder/vmware/vmx/config.go
--- packer-1.0.0.orig/builder/vmware/vmx/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/vmx/config.go	2017-04-11 15:33:34.904673836 +0200
@@ -4,11 +4,11 @@
 	"fmt"
 	"os"
 
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // Config is the configuration structure for the builder.
diff -Nur packer-1.0.0.orig/builder/vmware/vmx/step_clone_vmx.go packer-1.0.0/builder/vmware/vmx/step_clone_vmx.go
--- packer-1.0.0.orig/builder/vmware/vmx/step_clone_vmx.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/vmx/step_clone_vmx.go	2017-04-11 15:33:34.904673836 +0200
@@ -6,8 +6,8 @@
 	"path/filepath"
 
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepCloneVMX takes a VMX file and clones the VM into the output directory.
diff -Nur packer-1.0.0.orig/builder/vmware/vmx/step_clone_vmx_test.go packer-1.0.0/builder/vmware/vmx/step_clone_vmx_test.go
--- packer-1.0.0.orig/builder/vmware/vmx/step_clone_vmx_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/vmx/step_clone_vmx_test.go	2017-04-11 15:33:34.904673836 +0200
@@ -7,7 +7,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
 )
 
 func TestStepCloneVMX_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/builder/vmware/vmx/step_test.go packer-1.0.0/builder/vmware/vmx/step_test.go
--- packer-1.0.0.orig/builder/vmware/vmx/step_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/builder/vmware/vmx/step_test.go	2017-04-11 15:33:34.904673836 +0200
@@ -5,8 +5,8 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff -Nur packer-1.0.0.orig/checkpoint.go packer-1.0.0/checkpoint.go
--- packer-1.0.0.orig/checkpoint.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/checkpoint.go	2017-04-11 15:21:58.222459685 +0200
@@ -6,9 +6,9 @@
 	"path/filepath"
 
 	"github.com/hashicorp/go-checkpoint"
-	"github.com/mitchellh/packer/command"
-	"github.com/mitchellh/packer/packer"
-	packerVersion "github.com/mitchellh/packer/version"
+	"github.com/hashicorp/packer/command"
+	"github.com/hashicorp/packer/packer"
+	packerVersion "github.com/hashicorp/packer/version"
 )
 
 func init() {
diff -Nur packer-1.0.0.orig/command/build.go packer-1.0.0/command/build.go
--- packer-1.0.0.orig/command/build.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/command/build.go	2017-04-11 15:33:34.904673836 +0200
@@ -10,9 +10,9 @@
 	"strings"
 	"sync"
 
-	"github.com/mitchellh/packer/helper/enumflag"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template"
+	"github.com/hashicorp/packer/helper/enumflag"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template"
 )
 
 type BuildCommand struct {
diff -Nur packer-1.0.0.orig/command/build_test.go packer-1.0.0/command/build_test.go
--- packer-1.0.0.orig/command/build_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/command/build_test.go	2017-04-11 15:33:34.904673836 +0200
@@ -6,8 +6,8 @@
 	"path/filepath"
 	"testing"
 
-	"github.com/mitchellh/packer/builder/file"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/builder/file"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestBuildOnlyFileCommaFlags(t *testing.T) {
diff -Nur packer-1.0.0.orig/command/command_test.go packer-1.0.0/command/command_test.go
--- packer-1.0.0.orig/command/command_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/command/command_test.go	2017-04-11 15:33:34.904673836 +0200
@@ -5,7 +5,7 @@
 	"path/filepath"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 const fixturesDir = "./test-fixtures"
diff -Nur packer-1.0.0.orig/command/fix.go packer-1.0.0/command/fix.go
--- packer-1.0.0.orig/command/fix.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/command/fix.go	2017-04-11 15:33:34.904673836 +0200
@@ -8,8 +8,8 @@
 	"os"
 	"strings"
 
-	"github.com/mitchellh/packer/fix"
-	"github.com/mitchellh/packer/template"
+	"github.com/hashicorp/packer/fix"
+	"github.com/hashicorp/packer/template"
 )
 
 type FixCommand struct {
diff -Nur packer-1.0.0.orig/command/inspect.go packer-1.0.0/command/inspect.go
--- packer-1.0.0.orig/command/inspect.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/command/inspect.go	2017-04-11 15:33:34.904673836 +0200
@@ -5,7 +5,7 @@
 	"sort"
 	"strings"
 
-	"github.com/mitchellh/packer/template"
+	"github.com/hashicorp/packer/template"
 )
 
 type InspectCommand struct {
diff -Nur packer-1.0.0.orig/command/meta.go packer-1.0.0/command/meta.go
--- packer-1.0.0.orig/command/meta.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/command/meta.go	2017-04-11 15:33:34.912673817 +0200
@@ -6,10 +6,10 @@
 	"fmt"
 	"io"
 
-	"github.com/mitchellh/packer/helper/flag-kv"
-	"github.com/mitchellh/packer/helper/flag-slice"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template"
+	"github.com/hashicorp/packer/helper/flag-kv"
+	"github.com/hashicorp/packer/helper/flag-slice"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template"
 )
 
 // FlagSetFlags is an enum to define what flags are present in the
diff -Nur packer-1.0.0.orig/command/plugin.go packer-1.0.0/command/plugin.go
--- packer-1.0.0.orig/command/plugin.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/command/plugin.go	2017-04-11 15:25:29.461899015 +0200
@@ -10,62 +10,62 @@
 	"regexp"
 	"strings"
 
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/packer/plugin"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer/plugin"
 
-	amazonchrootbuilder "github.com/mitchellh/packer/builder/amazon/chroot"
-	amazonebsbuilder "github.com/mitchellh/packer/builder/amazon/ebs"
-	amazonebssurrogatebuilder "github.com/mitchellh/packer/builder/amazon/ebssurrogate"
-	amazonebsvolumebuilder "github.com/mitchellh/packer/builder/amazon/ebsvolume"
-	amazoninstancebuilder "github.com/mitchellh/packer/builder/amazon/instance"
-	azurearmbuilder "github.com/mitchellh/packer/builder/azure/arm"
-	cloudstackbuilder "github.com/mitchellh/packer/builder/cloudstack"
-	digitaloceanbuilder "github.com/mitchellh/packer/builder/digitalocean"
-	dockerbuilder "github.com/mitchellh/packer/builder/docker"
-	filebuilder "github.com/mitchellh/packer/builder/file"
-	googlecomputebuilder "github.com/mitchellh/packer/builder/googlecompute"
-	hypervisobuilder "github.com/mitchellh/packer/builder/hyperv/iso"
-	nullbuilder "github.com/mitchellh/packer/builder/null"
-	oneandonebuilder "github.com/mitchellh/packer/builder/oneandone"
-	openstackbuilder "github.com/mitchellh/packer/builder/openstack"
-	parallelsisobuilder "github.com/mitchellh/packer/builder/parallels/iso"
-	parallelspvmbuilder "github.com/mitchellh/packer/builder/parallels/pvm"
-	profitbricksbuilder "github.com/mitchellh/packer/builder/profitbricks"
-	qemubuilder "github.com/mitchellh/packer/builder/qemu"
-	tritonbuilder "github.com/mitchellh/packer/builder/triton"
-	virtualboxisobuilder "github.com/mitchellh/packer/builder/virtualbox/iso"
-	virtualboxovfbuilder "github.com/mitchellh/packer/builder/virtualbox/ovf"
-	vmwareisobuilder "github.com/mitchellh/packer/builder/vmware/iso"
-	vmwarevmxbuilder "github.com/mitchellh/packer/builder/vmware/vmx"
-	amazonimportpostprocessor "github.com/mitchellh/packer/post-processor/amazon-import"
-	artificepostprocessor "github.com/mitchellh/packer/post-processor/artifice"
-	atlaspostprocessor "github.com/mitchellh/packer/post-processor/atlas"
-	checksumpostprocessor "github.com/mitchellh/packer/post-processor/checksum"
-	compresspostprocessor "github.com/mitchellh/packer/post-processor/compress"
-	dockerimportpostprocessor "github.com/mitchellh/packer/post-processor/docker-import"
-	dockerpushpostprocessor "github.com/mitchellh/packer/post-processor/docker-push"
-	dockersavepostprocessor "github.com/mitchellh/packer/post-processor/docker-save"
-	dockertagpostprocessor "github.com/mitchellh/packer/post-processor/docker-tag"
-	googlecomputeexportpostprocessor "github.com/mitchellh/packer/post-processor/googlecompute-export"
-	manifestpostprocessor "github.com/mitchellh/packer/post-processor/manifest"
-	shelllocalpostprocessor "github.com/mitchellh/packer/post-processor/shell-local"
-	vagrantpostprocessor "github.com/mitchellh/packer/post-processor/vagrant"
-	vagrantcloudpostprocessor "github.com/mitchellh/packer/post-processor/vagrant-cloud"
-	vspherepostprocessor "github.com/mitchellh/packer/post-processor/vsphere"
-	ansibleprovisioner "github.com/mitchellh/packer/provisioner/ansible"
-	ansiblelocalprovisioner "github.com/mitchellh/packer/provisioner/ansible-local"
-	chefclientprovisioner "github.com/mitchellh/packer/provisioner/chef-client"
-	chefsoloprovisioner "github.com/mitchellh/packer/provisioner/chef-solo"
-	convergeprovisioner "github.com/mitchellh/packer/provisioner/converge"
-	fileprovisioner "github.com/mitchellh/packer/provisioner/file"
-	powershellprovisioner "github.com/mitchellh/packer/provisioner/powershell"
-	puppetmasterlessprovisioner "github.com/mitchellh/packer/provisioner/puppet-masterless"
-	puppetserverprovisioner "github.com/mitchellh/packer/provisioner/puppet-server"
-	saltmasterlessprovisioner "github.com/mitchellh/packer/provisioner/salt-masterless"
-	shellprovisioner "github.com/mitchellh/packer/provisioner/shell"
-	shelllocalprovisioner "github.com/mitchellh/packer/provisioner/shell-local"
-	windowsrestartprovisioner "github.com/mitchellh/packer/provisioner/windows-restart"
-	windowsshellprovisioner "github.com/mitchellh/packer/provisioner/windows-shell"
+	amazonchrootbuilder "github.com/hashicorp/packer/builder/amazon/chroot"
+	amazonebsbuilder "github.com/hashicorp/packer/builder/amazon/ebs"
+	amazonebssurrogatebuilder "github.com/hashicorp/packer/builder/amazon/ebssurrogate"
+	amazonebsvolumebuilder "github.com/hashicorp/packer/builder/amazon/ebsvolume"
+	amazoninstancebuilder "github.com/hashicorp/packer/builder/amazon/instance"
+	azurearmbuilder "github.com/hashicorp/packer/builder/azure/arm"
+	cloudstackbuilder "github.com/hashicorp/packer/builder/cloudstack"
+	digitaloceanbuilder "github.com/hashicorp/packer/builder/digitalocean"
+	dockerbuilder "github.com/hashicorp/packer/builder/docker"
+	filebuilder "github.com/hashicorp/packer/builder/file"
+	googlecomputebuilder "github.com/hashicorp/packer/builder/googlecompute"
+	hypervisobuilder "github.com/hashicorp/packer/builder/hyperv/iso"
+	nullbuilder "github.com/hashicorp/packer/builder/null"
+	oneandonebuilder "github.com/hashicorp/packer/builder/oneandone"
+	openstackbuilder "github.com/hashicorp/packer/builder/openstack"
+	parallelsisobuilder "github.com/hashicorp/packer/builder/parallels/iso"
+	parallelspvmbuilder "github.com/hashicorp/packer/builder/parallels/pvm"
+	profitbricksbuilder "github.com/hashicorp/packer/builder/profitbricks"
+	qemubuilder "github.com/hashicorp/packer/builder/qemu"
+	tritonbuilder "github.com/hashicorp/packer/builder/triton"
+	virtualboxisobuilder "github.com/hashicorp/packer/builder/virtualbox/iso"
+	virtualboxovfbuilder "github.com/hashicorp/packer/builder/virtualbox/ovf"
+	vmwareisobuilder "github.com/hashicorp/packer/builder/vmware/iso"
+	vmwarevmxbuilder "github.com/hashicorp/packer/builder/vmware/vmx"
+	amazonimportpostprocessor "github.com/hashicorp/packer/post-processor/amazon-import"
+	artificepostprocessor "github.com/hashicorp/packer/post-processor/artifice"
+	atlaspostprocessor "github.com/hashicorp/packer/post-processor/atlas"
+	checksumpostprocessor "github.com/hashicorp/packer/post-processor/checksum"
+	compresspostprocessor "github.com/hashicorp/packer/post-processor/compress"
+	dockerimportpostprocessor "github.com/hashicorp/packer/post-processor/docker-import"
+	dockerpushpostprocessor "github.com/hashicorp/packer/post-processor/docker-push"
+	dockersavepostprocessor "github.com/hashicorp/packer/post-processor/docker-save"
+	dockertagpostprocessor "github.com/hashicorp/packer/post-processor/docker-tag"
+	googlecomputeexportpostprocessor "github.com/hashicorp/packer/post-processor/googlecompute-export"
+	manifestpostprocessor "github.com/hashicorp/packer/post-processor/manifest"
+	shelllocalpostprocessor "github.com/hashicorp/packer/post-processor/shell-local"
+	vagrantpostprocessor "github.com/hashicorp/packer/post-processor/vagrant"
+	vagrantcloudpostprocessor "github.com/hashicorp/packer/post-processor/vagrant-cloud"
+	vspherepostprocessor "github.com/hashicorp/packer/post-processor/vsphere"
+	ansibleprovisioner "github.com/hashicorp/packer/provisioner/ansible"
+	ansiblelocalprovisioner "github.com/hashicorp/packer/provisioner/ansible-local"
+	chefclientprovisioner "github.com/hashicorp/packer/provisioner/chef-client"
+	chefsoloprovisioner "github.com/hashicorp/packer/provisioner/chef-solo"
+	convergeprovisioner "github.com/hashicorp/packer/provisioner/converge"
+	fileprovisioner "github.com/hashicorp/packer/provisioner/file"
+	powershellprovisioner "github.com/hashicorp/packer/provisioner/powershell"
+	puppetmasterlessprovisioner "github.com/hashicorp/packer/provisioner/puppet-masterless"
+	puppetserverprovisioner "github.com/hashicorp/packer/provisioner/puppet-server"
+	saltmasterlessprovisioner "github.com/hashicorp/packer/provisioner/salt-masterless"
+	shellprovisioner "github.com/hashicorp/packer/provisioner/shell"
+	shelllocalprovisioner "github.com/hashicorp/packer/provisioner/shell-local"
+	windowsrestartprovisioner "github.com/hashicorp/packer/provisioner/windows-restart"
+	windowsshellprovisioner "github.com/hashicorp/packer/provisioner/windows-shell"
 )
 
 type PluginCommand struct {
diff -Nur packer-1.0.0.orig/command/push.go packer-1.0.0/command/push.go
--- packer-1.0.0.orig/command/push.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/command/push.go	2017-04-11 15:33:34.920673796 +0200
@@ -11,8 +11,8 @@
 
 	"github.com/hashicorp/atlas-go/archive"
 	"github.com/hashicorp/atlas-go/v1"
-	"github.com/mitchellh/packer/helper/flag-kv"
-	"github.com/mitchellh/packer/template"
+	"github.com/hashicorp/packer/helper/flag-kv"
+	"github.com/hashicorp/packer/template"
 )
 
 // archiveTemplateEntry is the name the template always takes within the slug.
diff -Nur packer-1.0.0.orig/command/validate.go packer-1.0.0/command/validate.go
--- packer-1.0.0.orig/command/validate.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/command/validate.go	2017-04-11 15:33:34.920673796 +0200
@@ -5,8 +5,8 @@
 	"log"
 	"strings"
 
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template"
 )
 
 type ValidateCommand struct {
diff -Nur packer-1.0.0.orig/commands.go packer-1.0.0/commands.go
--- packer-1.0.0.orig/commands.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/commands.go	2017-04-11 15:29:41.637252374 +0200
@@ -2,8 +2,8 @@
 
 import (
 	"github.com/mitchellh/cli"
-	"github.com/mitchellh/packer/command"
-	"github.com/mitchellh/packer/version"
+	"github.com/hashicorp/packer/command"
+	"github.com/hashicorp/packer/version"
 )
 
 // Commands is the mapping of all the available Packer commands.
diff -Nur packer-1.0.0.orig/common/floppy_config.go packer-1.0.0/common/floppy_config.go
--- packer-1.0.0.orig/common/floppy_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/common/floppy_config.go	2017-04-11 15:33:34.920673796 +0200
@@ -6,7 +6,7 @@
 	"path/filepath"
 	"strings"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type FloppyConfig struct {
diff -Nur packer-1.0.0.orig/common/http_config.go packer-1.0.0/common/http_config.go
--- packer-1.0.0.orig/common/http_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/common/http_config.go	2017-04-11 15:33:34.920673796 +0200
@@ -3,7 +3,7 @@
 import (
 	"errors"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // HTTPConfig contains configuration for the local HTTP Server
diff -Nur packer-1.0.0.orig/common/iso_config.go packer-1.0.0/common/iso_config.go
--- packer-1.0.0.orig/common/iso_config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/common/iso_config.go	2017-04-11 15:33:34.920673796 +0200
@@ -11,7 +11,7 @@
 	"runtime"
 	"strings"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // ISOConfig contains configuration for downloading ISO images.
diff -Nur packer-1.0.0.orig/common/multistep_debug.go packer-1.0.0/common/multistep_debug.go
--- packer-1.0.0.orig/common/multistep_debug.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/common/multistep_debug.go	2017-04-11 15:33:34.920673796 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"time"
 )
diff -Nur packer-1.0.0.orig/common/multistep_runner.go packer-1.0.0/common/multistep_runner.go
--- packer-1.0.0.orig/common/multistep_runner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/common/multistep_runner.go	2017-04-11 15:33:34.936673757 +0200
@@ -9,7 +9,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func newRunner(steps []multistep.Step, config PackerConfig, ui packer.Ui) (multistep.Runner, multistep.DebugPauseFn) {
diff -Nur packer-1.0.0.orig/common/powershell/hyperv/hyperv.go packer-1.0.0/common/powershell/hyperv/hyperv.go
--- packer-1.0.0.orig/common/powershell/hyperv/hyperv.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/common/powershell/hyperv/hyperv.go	2017-04-11 15:33:34.944673738 +0200
@@ -5,7 +5,7 @@
 	"strconv"
 	"strings"
 
-	"github.com/mitchellh/packer/common/powershell"
+	"github.com/hashicorp/packer/common/powershell"
 )
 
 func GetHostAdapterIpAddressForSwitch(switchName string) (string, error) {
diff -Nur packer-1.0.0.orig/common/step_create_floppy.go packer-1.0.0/common/step_create_floppy.go
--- packer-1.0.0.orig/common/step_create_floppy.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/common/step_create_floppy.go	2017-04-11 15:33:34.936673757 +0200
@@ -13,7 +13,7 @@
 	"github.com/mitchellh/go-fs"
 	"github.com/mitchellh/go-fs/fat"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepCreateFloppy will create a floppy disk with the given files.
diff -Nur packer-1.0.0.orig/common/step_create_floppy_test.go packer-1.0.0/common/step_create_floppy_test.go
--- packer-1.0.0.orig/common/step_create_floppy_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/common/step_create_floppy_test.go	2017-04-11 15:33:34.936673757 +0200
@@ -4,7 +4,7 @@
 	"bytes"
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"log"
 	"os"
diff -Nur packer-1.0.0.orig/common/step_download.go packer-1.0.0/common/step_download.go
--- packer-1.0.0.orig/common/step_download.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/common/step_download.go	2017-04-11 15:33:34.936673757 +0200
@@ -8,7 +8,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepDownload downloads a remote file using the download client within
diff -Nur packer-1.0.0.orig/common/step_http_server.go packer-1.0.0/common/step_http_server.go
--- packer-1.0.0.orig/common/step_http_server.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/common/step_http_server.go	2017-04-11 15:33:34.936673757 +0200
@@ -11,7 +11,7 @@
 	"path/filepath"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // This step creates and runs the HTTP server that is serving files from the
diff -Nur packer-1.0.0.orig/common/step_provision.go packer-1.0.0/common/step_provision.go
--- packer-1.0.0.orig/common/step_provision.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/common/step_provision.go	2017-04-11 15:33:34.936673757 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"time"
 )
diff -Nur packer-1.0.0.orig/communicator/none/communicator.go packer-1.0.0/communicator/none/communicator.go
--- packer-1.0.0.orig/communicator/none/communicator.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/communicator/none/communicator.go	2017-04-11 15:33:34.936673757 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"errors"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io"
 	"os"
 )
diff -Nur packer-1.0.0.orig/communicator/none/communicator_test.go packer-1.0.0/communicator/none/communicator_test.go
--- packer-1.0.0.orig/communicator/none/communicator_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/communicator/none/communicator_test.go	2017-04-11 15:33:34.936673757 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestCommIsCommunicator(t *testing.T) {
diff -Nur packer-1.0.0.orig/communicator/ssh/communicator.go packer-1.0.0/communicator/ssh/communicator.go
--- packer-1.0.0.orig/communicator/ssh/communicator.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/communicator/ssh/communicator.go	2017-04-11 15:33:34.956673708 +0200
@@ -15,7 +15,7 @@
 	"strings"
 	"time"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/pkg/sftp"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
diff -Nur packer-1.0.0.orig/communicator/ssh/communicator_test.go packer-1.0.0/communicator/ssh/communicator_test.go
--- packer-1.0.0.orig/communicator/ssh/communicator_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/communicator/ssh/communicator_test.go	2017-04-11 15:33:34.936673757 +0200
@@ -9,7 +9,7 @@
 	"testing"
 	"time"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/communicator/winrm/communicator.go packer-1.0.0/communicator/winrm/communicator.go
--- packer-1.0.0.orig/communicator/winrm/communicator.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/communicator/winrm/communicator.go	2017-04-11 15:33:34.936673757 +0200
@@ -10,7 +10,7 @@
 	"sync"
 
 	"github.com/masterzen/winrm"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/packer-community/winrmcp/winrmcp"
 )
 
diff -Nur packer-1.0.0.orig/communicator/winrm/communicator_test.go packer-1.0.0/communicator/winrm/communicator_test.go
--- packer-1.0.0.orig/communicator/winrm/communicator_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/communicator/winrm/communicator_test.go	2017-04-11 15:33:34.936673757 +0200
@@ -7,7 +7,7 @@
 	"time"
 
 	"github.com/dylanmei/winrmtest"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func newMockWinRMServer(t *testing.T) *winrmtest.Remote {
diff -Nur packer-1.0.0.orig/config.go packer-1.0.0/config.go
--- packer-1.0.0.orig/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/config.go	2017-04-11 15:33:34.936673757 +0200
@@ -12,9 +12,9 @@
 	"strings"
 
 	"github.com/kardianos/osext"
-	"github.com/mitchellh/packer/command"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/packer/plugin"
+	"github.com/hashicorp/packer/command"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer/plugin"
 )
 
 // PACKERSPACE is used to represent the spaces that separate args for a command
diff -Nur packer-1.0.0.orig/helper/builder/testing/testing.go packer-1.0.0/helper/builder/testing/testing.go
--- packer-1.0.0.orig/helper/builder/testing/testing.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/helper/builder/testing/testing.go	2017-04-11 15:33:34.940673748 +0200
@@ -8,8 +8,8 @@
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template"
 )
 
 // TestEnvVar must be set to a non-empty value for acceptance tests to run.
diff -Nur packer-1.0.0.orig/helper/communicator/config.go packer-1.0.0/helper/communicator/config.go
--- packer-1.0.0.orig/helper/communicator/config.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/helper/communicator/config.go	2017-04-11 15:33:34.944673738 +0200
@@ -7,7 +7,7 @@
 	"time"
 
 	"github.com/masterzen/winrm"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // Config is the common configuration that communicators allow within
diff -Nur packer-1.0.0.orig/helper/communicator/config_test.go packer-1.0.0/helper/communicator/config_test.go
--- packer-1.0.0.orig/helper/communicator/config_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/helper/communicator/config_test.go	2017-04-11 15:33:34.940673748 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func testConfig() *Config {
diff -Nur packer-1.0.0.orig/helper/communicator/step_connect.go packer-1.0.0/helper/communicator/step_connect.go
--- packer-1.0.0.orig/helper/communicator/step_connect.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/helper/communicator/step_connect.go	2017-04-11 15:33:34.960673699 +0200
@@ -5,8 +5,8 @@
 	"log"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/communicator/none"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/communicator/none"
+	"github.com/hashicorp/packer/packer"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/helper/communicator/step_connect_ssh.go packer-1.0.0/helper/communicator/step_connect_ssh.go
--- packer-1.0.0.orig/helper/communicator/step_connect_ssh.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/helper/communicator/step_connect_ssh.go	2017-04-11 15:33:34.944673738 +0200
@@ -9,9 +9,9 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	"github.com/mitchellh/packer/communicator/ssh"
-	"github.com/mitchellh/packer/packer"
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
+	"github.com/hashicorp/packer/packer"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/helper/communicator/step_connect_test.go packer-1.0.0/helper/communicator/step_connect_test.go
--- packer-1.0.0.orig/helper/communicator/step_connect_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/helper/communicator/step_connect_test.go	2017-04-11 15:33:34.944673738 +0200
@@ -5,7 +5,7 @@
 	"testing"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestStepConnect_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/helper/communicator/step_connect_winrm.go packer-1.0.0/helper/communicator/step_connect_winrm.go
--- packer-1.0.0.orig/helper/communicator/step_connect_winrm.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/helper/communicator/step_connect_winrm.go	2017-04-11 15:33:34.956673708 +0200
@@ -7,8 +7,8 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/communicator/winrm"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/communicator/winrm"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepConnectWinRM is a multistep Step implementation that waits for WinRM
diff -Nur packer-1.0.0.orig/helper/config/decode.go packer-1.0.0/helper/config/decode.go
--- packer-1.0.0.orig/helper/config/decode.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/helper/config/decode.go	2017-04-11 15:33:34.960673699 +0200
@@ -8,7 +8,7 @@
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/mitchellh/mapstructure"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // DecodeOpts are the options for decoding configuration.
diff -Nur packer-1.0.0.orig/helper/config/decode_test.go packer-1.0.0/helper/config/decode_test.go
--- packer-1.0.0.orig/helper/config/decode_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/helper/config/decode_test.go	2017-04-11 15:33:34.960673699 +0200
@@ -5,7 +5,7 @@
 	"testing"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func TestDecode(t *testing.T) {
diff -Nur packer-1.0.0.orig/main.go packer-1.0.0/main.go
--- packer-1.0.0.orig/main.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/main.go	2017-04-11 15:33:34.960673699 +0200
@@ -17,10 +17,10 @@
 
 	"github.com/hashicorp/go-uuid"
 	"github.com/mitchellh/cli"
-	"github.com/mitchellh/packer/command"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/packer/plugin"
-	"github.com/mitchellh/packer/version"
+	"github.com/hashicorp/packer/command"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer/plugin"
+	"github.com/hashicorp/packer/version"
 	"github.com/mitchellh/panicwrap"
 	"github.com/mitchellh/prefixedio"
 )
diff -Nur packer-1.0.0.orig/main_test.go packer-1.0.0/main_test.go
--- packer-1.0.0.orig/main_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/main_test.go	2017-04-11 15:33:34.960673699 +0200
@@ -7,7 +7,7 @@
 	"testing"
 
 	"github.com/mitchellh/cli"
-	"github.com/mitchellh/packer/command"
+	"github.com/hashicorp/packer/command"
 )
 
 func TestExcludeHelpFunc(t *testing.T) {
diff -Nur packer-1.0.0.orig/packer/core.go packer-1.0.0/packer/core.go
--- packer-1.0.0.orig/packer/core.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/core.go	2017-04-11 15:33:34.960673699 +0200
@@ -6,8 +6,8 @@
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-version"
-	"github.com/mitchellh/packer/template"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // Core is the main executor of Packer. If Packer is being used as a
diff -Nur packer-1.0.0.orig/packer/core_test.go packer-1.0.0/packer/core_test.go
--- packer-1.0.0.orig/packer/core_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/core_test.go	2017-04-11 15:33:34.964673689 +0200
@@ -6,8 +6,8 @@
 	"reflect"
 	"testing"
 
-	configHelper "github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/template"
+	configHelper "github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/template"
 )
 
 func TestCoreBuildNames(t *testing.T) {
diff -Nur packer-1.0.0.orig/packer/plugin/builder.go packer-1.0.0/packer/plugin/builder.go
--- packer-1.0.0.orig/packer/plugin/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/plugin/builder.go	2017-04-11 15:33:34.960673699 +0200
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/packer/plugin/client.go packer-1.0.0/packer/plugin/client.go
--- packer-1.0.0.orig/packer/plugin/client.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/plugin/client.go	2017-04-11 15:33:34.960673699 +0200
@@ -4,8 +4,8 @@
 	"bufio"
 	"errors"
 	"fmt"
-	"github.com/mitchellh/packer/packer"
-	packrpc "github.com/mitchellh/packer/packer/rpc"
+	"github.com/hashicorp/packer/packer"
+	packrpc "github.com/hashicorp/packer/packer/rpc"
 	"io"
 	"io/ioutil"
 	"log"
diff -Nur packer-1.0.0.orig/packer/plugin/hook.go packer-1.0.0/packer/plugin/hook.go
--- packer-1.0.0.orig/packer/plugin/hook.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/plugin/hook.go	2017-04-11 15:33:34.960673699 +0200
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/packer/plugin/plugin_test.go packer-1.0.0/packer/plugin/plugin_test.go
--- packer-1.0.0.orig/packer/plugin/plugin_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/plugin/plugin_test.go	2017-04-11 15:33:34.960673699 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"os"
 	"os/exec"
diff -Nur packer-1.0.0.orig/packer/plugin/post_processor.go packer-1.0.0/packer/plugin/post_processor.go
--- packer-1.0.0.orig/packer/plugin/post_processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/plugin/post_processor.go	2017-04-11 15:33:34.964673689 +0200
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/packer/plugin/post_processor_test.go packer-1.0.0/packer/plugin/post_processor_test.go
--- packer-1.0.0.orig/packer/plugin/post_processor_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/plugin/post_processor_test.go	2017-04-11 15:33:34.960673699 +0200
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"os/exec"
 	"testing"
 )
diff -Nur packer-1.0.0.orig/packer/plugin/provisioner.go packer-1.0.0/packer/plugin/provisioner.go
--- packer-1.0.0.orig/packer/plugin/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/plugin/provisioner.go	2017-04-11 15:33:34.964673689 +0200
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff -Nur packer-1.0.0.orig/packer/plugin/server.go packer-1.0.0/packer/plugin/server.go
--- packer-1.0.0.orig/packer/plugin/server.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/plugin/server.go	2017-04-11 15:33:34.964673689 +0200
@@ -10,7 +10,7 @@
 import (
 	"errors"
 	"fmt"
-	packrpc "github.com/mitchellh/packer/packer/rpc"
+	packrpc "github.com/hashicorp/packer/packer/rpc"
 	"io/ioutil"
 	"log"
 	"math/rand"
diff -Nur packer-1.0.0.orig/packer/rpc/artifact.go packer-1.0.0/packer/rpc/artifact.go
--- packer-1.0.0.orig/packer/rpc/artifact.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/artifact.go	2017-04-11 15:33:34.964673689 +0200
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"net/rpc"
 )
 
diff -Nur packer-1.0.0.orig/packer/rpc/artifact_test.go packer-1.0.0/packer/rpc/artifact_test.go
--- packer-1.0.0.orig/packer/rpc/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/artifact_test.go	2017-04-11 15:33:34.964673689 +0200
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"reflect"
 	"testing"
 )
diff -Nur packer-1.0.0.orig/packer/rpc/build.go packer-1.0.0/packer/rpc/build.go
--- packer-1.0.0.orig/packer/rpc/build.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/build.go	2017-04-11 15:33:34.976673660 +0200
@@ -3,7 +3,7 @@
 import (
 	"net/rpc"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // An implementation of packer.Build where the build is actually executed
diff -Nur packer-1.0.0.orig/packer/rpc/build_test.go packer-1.0.0/packer/rpc/build_test.go
--- packer-1.0.0.orig/packer/rpc/build_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/build_test.go	2017-04-11 15:33:34.964673689 +0200
@@ -5,7 +5,7 @@
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 var testBuildArtifact = &packer.MockArtifact{}
diff -Nur packer-1.0.0.orig/packer/rpc/builder.go packer-1.0.0/packer/rpc/builder.go
--- packer-1.0.0.orig/packer/rpc/builder.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/builder.go	2017-04-11 15:33:34.980673650 +0200
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"net/rpc"
 )
diff -Nur packer-1.0.0.orig/packer/rpc/builder_test.go packer-1.0.0/packer/rpc/builder_test.go
--- packer-1.0.0.orig/packer/rpc/builder_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/builder_test.go	2017-04-11 15:33:34.976673660 +0200
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"reflect"
 	"testing"
 )
diff -Nur packer-1.0.0.orig/packer/rpc/cache.go packer-1.0.0/packer/rpc/cache.go
--- packer-1.0.0.orig/packer/rpc/cache.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/cache.go	2017-04-11 15:33:34.980673650 +0200
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"net/rpc"
 )
diff -Nur packer-1.0.0.orig/packer/rpc/cache_test.go packer-1.0.0/packer/rpc/cache_test.go
--- packer-1.0.0.orig/packer/rpc/cache_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/cache_test.go	2017-04-11 15:33:34.980673650 +0200
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/packer/rpc/client.go packer-1.0.0/packer/rpc/client.go
--- packer-1.0.0.orig/packer/rpc/client.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/client.go	2017-04-11 15:33:34.980673650 +0200
@@ -5,7 +5,7 @@
 	"log"
 	"net/rpc"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/ugorji/go/codec"
 )
 
diff -Nur packer-1.0.0.orig/packer/rpc/communicator.go packer-1.0.0/packer/rpc/communicator.go
--- packer-1.0.0.orig/packer/rpc/communicator.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/communicator.go	2017-04-11 15:33:34.980673650 +0200
@@ -7,7 +7,7 @@
 	"net/rpc"
 	"os"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // An implementation of packer.Communicator where the communicator is actually
diff -Nur packer-1.0.0.orig/packer/rpc/communicator_test.go packer-1.0.0/packer/rpc/communicator_test.go
--- packer-1.0.0.orig/packer/rpc/communicator_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/communicator_test.go	2017-04-11 15:33:34.980673650 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"bufio"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io"
 	"reflect"
 	"testing"
diff -Nur packer-1.0.0.orig/packer/rpc/hook.go packer-1.0.0/packer/rpc/hook.go
--- packer-1.0.0.orig/packer/rpc/hook.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/hook.go	2017-04-11 15:33:34.980673650 +0200
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"net/rpc"
 )
diff -Nur packer-1.0.0.orig/packer/rpc/hook_test.go packer-1.0.0/packer/rpc/hook_test.go
--- packer-1.0.0.orig/packer/rpc/hook_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/hook_test.go	2017-04-11 15:33:34.980673650 +0200
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"reflect"
 	"sync"
 	"testing"
diff -Nur packer-1.0.0.orig/packer/rpc/post_processor.go packer-1.0.0/packer/rpc/post_processor.go
--- packer-1.0.0.orig/packer/rpc/post_processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/post_processor.go	2017-04-11 15:33:34.980673650 +0200
@@ -3,7 +3,7 @@
 import (
 	"net/rpc"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // An implementation of packer.PostProcessor where the PostProcessor is actually
diff -Nur packer-1.0.0.orig/packer/rpc/post_processor_test.go packer-1.0.0/packer/rpc/post_processor_test.go
--- packer-1.0.0.orig/packer/rpc/post_processor_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/post_processor_test.go	2017-04-11 15:33:34.980673650 +0200
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"reflect"
 	"testing"
 )
diff -Nur packer-1.0.0.orig/packer/rpc/provisioner.go packer-1.0.0/packer/rpc/provisioner.go
--- packer-1.0.0.orig/packer/rpc/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/provisioner.go	2017-04-11 15:33:34.980673650 +0200
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"net/rpc"
 )
diff -Nur packer-1.0.0.orig/packer/rpc/provisioner_test.go packer-1.0.0/packer/rpc/provisioner_test.go
--- packer-1.0.0.orig/packer/rpc/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/provisioner_test.go	2017-04-11 15:33:34.980673650 +0200
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"reflect"
 	"testing"
 )
diff -Nur packer-1.0.0.orig/packer/rpc/server.go packer-1.0.0/packer/rpc/server.go
--- packer-1.0.0.orig/packer/rpc/server.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/server.go	2017-04-11 15:33:34.984673640 +0200
@@ -5,7 +5,7 @@
 	"log"
 	"net/rpc"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/ugorji/go/codec"
 )
 
diff -Nur packer-1.0.0.orig/packer/rpc/ui.go packer-1.0.0/packer/rpc/ui.go
--- packer-1.0.0.orig/packer/rpc/ui.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/packer/rpc/ui.go	2017-04-11 15:33:34.984673640 +0200
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"net/rpc"
 )
diff -Nur packer-1.0.0.orig/panic.go packer-1.0.0/panic.go
--- packer-1.0.0.orig/panic.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/panic.go	2017-04-11 15:33:34.984673640 +0200
@@ -19,7 +19,7 @@
 working directory. It would be immensely helpful if you could please
 report the crash with Packer[1] so that we can fix this.
 
-[1]: https://github.com/mitchellh/packer/issues
+[1]: https://github.com/hashicorp/packer/issues
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!! PACKER CRASH !!!!!!!!!!!!!!!!!!!!!!!!!!!!
 `
diff -Nur packer-1.0.0.orig/plugin/example/main.go packer-1.0.0/plugin/example/main.go
--- packer-1.0.0.orig/plugin/example/main.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/plugin/example/main.go	2017-04-11 15:33:34.984673640 +0200
@@ -15,10 +15,10 @@
 package main
 
 import (
-	"github.com/mitchellh/packer/builder/amazon/chroot"
-	"github.com/mitchellh/packer/packer/plugin"
-	"github.com/mitchellh/packer/post-processor/docker-push"
-	"github.com/mitchellh/packer/provisioner/powershell"
+	"github.com/hashicorp/packer/builder/amazon/chroot"
+	"github.com/hashicorp/packer/packer/plugin"
+	"github.com/hashicorp/packer/post-processor/docker-push"
+	"github.com/hashicorp/packer/provisioner/powershell"
 )
 
 func main() {
diff -Nur packer-1.0.0.orig/post-processor/amazon-import/post-processor.go packer-1.0.0/post-processor/amazon-import/post-processor.go
--- packer-1.0.0.orig/post-processor/amazon-import/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/amazon-import/post-processor.go	2017-04-11 15:33:34.984673640 +0200
@@ -11,11 +11,11 @@
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const BuilderId = "packer.post-processor.amazon-import"
diff -Nur packer-1.0.0.orig/post-processor/artifice/post-processor.go packer-1.0.0/post-processor/artifice/post-processor.go
--- packer-1.0.0.orig/post-processor/artifice/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/artifice/post-processor.go	2017-04-11 15:33:34.984673640 +0200
@@ -4,10 +4,10 @@
 	"fmt"
 	"strings"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // The artifact-override post-processor allows you to specify arbitrary files as
diff -Nur packer-1.0.0.orig/post-processor/atlas/post-processor.go packer-1.0.0/post-processor/atlas/post-processor.go
--- packer-1.0.0.orig/post-processor/atlas/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/atlas/post-processor.go	2017-04-11 15:33:34.988673631 +0200
@@ -9,10 +9,10 @@
 	"github.com/hashicorp/atlas-go/archive"
 	"github.com/hashicorp/atlas-go/v1"
 	"github.com/mitchellh/mapstructure"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const (
diff -Nur packer-1.0.0.orig/post-processor/atlas/post-processor_test.go packer-1.0.0/post-processor/atlas/post-processor_test.go
--- packer-1.0.0.orig/post-processor/atlas/post-processor_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/atlas/post-processor_test.go	2017-04-11 15:33:34.984673640 +0200
@@ -5,7 +5,7 @@
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestPostProcessorConfigure(t *testing.T) {
diff -Nur packer-1.0.0.orig/post-processor/checksum/post-processor.go packer-1.0.0/post-processor/checksum/post-processor.go
--- packer-1.0.0.orig/post-processor/checksum/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/checksum/post-processor.go	2017-04-11 15:33:34.992673620 +0200
@@ -11,10 +11,10 @@
 	"os"
 	"path/filepath"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/post-processor/checksum/post-processor_test.go packer-1.0.0/post-processor/checksum/post-processor_test.go
--- packer-1.0.0.orig/post-processor/checksum/post-processor_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/checksum/post-processor_test.go	2017-04-11 15:33:34.992673620 +0200
@@ -8,9 +8,9 @@
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/builder/file"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template"
+	"github.com/hashicorp/packer/builder/file"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template"
 )
 
 const expectedFileContents = "Hello world!"
diff -Nur packer-1.0.0.orig/post-processor/compress/artifact_test.go packer-1.0.0/post-processor/compress/artifact_test.go
--- packer-1.0.0.orig/post-processor/compress/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/compress/artifact_test.go	2017-04-11 15:33:34.992673620 +0200
@@ -1,7 +1,7 @@
 package compress
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/post-processor/compress/post-processor.go packer-1.0.0/post-processor/compress/post-processor.go
--- packer-1.0.0.orig/post-processor/compress/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/compress/post-processor.go	2017-04-11 15:33:34.992673620 +0200
@@ -13,10 +13,10 @@
 
 	"github.com/biogo/hts/bgzf"
 	"github.com/klauspost/pgzip"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/pierrec/lz4"
 )
 
diff -Nur packer-1.0.0.orig/post-processor/compress/post-processor_test.go packer-1.0.0/post-processor/compress/post-processor_test.go
--- packer-1.0.0.orig/post-processor/compress/post-processor_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/compress/post-processor_test.go	2017-04-11 15:33:34.992673620 +0200
@@ -8,9 +8,9 @@
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/builder/file"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template"
+	"github.com/hashicorp/packer/builder/file"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template"
 )
 
 func TestDetectFilename(t *testing.T) {
diff -Nur packer-1.0.0.orig/post-processor/docker-import/post-processor.go packer-1.0.0/post-processor/docker-import/post-processor.go
--- packer-1.0.0.orig/post-processor/docker-import/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/docker-import/post-processor.go	2017-04-11 15:28:24.877446753 +0200
@@ -3,12 +3,12 @@
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/builder/docker"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/post-processor/artifice"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/post-processor/artifice"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const BuilderId = "packer.post-processor.docker-import"
diff -Nur packer-1.0.0.orig/post-processor/docker-import/post-processor_test.go packer-1.0.0/post-processor/docker-import/post-processor_test.go
--- packer-1.0.0.orig/post-processor/docker-import/post-processor_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/docker-import/post-processor_test.go	2017-04-11 15:33:34.992673620 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"bytes"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/post-processor/docker-push/post-processor.go packer-1.0.0/post-processor/docker-push/post-processor.go
--- packer-1.0.0.orig/post-processor/docker-push/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/docker-push/post-processor.go	2017-04-11 15:33:34.992673620 +0200
@@ -3,13 +3,13 @@
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/builder/docker"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/post-processor/docker-import"
-	"github.com/mitchellh/packer/post-processor/docker-tag"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/post-processor/docker-import"
+	"github.com/hashicorp/packer/post-processor/docker-tag"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/post-processor/docker-push/post-processor_test.go packer-1.0.0/post-processor/docker-push/post-processor_test.go
--- packer-1.0.0.orig/post-processor/docker-push/post-processor_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/docker-push/post-processor_test.go	2017-04-11 15:33:34.992673620 +0200
@@ -2,9 +2,9 @@
 
 import (
 	"bytes"
-	"github.com/mitchellh/packer/builder/docker"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/post-processor/docker-import"
+	"github.com/hashicorp/packer/builder/docker"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/post-processor/docker-import"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/post-processor/docker-save/post-processor.go packer-1.0.0/post-processor/docker-save/post-processor.go
--- packer-1.0.0.orig/post-processor/docker-save/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/docker-save/post-processor.go	2017-04-11 15:33:34.996673611 +0200
@@ -4,13 +4,13 @@
 	"fmt"
 	"os"
 
-	"github.com/mitchellh/packer/builder/docker"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/post-processor/docker-import"
-	"github.com/mitchellh/packer/post-processor/docker-tag"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/post-processor/docker-import"
+	"github.com/hashicorp/packer/post-processor/docker-tag"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const BuilderId = "packer.post-processor.docker-save"
diff -Nur packer-1.0.0.orig/post-processor/docker-save/post-processor_test.go packer-1.0.0/post-processor/docker-save/post-processor_test.go
--- packer-1.0.0.orig/post-processor/docker-save/post-processor_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/docker-save/post-processor_test.go	2017-04-11 15:33:34.992673620 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"bytes"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/post-processor/docker-tag/post-processor.go packer-1.0.0/post-processor/docker-tag/post-processor.go
--- packer-1.0.0.orig/post-processor/docker-tag/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/docker-tag/post-processor.go	2017-04-11 15:33:35.000673601 +0200
@@ -3,12 +3,12 @@
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/builder/docker"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/post-processor/docker-import"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/post-processor/docker-import"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const BuilderId = "packer.post-processor.docker-tag"
diff -Nur packer-1.0.0.orig/post-processor/docker-tag/post-processor_test.go packer-1.0.0/post-processor/docker-tag/post-processor_test.go
--- packer-1.0.0.orig/post-processor/docker-tag/post-processor_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/docker-tag/post-processor_test.go	2017-04-11 15:33:34.996673611 +0200
@@ -4,9 +4,9 @@
 	"bytes"
 	"testing"
 
-	"github.com/mitchellh/packer/builder/docker"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/post-processor/docker-import"
+	"github.com/hashicorp/packer/builder/docker"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/post-processor/docker-import"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/post-processor/googlecompute-export/post-processor.go packer-1.0.0/post-processor/googlecompute-export/post-processor.go
--- packer-1.0.0.orig/post-processor/googlecompute-export/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/googlecompute-export/post-processor.go	2017-04-11 15:28:36.993415934 +0200
@@ -6,11 +6,11 @@
 	"strings"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/googlecompute"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/post-processor/manifest/post-processor.go packer-1.0.0/post-processor/manifest/post-processor.go
--- packer-1.0.0.orig/post-processor/manifest/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/manifest/post-processor.go	2017-04-11 15:33:35.000673601 +0200
@@ -9,10 +9,10 @@
 	"path/filepath"
 	"time"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/post-processor/shell-local/communicator.go packer-1.0.0/post-processor/shell-local/communicator.go
--- packer-1.0.0.orig/post-processor/shell-local/communicator.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/shell-local/communicator.go	2017-04-11 15:33:35.000673601 +0200
@@ -7,7 +7,7 @@
 	"os/exec"
 	"syscall"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type Communicator struct{}
diff -Nur packer-1.0.0.orig/post-processor/shell-local/communicator_test.go packer-1.0.0/post-processor/shell-local/communicator_test.go
--- packer-1.0.0.orig/post-processor/shell-local/communicator_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/shell-local/communicator_test.go	2017-04-11 15:33:35.000673601 +0200
@@ -6,7 +6,7 @@
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestCommunicator_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/post-processor/shell-local/post-processor.go packer-1.0.0/post-processor/shell-local/post-processor.go
--- packer-1.0.0.orig/post-processor/shell-local/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/shell-local/post-processor.go	2017-04-11 15:33:35.000673601 +0200
@@ -10,10 +10,10 @@
 	"sort"
 	"strings"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/post-processor/shell-local/post-processor_test.go packer-1.0.0/post-processor/shell-local/post-processor_test.go
--- packer-1.0.0.orig/post-processor/shell-local/post-processor_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/shell-local/post-processor_test.go	2017-04-11 15:33:35.000673601 +0200
@@ -1,7 +1,7 @@
 package shell_local
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"testing"
diff -Nur packer-1.0.0.orig/post-processor/vagrant/artifact_test.go packer-1.0.0/post-processor/vagrant/artifact_test.go
--- packer-1.0.0.orig/post-processor/vagrant/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/artifact_test.go	2017-04-11 15:33:35.016673562 +0200
@@ -1,7 +1,7 @@
 package vagrant
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/post-processor/vagrant/aws.go packer-1.0.0/post-processor/vagrant/aws.go
--- packer-1.0.0.orig/post-processor/vagrant/aws.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/aws.go	2017-04-11 15:33:35.016673562 +0200
@@ -6,7 +6,7 @@
 	"strings"
 	"text/template"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type AWSProvider struct{}
diff -Nur packer-1.0.0.orig/post-processor/vagrant/aws_test.go packer-1.0.0/post-processor/vagrant/aws_test.go
--- packer-1.0.0.orig/post-processor/vagrant/aws_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/aws_test.go	2017-04-11 15:33:35.016673562 +0200
@@ -4,7 +4,7 @@
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestAWSProvider_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/post-processor/vagrant/digitalocean.go packer-1.0.0/post-processor/vagrant/digitalocean.go
--- packer-1.0.0.orig/post-processor/vagrant/digitalocean.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/digitalocean.go	2017-04-11 15:33:35.016673562 +0200
@@ -3,7 +3,7 @@
 import (
 	"bytes"
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"strings"
 	"text/template"
 )
diff -Nur packer-1.0.0.orig/post-processor/vagrant/digitalocean_test.go packer-1.0.0/post-processor/vagrant/digitalocean_test.go
--- packer-1.0.0.orig/post-processor/vagrant/digitalocean_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/digitalocean_test.go	2017-04-11 15:33:35.016673562 +0200
@@ -4,7 +4,7 @@
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestDigitalOceanProvider_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/post-processor/vagrant/hyperv.go packer-1.0.0/post-processor/vagrant/hyperv.go
--- packer-1.0.0.orig/post-processor/vagrant/hyperv.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/hyperv.go	2017-04-11 15:33:35.016673562 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"os"
 	"path/filepath"
 	"strings"
diff -Nur packer-1.0.0.orig/post-processor/vagrant/libvirt.go packer-1.0.0/post-processor/vagrant/libvirt.go
--- packer-1.0.0.orig/post-processor/vagrant/libvirt.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/libvirt.go	2017-04-11 15:33:35.016673562 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"path/filepath"
 	"strings"
 )
diff -Nur packer-1.0.0.orig/post-processor/vagrant/parallels.go packer-1.0.0/post-processor/vagrant/parallels.go
--- packer-1.0.0.orig/post-processor/vagrant/parallels.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/parallels.go	2017-04-11 15:33:35.016673562 +0200
@@ -5,7 +5,7 @@
 	"path/filepath"
 	"regexp"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // These are the extensions of files and directories that are unnecessary for the function
diff -Nur packer-1.0.0.orig/post-processor/vagrant/post-processor.go packer-1.0.0/post-processor/vagrant/post-processor.go
--- packer-1.0.0.orig/post-processor/vagrant/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/post-processor.go	2017-04-11 15:33:35.020673552 +0200
@@ -12,10 +12,10 @@
 	"text/template"
 
 	"github.com/mitchellh/mapstructure"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 var builtins = map[string]string{
diff -Nur packer-1.0.0.orig/post-processor/vagrant/post-processor_test.go packer-1.0.0/post-processor/vagrant/post-processor_test.go
--- packer-1.0.0.orig/post-processor/vagrant/post-processor_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/post-processor_test.go	2017-04-11 15:33:35.016673562 +0200
@@ -3,7 +3,7 @@
 import (
 	"bytes"
 	"compress/flate"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"strings"
diff -Nur packer-1.0.0.orig/post-processor/vagrant/provider.go packer-1.0.0/post-processor/vagrant/provider.go
--- packer-1.0.0.orig/post-processor/vagrant/provider.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/provider.go	2017-04-11 15:33:35.020673552 +0200
@@ -1,7 +1,7 @@
 package vagrant
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // Provider is the interface that each provider must implement in order
diff -Nur packer-1.0.0.orig/post-processor/vagrant/util.go packer-1.0.0/post-processor/vagrant/util.go
--- packer-1.0.0.orig/post-processor/vagrant/util.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/util.go	2017-04-11 15:33:35.020673552 +0200
@@ -12,7 +12,7 @@
 	"runtime"
 
 	"github.com/klauspost/pgzip"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 var (
diff -Nur packer-1.0.0.orig/post-processor/vagrant/virtualbox.go packer-1.0.0/post-processor/vagrant/virtualbox.go
--- packer-1.0.0.orig/post-processor/vagrant/virtualbox.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/virtualbox.go	2017-04-11 15:33:35.020673552 +0200
@@ -4,7 +4,7 @@
 	"archive/tar"
 	"errors"
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io"
 	"io/ioutil"
 	"log"
diff -Nur packer-1.0.0.orig/post-processor/vagrant/vmware.go packer-1.0.0/post-processor/vagrant/vmware.go
--- packer-1.0.0.orig/post-processor/vagrant/vmware.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant/vmware.go	2017-04-11 15:33:35.036673513 +0200
@@ -2,7 +2,7 @@
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"path/filepath"
 )
 
diff -Nur packer-1.0.0.orig/post-processor/vagrant-cloud/artifact_test.go packer-1.0.0/post-processor/vagrant-cloud/artifact_test.go
--- packer-1.0.0.orig/post-processor/vagrant-cloud/artifact_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant-cloud/artifact_test.go	2017-04-11 15:33:35.004673591 +0200
@@ -1,7 +1,7 @@
 package vagrantcloud
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff -Nur packer-1.0.0.orig/post-processor/vagrant-cloud/post-processor.go packer-1.0.0/post-processor/vagrant-cloud/post-processor.go
--- packer-1.0.0.orig/post-processor/vagrant-cloud/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant-cloud/post-processor.go	2017-04-11 15:33:35.012673572 +0200
@@ -10,10 +10,10 @@
 	"strings"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const VAGRANT_CLOUD_URL = "https://vagrantcloud.com/api/v1"
diff -Nur packer-1.0.0.orig/post-processor/vagrant-cloud/post-processor_test.go packer-1.0.0/post-processor/vagrant-cloud/post-processor_test.go
--- packer-1.0.0.orig/post-processor/vagrant-cloud/post-processor_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant-cloud/post-processor_test.go	2017-04-11 15:33:35.004673591 +0200
@@ -4,7 +4,7 @@
 	"bytes"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testGoodConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/post-processor/vagrant-cloud/step_create_provider.go packer-1.0.0/post-processor/vagrant-cloud/step_create_provider.go
--- packer-1.0.0.orig/post-processor/vagrant-cloud/step_create_provider.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant-cloud/step_create_provider.go	2017-04-11 15:33:35.012673572 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type Provider struct {
diff -Nur packer-1.0.0.orig/post-processor/vagrant-cloud/step_create_version.go packer-1.0.0/post-processor/vagrant-cloud/step_create_version.go
--- packer-1.0.0.orig/post-processor/vagrant-cloud/step_create_version.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant-cloud/step_create_version.go	2017-04-11 15:33:35.012673572 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type Version struct {
diff -Nur packer-1.0.0.orig/post-processor/vagrant-cloud/step_prepare_upload.go packer-1.0.0/post-processor/vagrant-cloud/step_prepare_upload.go
--- packer-1.0.0.orig/post-processor/vagrant-cloud/step_prepare_upload.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant-cloud/step_prepare_upload.go	2017-04-11 15:33:35.012673572 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type Upload struct {
diff -Nur packer-1.0.0.orig/post-processor/vagrant-cloud/step_release_version.go packer-1.0.0/post-processor/vagrant-cloud/step_release_version.go
--- packer-1.0.0.orig/post-processor/vagrant-cloud/step_release_version.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant-cloud/step_release_version.go	2017-04-11 15:33:35.012673572 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"strings"
 )
 
diff -Nur packer-1.0.0.orig/post-processor/vagrant-cloud/step_upload.go packer-1.0.0/post-processor/vagrant-cloud/step_upload.go
--- packer-1.0.0.orig/post-processor/vagrant-cloud/step_upload.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant-cloud/step_upload.go	2017-04-11 15:33:35.012673572 +0200
@@ -5,7 +5,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepUpload struct {
diff -Nur packer-1.0.0.orig/post-processor/vagrant-cloud/step_verify_box.go packer-1.0.0/post-processor/vagrant-cloud/step_verify_box.go
--- packer-1.0.0.orig/post-processor/vagrant-cloud/step_verify_box.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant-cloud/step_verify_box.go	2017-04-11 15:33:35.016673562 +0200
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type Box struct {
diff -Nur packer-1.0.0.orig/post-processor/vagrant-cloud/step_verify_upload.go packer-1.0.0/post-processor/vagrant-cloud/step_verify_upload.go
--- packer-1.0.0.orig/post-processor/vagrant-cloud/step_verify_upload.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vagrant-cloud/step_verify_upload.go	2017-04-11 15:33:35.016673562 +0200
@@ -6,7 +6,7 @@
 	"time"
 
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepVerifyUpload struct {
diff -Nur packer-1.0.0.orig/post-processor/vsphere/post-processor.go packer-1.0.0/post-processor/vsphere/post-processor.go
--- packer-1.0.0.orig/post-processor/vsphere/post-processor.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/post-processor/vsphere/post-processor.go	2017-04-11 15:33:35.036673513 +0200
@@ -8,10 +8,10 @@
 	"os/exec"
 	"strings"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 var builtins = map[string]string{
diff -Nur packer-1.0.0.orig/provisioner/ansible/adapter.go packer-1.0.0/provisioner/ansible/adapter.go
--- packer-1.0.0.orig/provisioner/ansible/adapter.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/ansible/adapter.go	2017-04-11 15:33:35.052673474 +0200
@@ -11,7 +11,7 @@
 	"strings"
 
 	"github.com/google/shlex"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
diff -Nur packer-1.0.0.orig/provisioner/ansible/adapter_test.go packer-1.0.0/provisioner/ansible/adapter_test.go
--- packer-1.0.0.orig/provisioner/ansible/adapter_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/ansible/adapter_test.go	2017-04-11 15:33:35.052673474 +0200
@@ -9,7 +9,7 @@
 	"testing"
 	"time"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 
 	"golang.org/x/crypto/ssh"
 )
diff -Nur packer-1.0.0.orig/provisioner/ansible/provisioner.go packer-1.0.0/provisioner/ansible/provisioner.go
--- packer-1.0.0.orig/provisioner/ansible/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/ansible/provisioner.go	2017-04-11 15:33:35.060673455 +0200
@@ -24,10 +24,10 @@
 
 	"golang.org/x/crypto/ssh"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/provisioner/ansible/provisioner_test.go packer-1.0.0/provisioner/ansible/provisioner_test.go
--- packer-1.0.0.orig/provisioner/ansible/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/ansible/provisioner_test.go	2017-04-11 15:33:35.052673474 +0200
@@ -11,7 +11,7 @@
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // Be sure to remove the Ansible stub file in each test with:
diff -Nur packer-1.0.0.orig/provisioner/ansible/scp.go packer-1.0.0/provisioner/ansible/scp.go
--- packer-1.0.0.orig/provisioner/ansible/scp.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/ansible/scp.go	2017-04-11 15:33:35.056673464 +0200
@@ -13,7 +13,7 @@
 	"strings"
 	"time"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 const (
diff -Nur packer-1.0.0.orig/provisioner/ansible-local/provisioner.go packer-1.0.0/provisioner/ansible-local/provisioner.go
--- packer-1.0.0.orig/provisioner/ansible-local/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/ansible-local/provisioner.go	2017-04-11 15:33:35.060673455 +0200
@@ -7,11 +7,11 @@
 	"path/filepath"
 	"strings"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/template/interpolate"
 )
 
 const DefaultStagingDir = "/tmp/packer-provisioner-ansible-local"
diff -Nur packer-1.0.0.orig/provisioner/ansible-local/provisioner_test.go packer-1.0.0/provisioner/ansible-local/provisioner_test.go
--- packer-1.0.0.orig/provisioner/ansible-local/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/ansible-local/provisioner_test.go	2017-04-11 15:33:35.048673484 +0200
@@ -7,7 +7,7 @@
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/provisioner/chef-client/provisioner.go packer-1.0.0/provisioner/chef-client/provisioner.go
--- packer-1.0.0.orig/provisioner/chef-client/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/chef-client/provisioner.go	2017-04-11 15:33:35.064673444 +0200
@@ -12,12 +12,12 @@
 	"path/filepath"
 	"strings"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/provisioner"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/provisioner"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type guestOSTypeConfig struct {
diff -Nur packer-1.0.0.orig/provisioner/chef-client/provisioner_test.go packer-1.0.0/provisioner/chef-client/provisioner_test.go
--- packer-1.0.0.orig/provisioner/chef-client/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/chef-client/provisioner_test.go	2017-04-11 15:33:35.060673455 +0200
@@ -7,7 +7,7 @@
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/provisioner/chef-solo/provisioner.go packer-1.0.0/provisioner/chef-solo/provisioner.go
--- packer-1.0.0.orig/provisioner/chef-solo/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/chef-solo/provisioner.go	2017-04-11 15:33:35.064673444 +0200
@@ -12,11 +12,11 @@
 	"path/filepath"
 	"strings"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/provisioner"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/provisioner"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type guestOSTypeConfig struct {
diff -Nur packer-1.0.0.orig/provisioner/chef-solo/provisioner_test.go packer-1.0.0/provisioner/chef-solo/provisioner_test.go
--- packer-1.0.0.orig/provisioner/chef-solo/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/chef-solo/provisioner_test.go	2017-04-11 15:33:35.060673455 +0200
@@ -1,7 +1,7 @@
 package chefsolo
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"testing"
diff -Nur packer-1.0.0.orig/provisioner/converge/provisioner.go packer-1.0.0/provisioner/converge/provisioner.go
--- packer-1.0.0.orig/provisioner/converge/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/converge/provisioner.go	2017-04-11 15:33:35.060673455 +0200
@@ -12,10 +12,10 @@
 
 	"encoding/json"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // Config for Converge provisioner
diff -Nur packer-1.0.0.orig/provisioner/converge/provisioner_test.go packer-1.0.0/provisioner/converge/provisioner_test.go
--- packer-1.0.0.orig/provisioner/converge/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/converge/provisioner_test.go	2017-04-11 15:33:35.060673455 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/provisioner/file/provisioner.go packer-1.0.0/provisioner/file/provisioner.go
--- packer-1.0.0.orig/provisioner/file/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/file/provisioner.go	2017-04-11 15:33:35.064673444 +0200
@@ -7,10 +7,10 @@
 	"path/filepath"
 	"strings"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/provisioner/file/provisioner_test.go packer-1.0.0/provisioner/file/provisioner_test.go
--- packer-1.0.0.orig/provisioner/file/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/file/provisioner_test.go	2017-04-11 15:33:35.060673455 +0200
@@ -7,7 +7,7 @@
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/provisioner/powershell/provisioner.go packer-1.0.0/provisioner/powershell/provisioner.go
--- packer-1.0.0.orig/provisioner/powershell/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/powershell/provisioner.go	2017-04-11 15:33:35.076673415 +0200
@@ -14,11 +14,11 @@
 	"strings"
 	"time"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"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/template/interpolate"
 )
 
 const DefaultRemotePath = "c:/Windows/Temp/script.ps1"
diff -Nur packer-1.0.0.orig/provisioner/powershell/provisioner_test.go packer-1.0.0/provisioner/powershell/provisioner_test.go
--- packer-1.0.0.orig/provisioner/powershell/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/powershell/provisioner_test.go	2017-04-11 15:33:35.100673358 +0200
@@ -12,7 +12,7 @@
 	"testing"
 	"time"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/provisioner/puppet-masterless/provisioner.go packer-1.0.0/provisioner/puppet-masterless/provisioner.go
--- packer-1.0.0.orig/provisioner/puppet-masterless/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/puppet-masterless/provisioner.go	2017-04-11 15:33:35.116673318 +0200
@@ -9,10 +9,10 @@
 	"path/filepath"
 	"strings"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/provisioner/puppet-masterless/provisioner_test.go packer-1.0.0/provisioner/puppet-masterless/provisioner_test.go
--- packer-1.0.0.orig/provisioner/puppet-masterless/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/puppet-masterless/provisioner_test.go	2017-04-11 15:33:35.072673425 +0200
@@ -6,7 +6,7 @@
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/provisioner/puppet-server/provisioner.go packer-1.0.0/provisioner/puppet-server/provisioner.go
--- packer-1.0.0.orig/provisioner/puppet-server/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/puppet-server/provisioner.go	2017-04-11 15:33:35.104673347 +0200
@@ -7,10 +7,10 @@
 	"os"
 	"strings"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/provisioner/puppet-server/provisioner_test.go packer-1.0.0/provisioner/puppet-server/provisioner_test.go
--- packer-1.0.0.orig/provisioner/puppet-server/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/puppet-server/provisioner_test.go	2017-04-11 15:33:35.104673347 +0200
@@ -1,7 +1,7 @@
 package puppetserver
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"testing"
diff -Nur packer-1.0.0.orig/provisioner/salt-masterless/provisioner.go packer-1.0.0/provisioner/salt-masterless/provisioner.go
--- packer-1.0.0.orig/provisioner/salt-masterless/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/salt-masterless/provisioner.go	2017-04-11 15:33:35.116673318 +0200
@@ -9,10 +9,10 @@
 	"os"
 	"path/filepath"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const DefaultTempConfigDir = "/tmp/salt"
diff -Nur packer-1.0.0.orig/provisioner/salt-masterless/provisioner_test.go packer-1.0.0/provisioner/salt-masterless/provisioner_test.go
--- packer-1.0.0.orig/provisioner/salt-masterless/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/salt-masterless/provisioner_test.go	2017-04-11 15:33:35.104673347 +0200
@@ -1,7 +1,7 @@
 package saltmasterless
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"strings"
diff -Nur packer-1.0.0.orig/provisioner/shell/provisioner.go packer-1.0.0/provisioner/shell/provisioner.go
--- packer-1.0.0.orig/provisioner/shell/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/shell/provisioner.go	2017-04-11 15:33:35.116673318 +0200
@@ -15,10 +15,10 @@
 	"strings"
 	"time"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/provisioner/shell/provisioner_test.go packer-1.0.0/provisioner/shell/provisioner_test.go
--- packer-1.0.0.orig/provisioner/shell/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/shell/provisioner_test.go	2017-04-11 15:33:35.116673318 +0200
@@ -1,7 +1,7 @@
 package shell
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"regexp"
diff -Nur packer-1.0.0.orig/provisioner/shell-local/communicator.go packer-1.0.0/provisioner/shell-local/communicator.go
--- packer-1.0.0.orig/provisioner/shell-local/communicator.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/shell-local/communicator.go	2017-04-11 15:33:35.116673318 +0200
@@ -7,8 +7,8 @@
 	"os/exec"
 	"syscall"
 
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Communicator struct {
diff -Nur packer-1.0.0.orig/provisioner/shell-local/communicator_test.go packer-1.0.0/provisioner/shell-local/communicator_test.go
--- packer-1.0.0.orig/provisioner/shell-local/communicator_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/shell-local/communicator_test.go	2017-04-11 15:33:35.116673318 +0200
@@ -6,7 +6,7 @@
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestCommunicator_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/provisioner/shell-local/provisioner.go packer-1.0.0/provisioner/shell-local/provisioner.go
--- packer-1.0.0.orig/provisioner/shell-local/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/shell-local/provisioner.go	2017-04-11 15:33:35.116673318 +0200
@@ -5,10 +5,10 @@
 	"fmt"
 	"runtime"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Config struct {
diff -Nur packer-1.0.0.orig/provisioner/shell-local/provisioner_test.go packer-1.0.0/provisioner/shell-local/provisioner_test.go
--- packer-1.0.0.orig/provisioner/shell-local/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/shell-local/provisioner_test.go	2017-04-11 15:33:35.116673318 +0200
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestProvisioner_impl(t *testing.T) {
diff -Nur packer-1.0.0.orig/provisioner/windows-restart/provisioner.go packer-1.0.0/provisioner/windows-restart/provisioner.go
--- packer-1.0.0.orig/provisioner/windows-restart/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/windows-restart/provisioner.go	2017-04-11 15:33:35.116673318 +0200
@@ -7,10 +7,10 @@
 	"time"
 
 	"github.com/masterzen/winrm"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 var DefaultRestartCommand = "shutdown /r /f /t 0 /c \"packer restart\""
diff -Nur packer-1.0.0.orig/provisioner/windows-restart/provisioner_test.go packer-1.0.0/provisioner/windows-restart/provisioner_test.go
--- packer-1.0.0.orig/provisioner/windows-restart/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/windows-restart/provisioner_test.go	2017-04-11 15:33:35.116673318 +0200
@@ -7,7 +7,7 @@
 	"testing"
 	"time"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff -Nur packer-1.0.0.orig/provisioner/windows-shell/provisioner.go packer-1.0.0/provisioner/windows-shell/provisioner.go
--- packer-1.0.0.orig/provisioner/windows-shell/provisioner.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/windows-shell/provisioner.go	2017-04-11 15:33:35.116673318 +0200
@@ -13,10 +13,10 @@
 	"strings"
 	"time"
 
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/config"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const DefaultRemotePath = "c:/Windows/Temp/script.bat"
diff -Nur packer-1.0.0.orig/provisioner/windows-shell/provisioner_test.go packer-1.0.0/provisioner/windows-shell/provisioner_test.go
--- packer-1.0.0.orig/provisioner/windows-shell/provisioner_test.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/provisioner/windows-shell/provisioner_test.go	2017-04-11 15:33:35.116673318 +0200
@@ -4,7 +4,7 @@
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"log"
 	"os"
diff -Nur packer-1.0.0.orig/scripts/generate-plugins.go packer-1.0.0/scripts/generate-plugins.go
--- packer-1.0.0.orig/scripts/generate-plugins.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/scripts/generate-plugins.go	2017-04-11 15:33:35.116673318 +0200
@@ -1,7 +1,7 @@
 // Generate Plugins is a small program that updates the lists of plugins in
 // command/plugin.go so they will be compiled into the main packer binary.
 //
-// See https://github.com/mitchellh/packer/pull/2608 for details.
+// See https://github.com/hashicorp/packer/pull/2608 for details.
 package main
 
 import (
@@ -96,15 +96,15 @@
 	plugins := []string{}
 
 	for _, builder := range builders {
-		plugins = append(plugins, fmt.Sprintf("\t%s \"github.com/mitchellh/packer/%s\"\n", builder.ImportName, filepath.ToSlash(builder.Path)))
+		plugins = append(plugins, fmt.Sprintf("\t%s \"github.com/hashicorp/packer/%s\"\n", builder.ImportName, filepath.ToSlash(builder.Path)))
 	}
 
 	for _, provisioner := range provisioners {
-		plugins = append(plugins, fmt.Sprintf("\t%s \"github.com/mitchellh/packer/%s\"\n", provisioner.ImportName, filepath.ToSlash(provisioner.Path)))
+		plugins = append(plugins, fmt.Sprintf("\t%s \"github.com/hashicorp/packer/%s\"\n", provisioner.ImportName, filepath.ToSlash(provisioner.Path)))
 	}
 
 	for _, postProcessor := range postProcessors {
-		plugins = append(plugins, fmt.Sprintf("\t%s \"github.com/mitchellh/packer/%s\"\n", postProcessor.ImportName, filepath.ToSlash(postProcessor.Path)))
+		plugins = append(plugins, fmt.Sprintf("\t%s \"github.com/hashicorp/packer/%s\"\n", postProcessor.ImportName, filepath.ToSlash(postProcessor.Path)))
 	}
 
 	// Make things pretty
@@ -238,8 +238,8 @@
 	"regexp"
 	"strings"
 
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/packer/plugin"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer/plugin"
 
 IMPORTS
 )
diff -Nur packer-1.0.0.orig/template/interpolate/funcs.go packer-1.0.0/template/interpolate/funcs.go
--- packer-1.0.0.orig/template/interpolate/funcs.go	2017-04-04 22:05:41.000000000 +0200
+++ packer-1.0.0/template/interpolate/funcs.go	2017-04-11 15:33:35.116673318 +0200
@@ -10,7 +10,7 @@
 	"text/template"
 	"time"
 
-	"github.com/mitchellh/packer/common/uuid"
+	"github.com/hashicorp/packer/common/uuid"
 )
 
 // InitTime is the UTC time when this package was initialized. It is

Places

File hashicorp-move-importpath.patch of Package golang-github-hashicorp-packer (Revision f96c3548583696fa78824dcae1d144b2)

Places