diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5fc387f5820..e6881a2d318 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,8 +4,8 @@ Describe the change you are making here!
 
 Please include tests. Check out these examples:
 
-- https://github.com/mitchellh/packer/blob/master/builder/virtualbox/common/ssh_config_test.go#L19-L37
-- https://github.com/mitchellh/packer/blob/master/post-processor/compress/post-processor_test.go#L153-L182
+- https://github.com/hashicorp/packer/blob/master/builder/virtualbox/common/ssh_config_test.go#L19-L37
+- https://github.com/hashicorp/packer/blob/master/post-processor/compress/post-processor_test.go#L153-L182
 
 If your PR resolves any open issue(s), please indicate them like this so they will be closed when your PR is merged:
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 131c27256ed..882a15dfe28 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -78,8 +78,8 @@ following steps in order to be able to compile and test Packer. These instructio
    rebuilding. If you don't have `make` you can simply run `go build -o bin/packer .` from the project root.
 
 6. After running building packer successfully, use
-   `$GOPATH/src/github.com/mitchellh/packer/bin/packer` to build a machine and
-   verify your changes work. For instance: `$GOPATH/src/github.com/mitchellh/packer/bin/packer build template.json`.
+   `$GOPATH/src/github.com/hashicorp/packer/bin/packer` to build a machine and
+   verify your changes work. For instance: `$GOPATH/src/github.com/hashicorp/packer/bin/packer build template.json`.
 
 7. If everything works well and the tests pass, run `go fmt` on your code
    before submitting a pull-request.
diff --git a/README.md b/README.md
index 6c767ce49c8..3f11bb82d7e 100644
--- a/README.md
+++ b/README.md
@@ -107,4 +107,4 @@ http://www.packer.io/docs
 
 ## Developing Packer
 
-See [CONTRIBUTING.md](https://github.com/mitchellh/packer/blob/master/CONTRIBUTING.md) for best practices and instructions on setting up your development environment to work on Packer.
+See [CONTRIBUTING.md](https://github.com/hashicorp/packer/blob/master/CONTRIBUTING.md) for best practices and instructions on setting up your development environment to work on Packer.
diff --git a/appveyor.yml b/appveyor.yml
index 516d58cccae..ecdff4f91ac 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,9 +29,9 @@ build_script:
   - ps: |
       go.exe test (go.exe list ./... `
       |? { -not $_.Contains('/vendor/') } `
-      |? { $_ -ne 'github.com/mitchellh/packer/builder/parallels/common' } `
-      |? { $_ -ne 'github.com/mitchellh/packer/common' }`
-      |? { $_ -ne 'github.com/mitchellh/packer/provisioner/ansible' })
+      |? { $_ -ne 'github.com/hashicorp/packer/builder/parallels/common' } `
+      |? { $_ -ne 'github.com/hashicorp/packer/common' }`
+      |? { $_ -ne 'github.com/hashicorp/packer/provisioner/ansible' })
 
 test: off
 
diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go
index e3958ace052..cd32d3bceeb 100644
--- a/builder/amazon/chroot/builder.go
+++ b/builder/amazon/chroot/builder.go
@@ -11,12 +11,12 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	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"
 	"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"
 )
 
 // The unique ID for this builder
diff --git a/builder/amazon/chroot/builder_test.go b/builder/amazon/chroot/builder_test.go
index 525291d8c23..a5271403053 100644
--- a/builder/amazon/chroot/builder_test.go
+++ b/builder/amazon/chroot/builder_test.go
@@ -3,7 +3,7 @@ package chroot
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/builder/amazon/chroot/communicator.go b/builder/amazon/chroot/communicator.go
index 24284efabd8..854522caa09 100644
--- a/builder/amazon/chroot/communicator.go
+++ b/builder/amazon/chroot/communicator.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // Communicator is a special communicator that works by executing
diff --git a/builder/amazon/chroot/communicator_test.go b/builder/amazon/chroot/communicator_test.go
index 56745a681cb..7017b9e02d6 100644
--- a/builder/amazon/chroot/communicator_test.go
+++ b/builder/amazon/chroot/communicator_test.go
@@ -1,7 +1,7 @@
 package chroot
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/builder/amazon/chroot/run_local_commands.go b/builder/amazon/chroot/run_local_commands.go
index bc339ed1173..024a208f878 100644
--- a/builder/amazon/chroot/run_local_commands.go
+++ b/builder/amazon/chroot/run_local_commands.go
@@ -3,9 +3,9 @@ package chroot
 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 --git a/builder/amazon/chroot/step_attach_volume.go b/builder/amazon/chroot/step_attach_volume.go
index 486948c2791..6b83f440b89 100644
--- a/builder/amazon/chroot/step_attach_volume.go
+++ b/builder/amazon/chroot/step_attach_volume.go
@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepAttachVolume attaches the previously created volume to an
diff --git a/builder/amazon/chroot/step_check_root_device.go b/builder/amazon/chroot/step_check_root_device.go
index 29df2933d62..fa0097aa4ea 100644
--- a/builder/amazon/chroot/step_check_root_device.go
+++ b/builder/amazon/chroot/step_check_root_device.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepCheckRootDevice makes sure the root device on the AMI is EBS-backed.
diff --git a/builder/amazon/chroot/step_chroot_provision.go b/builder/amazon/chroot/step_chroot_provision.go
index 168b65bb8cf..941e071b123 100644
--- a/builder/amazon/chroot/step_chroot_provision.go
+++ b/builder/amazon/chroot/step_chroot_provision.go
@@ -3,8 +3,8 @@ package chroot
 import (
 	"log"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepChrootProvision provisions the instance within a chroot.
diff --git a/builder/amazon/chroot/step_copy_files.go b/builder/amazon/chroot/step_copy_files.go
index 844e9e5c1a8..534ec268a72 100644
--- a/builder/amazon/chroot/step_copy_files.go
+++ b/builder/amazon/chroot/step_copy_files.go
@@ -3,8 +3,8 @@ package chroot
 import (
 	"bytes"
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 	"path/filepath"
 )
diff --git a/builder/amazon/chroot/step_create_volume.go b/builder/amazon/chroot/step_create_volume.go
index a527d86ddaa..c1ecbf1a97e 100644
--- a/builder/amazon/chroot/step_create_volume.go
+++ b/builder/amazon/chroot/step_create_volume.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepCreateVolume creates a new volume from the snapshot of the root
diff --git a/builder/amazon/chroot/step_early_cleanup.go b/builder/amazon/chroot/step_early_cleanup.go
index a7b08a26b9b..edcef49fc3a 100644
--- a/builder/amazon/chroot/step_early_cleanup.go
+++ b/builder/amazon/chroot/step_early_cleanup.go
@@ -2,8 +2,8 @@ package chroot
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/amazon/chroot/step_early_unflock.go b/builder/amazon/chroot/step_early_unflock.go
index 138e06495a0..4b24b858126 100644
--- a/builder/amazon/chroot/step_early_unflock.go
+++ b/builder/amazon/chroot/step_early_unflock.go
@@ -2,8 +2,8 @@ package chroot
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/amazon/chroot/step_flock.go b/builder/amazon/chroot/step_flock.go
index 9f7ca54b826..648ec2acc10 100644
--- a/builder/amazon/chroot/step_flock.go
+++ b/builder/amazon/chroot/step_flock.go
@@ -2,8 +2,8 @@ package chroot
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 	"os"
 	"path/filepath"
diff --git a/builder/amazon/chroot/step_instance_info.go b/builder/amazon/chroot/step_instance_info.go
index ceba307cc21..9f331189cb9 100644
--- a/builder/amazon/chroot/step_instance_info.go
+++ b/builder/amazon/chroot/step_instance_info.go
@@ -5,9 +5,9 @@ import (
 	"log"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepInstanceInfo verifies that this builder is running on an EC2 instance.
diff --git a/builder/amazon/chroot/step_mount_device.go b/builder/amazon/chroot/step_mount_device.go
index 0ea3b0529a7..8f740bd6e31 100644
--- a/builder/amazon/chroot/step_mount_device.go
+++ b/builder/amazon/chroot/step_mount_device.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type mountPathData struct {
diff --git a/builder/amazon/chroot/step_mount_extra.go b/builder/amazon/chroot/step_mount_extra.go
index b3ef764b5a9..3bd8951c73c 100644
--- a/builder/amazon/chroot/step_mount_extra.go
+++ b/builder/amazon/chroot/step_mount_extra.go
@@ -3,8 +3,8 @@ package chroot
 import (
 	"bytes"
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"os"
 	"os/exec"
 	"syscall"
diff --git a/builder/amazon/chroot/step_post_mount_commands.go b/builder/amazon/chroot/step_post_mount_commands.go
index 2eb50926c77..de927f9aab0 100644
--- a/builder/amazon/chroot/step_post_mount_commands.go
+++ b/builder/amazon/chroot/step_post_mount_commands.go
@@ -1,8 +1,8 @@
 package chroot
 
 import (
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type postMountCommandsData struct {
diff --git a/builder/amazon/chroot/step_pre_mount_commands.go b/builder/amazon/chroot/step_pre_mount_commands.go
index e4561c2d7c4..63aa6d15a01 100644
--- a/builder/amazon/chroot/step_pre_mount_commands.go
+++ b/builder/amazon/chroot/step_pre_mount_commands.go
@@ -1,8 +1,8 @@
 package chroot
 
 import (
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type preMountCommandsData struct {
diff --git a/builder/amazon/chroot/step_prepare_device.go b/builder/amazon/chroot/step_prepare_device.go
index 62ac82b931a..6cbefb2cc84 100644
--- a/builder/amazon/chroot/step_prepare_device.go
+++ b/builder/amazon/chroot/step_prepare_device.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"os"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepPrepareDevice finds an available device and sets it.
diff --git a/builder/amazon/chroot/step_register_ami.go b/builder/amazon/chroot/step_register_ami.go
index 8523b595a08..d387eada832 100644
--- a/builder/amazon/chroot/step_register_ami.go
+++ b/builder/amazon/chroot/step_register_ami.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepRegisterAMI creates the AMI.
diff --git a/builder/amazon/chroot/step_snapshot.go b/builder/amazon/chroot/step_snapshot.go
index 4761abed632..5cd646662b4 100644
--- a/builder/amazon/chroot/step_snapshot.go
+++ b/builder/amazon/chroot/step_snapshot.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepSnapshot creates a snapshot of the created volume.
diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go
index 1fd66d09172..eb501e0704c 100644
--- a/builder/amazon/common/access_config.go
+++ b/builder/amazon/common/access_config.go
@@ -12,7 +12,7 @@ import (
 	"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 --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go
index a60d0d78862..4f6cd7316c6 100644
--- a/builder/amazon/common/ami_config.go
+++ b/builder/amazon/common/ami_config.go
@@ -3,7 +3,7 @@ package common
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // AMIConfig is for common configuration related to creating AMIs.
diff --git a/builder/amazon/common/artifact.go b/builder/amazon/common/artifact.go
index 28331a4ecec..c9f9a08b519 100644
--- a/builder/amazon/common/artifact.go
+++ b/builder/amazon/common/artifact.go
@@ -9,7 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // Artifact is an artifact implementation that contains built AMIs.
diff --git a/builder/amazon/common/artifact_test.go b/builder/amazon/common/artifact_test.go
index 46dfedf3ff2..ccbf0a1e38c 100644
--- a/builder/amazon/common/artifact_test.go
+++ b/builder/amazon/common/artifact_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifact_Impl(t *testing.T) {
diff --git a/builder/amazon/common/block_device.go b/builder/amazon/common/block_device.go
index 9492414632c..57f6a4307c4 100644
--- a/builder/amazon/common/block_device.go
+++ b/builder/amazon/common/block_device.go
@@ -5,7 +5,7 @@ import (
 
 	"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 --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go
index 154a519e95e..0190df9f3a0 100644
--- a/builder/amazon/common/run_config.go
+++ b/builder/amazon/common/run_config.go
@@ -7,9 +7,9 @@ import (
 	"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 --git a/builder/amazon/common/run_config_test.go b/builder/amazon/common/run_config_test.go
index ddf8822a25b..7cf42ded1b4 100644
--- a/builder/amazon/common/run_config_test.go
+++ b/builder/amazon/common/run_config_test.go
@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func init() {
diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go
index 3057bf1712c..685914331c3 100644
--- a/builder/amazon/common/ssh.go
+++ b/builder/amazon/common/ssh.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	packerssh "github.com/hashicorp/packer/communicator/ssh"
 	"github.com/mitchellh/multistep"
-	packerssh "github.com/mitchellh/packer/communicator/ssh"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
 )
diff --git a/builder/amazon/common/step_ami_region_copy.go b/builder/amazon/common/step_ami_region_copy.go
index 96496fe47e3..6020ae1de66 100644
--- a/builder/amazon/common/step_ami_region_copy.go
+++ b/builder/amazon/common/step_ami_region_copy.go
@@ -8,8 +8,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepAMIRegionCopy struct {
diff --git a/builder/amazon/common/step_create_tags.go b/builder/amazon/common/step_create_tags.go
index 42c221dbb27..81ede5482c1 100644
--- a/builder/amazon/common/step_create_tags.go
+++ b/builder/amazon/common/step_create_tags.go
@@ -7,10 +7,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	retry "github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	retry "github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type StepCreateTags struct {
diff --git a/builder/amazon/common/step_deregister_ami.go b/builder/amazon/common/step_deregister_ami.go
index 75c3fe23950..139e2159cf3 100644
--- a/builder/amazon/common/step_deregister_ami.go
+++ b/builder/amazon/common/step_deregister_ami.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepDeregisterAMI struct {
diff --git a/builder/amazon/common/step_encrypted_ami.go b/builder/amazon/common/step_encrypted_ami.go
index 6a4c2967e98..8580927a241 100644
--- a/builder/amazon/common/step_encrypted_ami.go
+++ b/builder/amazon/common/step_encrypted_ami.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepCreateEncryptedAMICopy struct {
diff --git a/builder/amazon/common/step_get_password.go b/builder/amazon/common/step_get_password.go
index 618e3bbb8bc..b457658b9d3 100644
--- a/builder/amazon/common/step_get_password.go
+++ b/builder/amazon/common/step_get_password.go
@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepGetPassword reads the password from a Windows server and sets it
diff --git a/builder/amazon/common/step_key_pair.go b/builder/amazon/common/step_key_pair.go
index c5e3ff13a6c..29972c9bc21 100644
--- a/builder/amazon/common/step_key_pair.go
+++ b/builder/amazon/common/step_key_pair.go
@@ -7,8 +7,8 @@ import (
 	"runtime"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepKeyPair struct {
diff --git a/builder/amazon/common/step_modify_ami_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go
index 647a37a251d..3e86e53917a 100644
--- a/builder/amazon/common/step_modify_ami_attributes.go
+++ b/builder/amazon/common/step_modify_ami_attributes.go
@@ -6,9 +6,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type StepModifyAMIAttributes struct {
diff --git a/builder/amazon/common/step_modify_ebs_instance.go b/builder/amazon/common/step_modify_ebs_instance.go
index 4f16eded7bb..11fa629d952 100644
--- a/builder/amazon/common/step_modify_ebs_instance.go
+++ b/builder/amazon/common/step_modify_ebs_instance.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepModifyEBSBackedInstance struct {
diff --git a/builder/amazon/common/step_pre_validate.go b/builder/amazon/common/step_pre_validate.go
index 9ba97264ffc..01e1c6ddc5a 100644
--- a/builder/amazon/common/step_pre_validate.go
+++ b/builder/amazon/common/step_pre_validate.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepPreValidate provides an opportunity to pre-validate any configuration for
diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go
index 0f33611a246..e6f0a2a87c4 100644
--- a/builder/amazon/common/step_run_source_instance.go
+++ b/builder/amazon/common/step_run_source_instance.go
@@ -11,9 +11,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type StepRunSourceInstance struct {
diff --git a/builder/amazon/common/step_security_group.go b/builder/amazon/common/step_security_group.go
index 3206fd25449..5de1ebbc5d3 100644
--- a/builder/amazon/common/step_security_group.go
+++ b/builder/amazon/common/step_security_group.go
@@ -8,10 +8,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/private/waiter"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepSecurityGroup struct {
diff --git a/builder/amazon/common/step_source_ami_info.go b/builder/amazon/common/step_source_ami_info.go
index 2346502fc37..386e8e8dbd3 100644
--- a/builder/amazon/common/step_source_ami_info.go
+++ b/builder/amazon/common/step_source_ami_info.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepSourceAMIInfo extracts critical information from the source AMI
diff --git a/builder/amazon/common/step_stop_ebs_instance.go b/builder/amazon/common/step_stop_ebs_instance.go
index cca60e75faf..7a3f2bc1556 100644
--- a/builder/amazon/common/step_stop_ebs_instance.go
+++ b/builder/amazon/common/step_stop_ebs_instance.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepStopEBSBackedInstance struct {
diff --git a/builder/amazon/common/step_tag_ebs_volumes.go b/builder/amazon/common/step_tag_ebs_volumes.go
index 4d9c5d66a2b..cf4c69a17e3 100644
--- a/builder/amazon/common/step_tag_ebs_volumes.go
+++ b/builder/amazon/common/step_tag_ebs_volumes.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type StepTagEBSVolumes struct {
diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go
index c36cb33e8d3..c4891ba4a11 100644
--- a/builder/amazon/ebs/builder.go
+++ b/builder/amazon/ebs/builder.go
@@ -11,13 +11,13 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	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"
 	"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"
 )
 
 // The unique ID for this builder
diff --git a/builder/amazon/ebs/builder_acc_test.go b/builder/amazon/ebs/builder_acc_test.go
index 2b3c3cc3e75..c597123906f 100644
--- a/builder/amazon/ebs/builder_acc_test.go
+++ b/builder/amazon/ebs/builder_acc_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/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 --git a/builder/amazon/ebs/builder_test.go b/builder/amazon/ebs/builder_test.go
index 945afbd9550..4630a36cb80 100644
--- a/builder/amazon/ebs/builder_test.go
+++ b/builder/amazon/ebs/builder_test.go
@@ -3,7 +3,7 @@ package ebs
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/builder/amazon/ebs/step_cleanup_volumes.go b/builder/amazon/ebs/step_cleanup_volumes.go
index 6fbe31a75b0..29d8ffcaf7b 100644
--- a/builder/amazon/ebs/step_cleanup_volumes.go
+++ b/builder/amazon/ebs/step_cleanup_volumes.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // stepCleanupVolumes cleans up any orphaned volumes that were not designated to
diff --git a/builder/amazon/ebs/step_create_ami.go b/builder/amazon/ebs/step_create_ami.go
index d78922b9894..a93740d279e 100644
--- a/builder/amazon/ebs/step_create_ami.go
+++ b/builder/amazon/ebs/step_create_ami.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepCreateAMI struct {
diff --git a/builder/amazon/ebs/tags_acc_test.go b/builder/amazon/ebs/tags_acc_test.go
index d7114dc91aa..1d0eb69b9a5 100644
--- a/builder/amazon/ebs/tags_acc_test.go
+++ b/builder/amazon/ebs/tags_acc_test.go
@@ -7,9 +7,9 @@ import (
 
 	"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 --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go
index b3b02aeab6f..dd6a76b8323 100644
--- a/builder/amazon/ebssurrogate/builder.go
+++ b/builder/amazon/ebssurrogate/builder.go
@@ -10,13 +10,13 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/errwrap"
+	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"
 	"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"
 )
 
 const BuilderId = "mitchellh.amazon.ebssurrogate"
diff --git a/builder/amazon/ebssurrogate/builder_test.go b/builder/amazon/ebssurrogate/builder_test.go
index 89a134ba8c6..94fdacd6b40 100644
--- a/builder/amazon/ebssurrogate/builder_test.go
+++ b/builder/amazon/ebssurrogate/builder_test.go
@@ -3,7 +3,7 @@ package ebssurrogate
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/builder/amazon/ebssurrogate/root_block_device.go b/builder/amazon/ebssurrogate/root_block_device.go
index db8a44f723b..2c4849732d4 100644
--- a/builder/amazon/ebssurrogate/root_block_device.go
+++ b/builder/amazon/ebssurrogate/root_block_device.go
@@ -4,7 +4,7 @@ import (
 	"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 --git a/builder/amazon/ebssurrogate/step_register_ami.go b/builder/amazon/ebssurrogate/step_register_ami.go
index 5aef1c7241d..95212903a62 100644
--- a/builder/amazon/ebssurrogate/step_register_ami.go
+++ b/builder/amazon/ebssurrogate/step_register_ami.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepRegisterAMI creates the AMI.
diff --git a/builder/amazon/ebssurrogate/step_snapshot_new_root.go b/builder/amazon/ebssurrogate/step_snapshot_new_root.go
index 858f0493481..e00a75cdbe2 100644
--- a/builder/amazon/ebssurrogate/step_snapshot_new_root.go
+++ b/builder/amazon/ebssurrogate/step_snapshot_new_root.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepSnapshotNewRootVolume creates a snapshot of the created volume.
diff --git a/builder/amazon/ebsvolume/artifact.go b/builder/amazon/ebsvolume/artifact.go
index e8787d9933b..9198bb79b96 100644
--- a/builder/amazon/ebsvolume/artifact.go
+++ b/builder/amazon/ebsvolume/artifact.go
@@ -7,7 +7,7 @@ import (
 	"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 --git a/builder/amazon/ebsvolume/block_device.go b/builder/amazon/ebsvolume/block_device.go
index c5b45027c22..5a23821b3b2 100644
--- a/builder/amazon/ebsvolume/block_device.go
+++ b/builder/amazon/ebsvolume/block_device.go
@@ -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 --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go
index c906febcecf..9221f3b1c49 100644
--- a/builder/amazon/ebsvolume/builder.go
+++ b/builder/amazon/ebsvolume/builder.go
@@ -9,13 +9,13 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/errwrap"
+	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"
 	"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"
 )
 
 const BuilderId = "mitchellh.amazon.ebsvolume"
diff --git a/builder/amazon/ebsvolume/builder_test.go b/builder/amazon/ebsvolume/builder_test.go
index 61a8f2ff1f5..7c209f0a47c 100644
--- a/builder/amazon/ebsvolume/builder_test.go
+++ b/builder/amazon/ebsvolume/builder_test.go
@@ -3,7 +3,7 @@ package ebsvolume
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go
index 48d373ba1df..992459560b9 100644
--- a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go
+++ b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type stepTagEBSVolumes struct {
diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go
index d1e6c50a0fd..f14a5aea7d1 100644
--- a/builder/amazon/instance/builder.go
+++ b/builder/amazon/instance/builder.go
@@ -11,13 +11,13 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	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"
 	"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"
 )
 
 // The unique ID for this builder
diff --git a/builder/amazon/instance/builder_test.go b/builder/amazon/instance/builder_test.go
index bb18e54a871..56ba3911cfb 100644
--- a/builder/amazon/instance/builder_test.go
+++ b/builder/amazon/instance/builder_test.go
@@ -1,7 +1,7 @@
 package instance
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"testing"
diff --git a/builder/amazon/instance/step_bundle_volume.go b/builder/amazon/instance/step_bundle_volume.go
index 5d839177f03..a8e27d635bf 100644
--- a/builder/amazon/instance/step_bundle_volume.go
+++ b/builder/amazon/instance/step_bundle_volume.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type bundleCmdData struct {
diff --git a/builder/amazon/instance/step_register_ami.go b/builder/amazon/instance/step_register_ami.go
index c21c618ed81..01ba46bd9d0 100644
--- a/builder/amazon/instance/step_register_ami.go
+++ b/builder/amazon/instance/step_register_ami.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	awscommon "github.com/mitchellh/packer/builder/amazon/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepRegisterAMI struct{}
diff --git a/builder/amazon/instance/step_upload_bundle.go b/builder/amazon/instance/step_upload_bundle.go
index fc641e1c65e..91a64918e9f 100644
--- a/builder/amazon/instance/step_upload_bundle.go
+++ b/builder/amazon/instance/step_upload_bundle.go
@@ -3,9 +3,9 @@ package instance
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type uploadCmdData struct {
diff --git a/builder/amazon/instance/step_upload_x509_cert.go b/builder/amazon/instance/step_upload_x509_cert.go
index ee24cff9895..1de1aa311f8 100644
--- a/builder/amazon/instance/step_upload_x509_cert.go
+++ b/builder/amazon/instance/step_upload_x509_cert.go
@@ -2,8 +2,8 @@ package instance
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"os"
 )
 
diff --git a/builder/azure/arm/azure_client.go b/builder/azure/arm/azure_client.go
index 096979b04af..8f7025e6939 100644
--- a/builder/azure/arm/azure_client.go
+++ b/builder/azure/arm/azure_client.go
@@ -19,8 +19,8 @@ import (
 	"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 --git a/builder/azure/arm/builder.go b/builder/azure/arm/builder.go
index a82caebe6f2..b1fe484a16c 100644
--- a/builder/azure/arm/builder.go
+++ b/builder/azure/arm/builder.go
@@ -10,17 +10,17 @@ import (
 	"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"
 
+	packerCommon "github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	packerCommon "github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
 )
 
 type Builder struct {
diff --git a/builder/azure/arm/builder_test.go b/builder/azure/arm/builder_test.go
index 436ddc04c8b..47f7a74b569 100644
--- a/builder/azure/arm/builder_test.go
+++ b/builder/azure/arm/builder_test.go
@@ -6,7 +6,7 @@ package arm
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 )
 
 func TestStateBagShouldBePopulatedExpectedValues(t *testing.T) {
diff --git a/builder/azure/arm/config.go b/builder/azure/arm/config.go
index 0b5b158fa4b..c7348d2ee8f 100644
--- a/builder/azure/arm/config.go
+++ b/builder/azure/arm/config.go
@@ -22,13 +22,13 @@ import (
 	"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 --git a/builder/azure/arm/config_retriever.go b/builder/azure/arm/config_retriever.go
index b31340f4694..3e8a3e655a4 100644
--- a/builder/azure/arm/config_retriever.go
+++ b/builder/azure/arm/config_retriever.go
@@ -9,7 +9,7 @@ package arm
 
 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 --git a/builder/azure/arm/config_test.go b/builder/azure/arm/config_test.go
index 680d8301bee..1d859d01463 100644
--- a/builder/azure/arm/config_test.go
+++ b/builder/azure/arm/config_test.go
@@ -9,8 +9,8 @@ import (
 	"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 --git a/builder/azure/arm/inspector.go b/builder/azure/arm/inspector.go
index 2ad5ab807c7..d3fbd4ccd58 100644
--- a/builder/azure/arm/inspector.go
+++ b/builder/azure/arm/inspector.go
@@ -8,7 +8,7 @@ import (
 
 	"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 --git a/builder/azure/arm/step.go b/builder/azure/arm/step.go
index 53da60c3de7..574527f8d32 100644
--- a/builder/azure/arm/step.go
+++ b/builder/azure/arm/step.go
@@ -4,9 +4,9 @@
 package arm
 
 import (
+	"github.com/hashicorp/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
 )
 
 func processInterruptibleResult(
diff --git a/builder/azure/arm/step_capture_image.go b/builder/azure/arm/step_capture_image.go
index e1ab174242e..d579747d4b4 100644
--- a/builder/azure/arm/step_capture_image.go
+++ b/builder/azure/arm/step_capture_image.go
@@ -7,10 +7,10 @@ import (
 	"fmt"
 
 	"github.com/Azure/azure-sdk-for-go/arm/compute"
+	"github.com/hashicorp/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepCaptureImage struct {
diff --git a/builder/azure/arm/step_capture_image_test.go b/builder/azure/arm/step_capture_image_test.go
index f1fe2c06a32..c25345c6e9f 100644
--- a/builder/azure/arm/step_capture_image_test.go
+++ b/builder/azure/arm/step_capture_image_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/Azure/azure-sdk-for-go/arm/compute"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
 )
 
 func TestStepCaptureImageShouldFailIfCaptureFails(t *testing.T) {
diff --git a/builder/azure/arm/step_create_resource_group.go b/builder/azure/arm/step_create_resource_group.go
index 9295ff36d04..d5115019f0e 100644
--- a/builder/azure/arm/step_create_resource_group.go
+++ b/builder/azure/arm/step_create_resource_group.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 
 	"github.com/Azure/azure-sdk-for-go/arm/resources/resources"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepCreateResourceGroup struct {
diff --git a/builder/azure/arm/step_create_resource_group_test.go b/builder/azure/arm/step_create_resource_group_test.go
index affab4a0499..ca0c8f18bc0 100644
--- a/builder/azure/arm/step_create_resource_group_test.go
+++ b/builder/azure/arm/step_create_resource_group_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
 )
 
 func TestStepCreateResourceGroupShouldFailIfCreateFails(t *testing.T) {
diff --git a/builder/azure/arm/step_delete_os_disk.go b/builder/azure/arm/step_delete_os_disk.go
index ba079cdbe85..697502837e7 100644
--- a/builder/azure/arm/step_delete_os_disk.go
+++ b/builder/azure/arm/step_delete_os_disk.go
@@ -8,10 +8,10 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepDeleteOSDisk struct {
diff --git a/builder/azure/arm/step_delete_os_disk_test.go b/builder/azure/arm/step_delete_os_disk_test.go
index 2355bf2832d..5e3adfb6b27 100644
--- a/builder/azure/arm/step_delete_os_disk_test.go
+++ b/builder/azure/arm/step_delete_os_disk_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
 )
 
 func TestStepDeleteOSDiskShouldFailIfGetFails(t *testing.T) {
diff --git a/builder/azure/arm/step_delete_resource_group.go b/builder/azure/arm/step_delete_resource_group.go
index 82b9adfb0d7..05677fa59b9 100644
--- a/builder/azure/arm/step_delete_resource_group.go
+++ b/builder/azure/arm/step_delete_resource_group.go
@@ -6,10 +6,10 @@ package arm
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepDeleteResourceGroup struct {
diff --git a/builder/azure/arm/step_delete_resource_group_test.go b/builder/azure/arm/step_delete_resource_group_test.go
index 310116d0fa9..fb2882a490a 100644
--- a/builder/azure/arm/step_delete_resource_group_test.go
+++ b/builder/azure/arm/step_delete_resource_group_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
 )
 
 func TestStepDeleteResourceGroupShouldFailIfDeleteFails(t *testing.T) {
diff --git a/builder/azure/arm/step_deploy_template.go b/builder/azure/arm/step_deploy_template.go
index 9ad9d1ba9ac..291ebf2c32e 100644
--- a/builder/azure/arm/step_deploy_template.go
+++ b/builder/azure/arm/step_deploy_template.go
@@ -6,10 +6,10 @@ package arm
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepDeployTemplate struct {
diff --git a/builder/azure/arm/step_deploy_template_test.go b/builder/azure/arm/step_deploy_template_test.go
index 171c2659ad6..57bfce7d452 100644
--- a/builder/azure/arm/step_deploy_template_test.go
+++ b/builder/azure/arm/step_deploy_template_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
 )
 
 func TestStepDeployTemplateShouldFailIfDeployFails(t *testing.T) {
diff --git a/builder/azure/arm/step_get_certificate.go b/builder/azure/arm/step_get_certificate.go
index fb2a36ccc95..8253ff8ede4 100644
--- a/builder/azure/arm/step_get_certificate.go
+++ b/builder/azure/arm/step_get_certificate.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepGetCertificate struct {
diff --git a/builder/azure/arm/step_get_certificate_test.go b/builder/azure/arm/step_get_certificate_test.go
index 46b105291fc..46c921a3660 100644
--- a/builder/azure/arm/step_get_certificate_test.go
+++ b/builder/azure/arm/step_get_certificate_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
 )
 
 func TestStepGetCertificateShouldFailIfGetFails(t *testing.T) {
diff --git a/builder/azure/arm/step_get_ip_address.go b/builder/azure/arm/step_get_ip_address.go
index d0b24e82c65..7c127f71bdd 100644
--- a/builder/azure/arm/step_get_ip_address.go
+++ b/builder/azure/arm/step_get_ip_address.go
@@ -6,9 +6,9 @@ package arm
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
 )
 
 type EndpointType int
diff --git a/builder/azure/arm/step_get_ip_address_test.go b/builder/azure/arm/step_get_ip_address_test.go
index d6e29a2d718..a0b854ed0c8 100644
--- a/builder/azure/arm/step_get_ip_address_test.go
+++ b/builder/azure/arm/step_get_ip_address_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
 )
 
 func TestStepGetIPAddressShouldFailIfGetFails(t *testing.T) {
diff --git a/builder/azure/arm/step_get_os_disk.go b/builder/azure/arm/step_get_os_disk.go
index 810159ea29f..098960f883b 100644
--- a/builder/azure/arm/step_get_os_disk.go
+++ b/builder/azure/arm/step_get_os_disk.go
@@ -8,10 +8,10 @@ import (
 
 	"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/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepGetOSDisk struct {
diff --git a/builder/azure/arm/step_get_os_disk_test.go b/builder/azure/arm/step_get_os_disk_test.go
index 2062fd444a4..e1857fb93eb 100644
--- a/builder/azure/arm/step_get_os_disk_test.go
+++ b/builder/azure/arm/step_get_os_disk_test.go
@@ -9,7 +9,7 @@ import (
 
 	"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 --git a/builder/azure/arm/step_power_off_compute.go b/builder/azure/arm/step_power_off_compute.go
index bb702d0c73a..33b9bf1c51a 100644
--- a/builder/azure/arm/step_power_off_compute.go
+++ b/builder/azure/arm/step_power_off_compute.go
@@ -6,10 +6,10 @@ package arm
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepPowerOffCompute struct {
diff --git a/builder/azure/arm/step_power_off_compute_test.go b/builder/azure/arm/step_power_off_compute_test.go
index a1b8a7b371a..71004256c4e 100644
--- a/builder/azure/arm/step_power_off_compute_test.go
+++ b/builder/azure/arm/step_power_off_compute_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
 )
 
 func TestStepPowerOffComputeShouldFailIfPowerOffFails(t *testing.T) {
diff --git a/builder/azure/arm/step_set_certificate.go b/builder/azure/arm/step_set_certificate.go
index 79ed9fa2554..a2263d12a94 100644
--- a/builder/azure/arm/step_set_certificate.go
+++ b/builder/azure/arm/step_set_certificate.go
@@ -4,9 +4,9 @@
 package arm
 
 import (
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepSetCertificate struct {
diff --git a/builder/azure/arm/step_set_certificate_test.go b/builder/azure/arm/step_set_certificate_test.go
index 3ea03730c99..5bcb7dffad8 100644
--- a/builder/azure/arm/step_set_certificate_test.go
+++ b/builder/azure/arm/step_set_certificate_test.go
@@ -6,8 +6,8 @@ package arm
 import (
 	"testing"
 
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
 )
 
 func TestStepSetCertificateShouldPassIfGetPasses(t *testing.T) {
diff --git a/builder/azure/arm/step_test.go b/builder/azure/arm/step_test.go
index b0f2bfe815f..060c1235558 100644
--- a/builder/azure/arm/step_test.go
+++ b/builder/azure/arm/step_test.go
@@ -5,9 +5,9 @@ package arm
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
 	"testing"
 )
 
diff --git a/builder/azure/arm/step_validate_template.go b/builder/azure/arm/step_validate_template.go
index 25a6fbd2720..f2e286b0bfd 100644
--- a/builder/azure/arm/step_validate_template.go
+++ b/builder/azure/arm/step_validate_template.go
@@ -6,9 +6,9 @@ package arm
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepValidateTemplate struct {
diff --git a/builder/azure/arm/step_validate_template_test.go b/builder/azure/arm/step_validate_template_test.go
index eb82a88484c..071d10d86b5 100644
--- a/builder/azure/arm/step_validate_template_test.go
+++ b/builder/azure/arm/step_validate_template_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
 )
 
 func TestStepValidateTemplateShouldFailIfValidateFails(t *testing.T) {
diff --git a/builder/azure/arm/template_factory.go b/builder/azure/arm/template_factory.go
index ba2e4ebc6ba..f4157e5d0e2 100644
--- a/builder/azure/arm/template_factory.go
+++ b/builder/azure/arm/template_factory.go
@@ -6,8 +6,8 @@ import (
 	"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 --git a/builder/azure/arm/template_factory_test.go b/builder/azure/arm/template_factory_test.go
index e27669435b9..8ad32d6d08d 100644
--- a/builder/azure/arm/template_factory_test.go
+++ b/builder/azure/arm/template_factory_test.go
@@ -7,8 +7,8 @@ import (
 
 	"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 --git a/builder/azure/arm/tempname.go b/builder/azure/arm/tempname.go
index 6298a194344..22e14097df1 100644
--- a/builder/azure/arm/tempname.go
+++ b/builder/azure/arm/tempname.go
@@ -6,7 +6,7 @@ package arm
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/builder/azure/common"
+	"github.com/hashicorp/packer/builder/azure/common"
 )
 
 const (
diff --git a/builder/azure/common/devicelogin.go b/builder/azure/common/devicelogin.go
index 0197f98bb20..4cde8fbdfa5 100644
--- a/builder/azure/common/devicelogin.go
+++ b/builder/azure/common/devicelogin.go
@@ -11,8 +11,8 @@ import (
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/Azure/go-autorest/autorest/to"
+	"github.com/hashicorp/packer/version"
 	"github.com/mitchellh/go-homedir"
-	"github.com/mitchellh/packer/version"
 )
 
 var (
diff --git a/builder/azure/common/lin/ssh.go b/builder/azure/common/lin/ssh.go
index a869978fe18..f12ee09ea30 100644
--- a/builder/azure/common/lin/ssh.go
+++ b/builder/azure/common/lin/ssh.go
@@ -5,8 +5,8 @@ package lin
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/builder/azure/common/constants"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/azure/common/lin/step_create_cert.go b/builder/azure/common/lin/step_create_cert.go
index 08b60f45a79..6ef4ff56018 100644
--- a/builder/azure/common/lin/step_create_cert.go
+++ b/builder/azure/common/lin/step_create_cert.go
@@ -15,10 +15,10 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/mitchellh/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/builder/azure/common/constants"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepCreateCert struct {
diff --git a/builder/azure/common/lin/step_generalize_os.go b/builder/azure/common/lin/step_generalize_os.go
index e36d390091d..1c355c2c633 100644
--- a/builder/azure/common/lin/step_generalize_os.go
+++ b/builder/azure/common/lin/step_generalize_os.go
@@ -6,8 +6,8 @@ package lin
 import (
 	"bytes"
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/azure/pkcs12/crypto.go b/builder/azure/pkcs12/crypto.go
index 17bca7d7963..5095a4f7fe6 100644
--- a/builder/azure/pkcs12/crypto.go
+++ b/builder/azure/pkcs12/crypto.go
@@ -12,7 +12,7 @@ import (
 	"errors"
 	"io"
 
-	"github.com/mitchellh/packer/builder/azure/pkcs12/rc2"
+	"github.com/hashicorp/packer/builder/azure/pkcs12/rc2"
 )
 
 const (
diff --git a/builder/cloudstack/artifact_test.go b/builder/cloudstack/artifact_test.go
index 9d93d645b2a..f1b062e5e2a 100644
--- a/builder/cloudstack/artifact_test.go
+++ b/builder/cloudstack/artifact_test.go
@@ -3,7 +3,7 @@ package cloudstack
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/builder.go b/builder/cloudstack/builder.go
index 880b2116996..8e562354eb2 100644
--- a/builder/cloudstack/builder.go
+++ b/builder/cloudstack/builder.go
@@ -1,10 +1,10 @@
 package cloudstack
 
 import (
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/builder_test.go b/builder/cloudstack/builder_test.go
index f5fc453cfa3..6d7ab144434 100644
--- a/builder/cloudstack/builder_test.go
+++ b/builder/cloudstack/builder_test.go
@@ -3,7 +3,7 @@ package cloudstack
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestBuilder_Impl(t *testing.T) {
diff --git a/builder/cloudstack/config.go b/builder/cloudstack/config.go
index fc57a3d4882..5394d3c9c8c 100644
--- a/builder/cloudstack/config.go
+++ b/builder/cloudstack/config.go
@@ -6,12 +6,12 @@ import (
 	"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 --git a/builder/cloudstack/ssh.go b/builder/cloudstack/ssh.go
index b980102f445..192293bda61 100644
--- a/builder/cloudstack/ssh.go
+++ b/builder/cloudstack/ssh.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"io/ioutil"
 
+	packerssh "github.com/hashicorp/packer/communicator/ssh"
 	"github.com/mitchellh/multistep"
-	packerssh "github.com/mitchellh/packer/communicator/ssh"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 	"golang.org/x/crypto/ssh"
 )
diff --git a/builder/cloudstack/step_configure_networking.go b/builder/cloudstack/step_configure_networking.go
index 71a71e1cc1f..ae736a07f4d 100644
--- a/builder/cloudstack/step_configure_networking.go
+++ b/builder/cloudstack/step_configure_networking.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/step_create_instance.go b/builder/cloudstack/step_create_instance.go
index 7d1b687fa9c..c1caa9f3641 100644
--- a/builder/cloudstack/step_create_instance.go
+++ b/builder/cloudstack/step_create_instance.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/step_create_template.go b/builder/cloudstack/step_create_template.go
index 5c80a15a2d0..9845a31661e 100644
--- a/builder/cloudstack/step_create_template.go
+++ b/builder/cloudstack/step_create_template.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/step_prepare_config.go b/builder/cloudstack/step_prepare_config.go
index 7aafc9292d3..82b75dccf3c 100644
--- a/builder/cloudstack/step_prepare_config.go
+++ b/builder/cloudstack/step_prepare_config.go
@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 	"regexp"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/step_shutdown_instance.go b/builder/cloudstack/step_shutdown_instance.go
index 1f7df43a215..d472a79d84c 100644
--- a/builder/cloudstack/step_shutdown_instance.go
+++ b/builder/cloudstack/step_shutdown_instance.go
@@ -3,8 +3,8 @@ package cloudstack
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/digitalocean/artifact_test.go b/builder/digitalocean/artifact_test.go
index 5646be0be21..8b11348dace 100644
--- a/builder/digitalocean/artifact_test.go
+++ b/builder/digitalocean/artifact_test.go
@@ -3,7 +3,7 @@ package digitalocean
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifact_Impl(t *testing.T) {
diff --git a/builder/digitalocean/builder.go b/builder/digitalocean/builder.go
index bafad752277..1dc93b7935d 100644
--- a/builder/digitalocean/builder.go
+++ b/builder/digitalocean/builder.go
@@ -9,10 +9,10 @@ import (
 	"net/url"
 
 	"github.com/digitalocean/godo"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
 	"golang.org/x/oauth2"
 )
 
diff --git a/builder/digitalocean/builder_acc_test.go b/builder/digitalocean/builder_acc_test.go
index 4e7931ade3f..3a091697eaa 100644
--- a/builder/digitalocean/builder_acc_test.go
+++ b/builder/digitalocean/builder_acc_test.go
@@ -4,7 +4,7 @@ import (
 	"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 --git a/builder/digitalocean/builder_test.go b/builder/digitalocean/builder_test.go
index 000cf7f1ac3..9ef7c0ad727 100644
--- a/builder/digitalocean/builder_test.go
+++ b/builder/digitalocean/builder_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/builder/digitalocean/config.go b/builder/digitalocean/config.go
index 9406f739e8b..de623ca6d20 100644
--- a/builder/digitalocean/config.go
+++ b/builder/digitalocean/config.go
@@ -6,13 +6,13 @@ import (
 	"os"
 	"time"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"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"
 )
 
 type Config struct {
diff --git a/builder/digitalocean/step_create_droplet.go b/builder/digitalocean/step_create_droplet.go
index 0a214199a76..a2e3c2b2417 100644
--- a/builder/digitalocean/step_create_droplet.go
+++ b/builder/digitalocean/step_create_droplet.go
@@ -6,8 +6,8 @@ import (
 	"io/ioutil"
 
 	"github.com/digitalocean/godo"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepCreateDroplet struct {
diff --git a/builder/digitalocean/step_create_ssh_key.go b/builder/digitalocean/step_create_ssh_key.go
index ce65cb42516..b639e1edf26 100644
--- a/builder/digitalocean/step_create_ssh_key.go
+++ b/builder/digitalocean/step_create_ssh_key.go
@@ -11,9 +11,9 @@ import (
 	"runtime"
 
 	"github.com/digitalocean/godo"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/digitalocean/step_droplet_info.go b/builder/digitalocean/step_droplet_info.go
index abdc2b6984d..c7b12821819 100644
--- a/builder/digitalocean/step_droplet_info.go
+++ b/builder/digitalocean/step_droplet_info.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/digitalocean/godo"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepDropletInfo struct{}
diff --git a/builder/digitalocean/step_power_off.go b/builder/digitalocean/step_power_off.go
index 0f38e6a52eb..9b697dbf024 100644
--- a/builder/digitalocean/step_power_off.go
+++ b/builder/digitalocean/step_power_off.go
@@ -5,8 +5,8 @@ import (
 	"log"
 
 	"github.com/digitalocean/godo"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepPowerOff struct{}
diff --git a/builder/digitalocean/step_shutdown.go b/builder/digitalocean/step_shutdown.go
index a01b26ef2e3..64b681ed97a 100644
--- a/builder/digitalocean/step_shutdown.go
+++ b/builder/digitalocean/step_shutdown.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/digitalocean/godo"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepShutdown struct{}
diff --git a/builder/digitalocean/step_snapshot.go b/builder/digitalocean/step_snapshot.go
index 129a0d5b1a9..ce97f370211 100644
--- a/builder/digitalocean/step_snapshot.go
+++ b/builder/digitalocean/step_snapshot.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/digitalocean/godo"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepSnapshot struct{}
diff --git a/builder/docker/artifact_export_test.go b/builder/docker/artifact_export_test.go
index be7ce244423..784535f1bf9 100644
--- a/builder/docker/artifact_export_test.go
+++ b/builder/docker/artifact_export_test.go
@@ -1,7 +1,7 @@
 package docker
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/builder/docker/artifact_import_test.go b/builder/docker/artifact_import_test.go
index 971143953c7..0a002344c9f 100644
--- a/builder/docker/artifact_import_test.go
+++ b/builder/docker/artifact_import_test.go
@@ -2,7 +2,7 @@ package docker
 
 import (
 	"errors"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/builder/docker/builder.go b/builder/docker/builder.go
index 8e7e2cf190c..c59456e80ac 100644
--- a/builder/docker/builder.go
+++ b/builder/docker/builder.go
@@ -3,10 +3,10 @@ package docker
 import (
 	"log"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
 )
 
 const (
diff --git a/builder/docker/builder_test.go b/builder/docker/builder_test.go
index c8da72224e1..e196b0b3036 100644
--- a/builder/docker/builder_test.go
+++ b/builder/docker/builder_test.go
@@ -1,7 +1,7 @@
 package docker
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/builder/docker/comm.go b/builder/docker/comm.go
index a42d125255e..c064c055048 100644
--- a/builder/docker/comm.go
+++ b/builder/docker/comm.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"io/ioutil"
 
+	"github.com/hashicorp/packer/communicator/ssh"
+	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/communicator/ssh"
-	"github.com/mitchellh/packer/helper/communicator"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/docker/communicator.go b/builder/docker/communicator.go
index 092782deda5..d33f79e95f2 100644
--- a/builder/docker/communicator.go
+++ b/builder/docker/communicator.go
@@ -14,7 +14,7 @@ import (
 	"syscall"
 
 	"github.com/hashicorp/go-version"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type Communicator struct {
diff --git a/builder/docker/communicator_test.go b/builder/docker/communicator_test.go
index fb005de062a..908593a5ed4 100644
--- a/builder/docker/communicator_test.go
+++ b/builder/docker/communicator_test.go
@@ -8,10 +8,10 @@ import (
 	"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 --git a/builder/docker/config.go b/builder/docker/config.go
index e242804328f..7ba1f45872b 100644
--- a/builder/docker/config.go
+++ b/builder/docker/config.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"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"
 )
 
 var (
diff --git a/builder/docker/driver_docker.go b/builder/docker/driver_docker.go
index 53a62832c23..ac691a3a43c 100644
--- a/builder/docker/driver_docker.go
+++ b/builder/docker/driver_docker.go
@@ -12,8 +12,8 @@ import (
 	"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 --git a/builder/docker/exec.go b/builder/docker/exec.go
index 5987024108b..201055b74d5 100644
--- a/builder/docker/exec.go
+++ b/builder/docker/exec.go
@@ -2,8 +2,8 @@ package docker
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/iochan"
-	"github.com/mitchellh/packer/packer"
 	"io"
 	"log"
 	"os/exec"
diff --git a/builder/docker/step_commit.go b/builder/docker/step_commit.go
index 2e0281bd43c..94205bc2f08 100644
--- a/builder/docker/step_commit.go
+++ b/builder/docker/step_commit.go
@@ -2,8 +2,8 @@ package docker
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepCommit commits the container to a image.
diff --git a/builder/docker/step_export.go b/builder/docker/step_export.go
index b09ea0bd422..428055a488b 100644
--- a/builder/docker/step_export.go
+++ b/builder/docker/step_export.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepExport exports the container to a flat tar file.
diff --git a/builder/docker/step_pull.go b/builder/docker/step_pull.go
index 3f5b1b62aa0..9e38f7b49ad 100644
--- a/builder/docker/step_pull.go
+++ b/builder/docker/step_pull.go
@@ -2,8 +2,8 @@ package docker
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/docker/step_run.go b/builder/docker/step_run.go
index a3df4bda69b..92803f9325c 100644
--- a/builder/docker/step_run.go
+++ b/builder/docker/step_run.go
@@ -2,8 +2,8 @@ package docker
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepRun struct {
diff --git a/builder/docker/step_temp_dir.go b/builder/docker/step_temp_dir.go
index 58b264a4d9d..7e84b908f50 100644
--- a/builder/docker/step_temp_dir.go
+++ b/builder/docker/step_temp_dir.go
@@ -2,8 +2,8 @@ package docker
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"io/ioutil"
 	"os"
 )
diff --git a/builder/docker/step_temp_dir_test.go b/builder/docker/step_temp_dir_test.go
index 5cf851f7739..cc12932f39c 100644
--- a/builder/docker/step_temp_dir_test.go
+++ b/builder/docker/step_temp_dir_test.go
@@ -5,8 +5,8 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 func TestStepTempDir_impl(t *testing.T) {
diff --git a/builder/docker/step_test.go b/builder/docker/step_test.go
index 0bc1908306d..4278fb50de5 100644
--- a/builder/docker/step_test.go
+++ b/builder/docker/step_test.go
@@ -2,8 +2,8 @@ package docker
 
 import (
 	"bytes"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"testing"
 )
 
diff --git a/builder/file/artifact_test.go b/builder/file/artifact_test.go
index 0aa77894bf9..c2c73d66050 100644
--- a/builder/file/artifact_test.go
+++ b/builder/file/artifact_test.go
@@ -3,7 +3,7 @@ package file
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestNullArtifact(t *testing.T) {
diff --git a/builder/file/builder.go b/builder/file/builder.go
index 9a2c2cc7ff3..1ac87331c75 100644
--- a/builder/file/builder.go
+++ b/builder/file/builder.go
@@ -11,8 +11,8 @@ import (
 	"io/ioutil"
 	"os"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 const BuilderId = "packer.file"
diff --git a/builder/file/builder_test.go b/builder/file/builder_test.go
index 3ce9e77ae10..3979ab8534b 100644
--- a/builder/file/builder_test.go
+++ b/builder/file/builder_test.go
@@ -5,8 +5,8 @@ import (
 	"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 --git a/builder/file/config.go b/builder/file/config.go
index 6702e6894eb..7fc6ebc22ca 100644
--- a/builder/file/config.go
+++ b/builder/file/config.go
@@ -3,10 +3,10 @@ package file
 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 --git a/builder/googlecompute/artifact_test.go b/builder/googlecompute/artifact_test.go
index a892a3e531c..9d028c1a339 100644
--- a/builder/googlecompute/artifact_test.go
+++ b/builder/googlecompute/artifact_test.go
@@ -1,7 +1,7 @@
 package googlecompute
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/builder/googlecompute/builder.go b/builder/googlecompute/builder.go
index d1413d83a0c..1cb79f2a791 100644
--- a/builder/googlecompute/builder.go
+++ b/builder/googlecompute/builder.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
 )
 
 // The unique ID for this builder.
diff --git a/builder/googlecompute/config.go b/builder/googlecompute/config.go
index fd8b7ba8af8..4250f1824f1 100644
--- a/builder/googlecompute/config.go
+++ b/builder/googlecompute/config.go
@@ -6,12 +6,12 @@ import (
 	"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 --git a/builder/googlecompute/driver_gce.go b/builder/googlecompute/driver_gce.go
index 0708d0f432c..b4cdd8d84b2 100644
--- a/builder/googlecompute/driver_gce.go
+++ b/builder/googlecompute/driver_gce.go
@@ -16,9 +16,9 @@ import (
 
 	"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 --git a/builder/googlecompute/step_check_existing_image.go b/builder/googlecompute/step_check_existing_image.go
index dbad5cf1c93..d5f2f5e7376 100644
--- a/builder/googlecompute/step_check_existing_image.go
+++ b/builder/googlecompute/step_check_existing_image.go
@@ -3,8 +3,8 @@ package googlecompute
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepCheckExistingImage represents a Packer build step that checks if the
diff --git a/builder/googlecompute/step_create_image.go b/builder/googlecompute/step_create_image.go
index 79d0c3df6a8..13339d82fce 100644
--- a/builder/googlecompute/step_create_image.go
+++ b/builder/googlecompute/step_create_image.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepCreateImage represents a Packer build step that creates GCE machine
diff --git a/builder/googlecompute/step_create_instance.go b/builder/googlecompute/step_create_instance.go
index bbd8867a7c1..adb08e7bd31 100644
--- a/builder/googlecompute/step_create_instance.go
+++ b/builder/googlecompute/step_create_instance.go
@@ -6,8 +6,8 @@ import (
 	"io/ioutil"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepCreateInstance represents a Packer build step that creates GCE instances.
diff --git a/builder/googlecompute/step_create_ssh_key.go b/builder/googlecompute/step_create_ssh_key.go
index 1012867b609..fd6d7f55a66 100644
--- a/builder/googlecompute/step_create_ssh_key.go
+++ b/builder/googlecompute/step_create_ssh_key.go
@@ -9,8 +9,8 @@ import (
 	"io/ioutil"
 	"os"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/googlecompute/step_create_windows_password.go b/builder/googlecompute/step_create_windows_password.go
index 4c16cb604d7..312e5451289 100644
--- a/builder/googlecompute/step_create_windows_password.go
+++ b/builder/googlecompute/step_create_windows_password.go
@@ -12,8 +12,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepCreateWindowsPassword represents a Packer build step that sets the windows password on a Windows GCE instance.
diff --git a/builder/googlecompute/step_instance_info.go b/builder/googlecompute/step_instance_info.go
index 63653f4207c..d5ece22e766 100644
--- a/builder/googlecompute/step_instance_info.go
+++ b/builder/googlecompute/step_instance_info.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // stepInstanceInfo represents a Packer build step that gathers GCE instance info.
diff --git a/builder/googlecompute/step_teardown_instance.go b/builder/googlecompute/step_teardown_instance.go
index 9f998a05924..58585d78f88 100644
--- a/builder/googlecompute/step_teardown_instance.go
+++ b/builder/googlecompute/step_teardown_instance.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepTeardownInstance represents a Packer build step that tears down GCE
diff --git a/builder/googlecompute/step_test.go b/builder/googlecompute/step_test.go
index 4c1ceff558a..3e9b843f4a5 100644
--- a/builder/googlecompute/step_test.go
+++ b/builder/googlecompute/step_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/googlecompute/step_wait_startup_script.go b/builder/googlecompute/step_wait_startup_script.go
index 7a13d54578a..78bb4e4e340 100644
--- a/builder/googlecompute/step_wait_startup_script.go
+++ b/builder/googlecompute/step_wait_startup_script.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepWaitStartupScript int
diff --git a/builder/googlecompute/winrm.go b/builder/googlecompute/winrm.go
index 8f744f9aad7..ec617cba595 100644
--- a/builder/googlecompute/winrm.go
+++ b/builder/googlecompute/winrm.go
@@ -1,8 +1,8 @@
 package googlecompute
 
 import (
+	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/helper/communicator"
 )
 
 // winrmConfig returns the WinRM configuration.
diff --git a/builder/hyperv/common/artifact.go b/builder/hyperv/common/artifact.go
index 63b123eeeb8..06537449d84 100644
--- a/builder/hyperv/common/artifact.go
+++ b/builder/hyperv/common/artifact.go
@@ -5,7 +5,7 @@ import (
 	"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 --git a/builder/hyperv/common/artifact_test.go b/builder/hyperv/common/artifact_test.go
index f9ddc5dbfc8..023d2dd44f6 100644
--- a/builder/hyperv/common/artifact_test.go
+++ b/builder/hyperv/common/artifact_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifact_impl(t *testing.T) {
diff --git a/builder/hyperv/common/config_test.go b/builder/hyperv/common/config_test.go
index eeeda864a3d..e6a902cc2c8 100644
--- a/builder/hyperv/common/config_test.go
+++ b/builder/hyperv/common/config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func testConfigTemplate(t *testing.T) *interpolate.Context {
diff --git a/builder/hyperv/common/driver_ps_4.go b/builder/hyperv/common/driver_ps_4.go
index e563f89ea8c..c954a3d4603 100644
--- a/builder/hyperv/common/driver_ps_4.go
+++ b/builder/hyperv/common/driver_ps_4.go
@@ -7,8 +7,8 @@ import (
 	"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 --git a/builder/hyperv/common/floppy_config.go b/builder/hyperv/common/floppy_config.go
index d656e103a8f..b0d6a5ab9a5 100644
--- a/builder/hyperv/common/floppy_config.go
+++ b/builder/hyperv/common/floppy_config.go
@@ -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 --git a/builder/hyperv/common/output_config.go b/builder/hyperv/common/output_config.go
index 7b5ddcd4567..14eced008b9 100644
--- a/builder/hyperv/common/output_config.go
+++ b/builder/hyperv/common/output_config.go
@@ -3,8 +3,8 @@ package common
 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 --git a/builder/hyperv/common/output_config_test.go b/builder/hyperv/common/output_config_test.go
index 3da8bda58dd..3a87dc18fd2 100644
--- a/builder/hyperv/common/output_config_test.go
+++ b/builder/hyperv/common/output_config_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/common"
+	"github.com/hashicorp/packer/common"
 )
 
 func TestOutputConfigPrepare(t *testing.T) {
diff --git a/builder/hyperv/common/run_config.go b/builder/hyperv/common/run_config.go
index 35cdb3b5d06..a189a03553e 100644
--- a/builder/hyperv/common/run_config.go
+++ b/builder/hyperv/common/run_config.go
@@ -2,7 +2,7 @@ package common
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 	"time"
 )
 
diff --git a/builder/hyperv/common/shutdown_config.go b/builder/hyperv/common/shutdown_config.go
index 83d2224c386..faa90268f0d 100644
--- a/builder/hyperv/common/shutdown_config.go
+++ b/builder/hyperv/common/shutdown_config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type ShutdownConfig struct {
diff --git a/builder/hyperv/common/ssh.go b/builder/hyperv/common/ssh.go
index 1bb06bfd250..50db23ac2c5 100644
--- a/builder/hyperv/common/ssh.go
+++ b/builder/hyperv/common/ssh.go
@@ -1,9 +1,9 @@
 package common
 
 import (
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	"github.com/mitchellh/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/hyperv/common/ssh_config.go b/builder/hyperv/common/ssh_config.go
index 3569a00b621..152230ccd38 100644
--- a/builder/hyperv/common/ssh_config.go
+++ b/builder/hyperv/common/ssh_config.go
@@ -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 --git a/builder/hyperv/common/step_configure_ip.go b/builder/hyperv/common/step_configure_ip.go
index 330f784a042..deac917f855 100644
--- a/builder/hyperv/common/step_configure_ip.go
+++ b/builder/hyperv/common/step_configure_ip.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepConfigureIp struct {
diff --git a/builder/hyperv/common/step_configure_vlan.go b/builder/hyperv/common/step_configure_vlan.go
index cb81a8a6c70..5d713ac9922 100644
--- a/builder/hyperv/common/step_configure_vlan.go
+++ b/builder/hyperv/common/step_configure_vlan.go
@@ -3,8 +3,8 @@ package common
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepConfigureVlan struct {
diff --git a/builder/hyperv/common/step_create_external_switch.go b/builder/hyperv/common/step_create_external_switch.go
index 112d79f4576..8443202b389 100644
--- a/builder/hyperv/common/step_create_external_switch.go
+++ b/builder/hyperv/common/step_create_external_switch.go
@@ -3,9 +3,9 @@ package common
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common/uuid"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step creates switch for VM.
diff --git a/builder/hyperv/common/step_create_switch.go b/builder/hyperv/common/step_create_switch.go
index 4f84e6bf1a4..7e5ea275189 100644
--- a/builder/hyperv/common/step_create_switch.go
+++ b/builder/hyperv/common/step_create_switch.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 const (
diff --git a/builder/hyperv/common/step_create_tempdir.go b/builder/hyperv/common/step_create_tempdir.go
index 8ecb81b40ad..269ba4eaea2 100644
--- a/builder/hyperv/common/step_create_tempdir.go
+++ b/builder/hyperv/common/step_create_tempdir.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"io/ioutil"
 	"os"
 )
diff --git a/builder/hyperv/common/step_create_vm.go b/builder/hyperv/common/step_create_vm.go
index 9fa65b1a86e..13dd37e1f15 100644
--- a/builder/hyperv/common/step_create_vm.go
+++ b/builder/hyperv/common/step_create_vm.go
@@ -3,8 +3,8 @@ package common
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step creates the actual virtual machine.
diff --git a/builder/hyperv/common/step_disable_vlan.go b/builder/hyperv/common/step_disable_vlan.go
index fd101c7a1fe..883ff76c45c 100644
--- a/builder/hyperv/common/step_disable_vlan.go
+++ b/builder/hyperv/common/step_disable_vlan.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepDisableVlan struct {
diff --git a/builder/hyperv/common/step_enable_integration_service.go b/builder/hyperv/common/step_enable_integration_service.go
index 399e1af4463..0889bed22c3 100644
--- a/builder/hyperv/common/step_enable_integration_service.go
+++ b/builder/hyperv/common/step_enable_integration_service.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepEnableIntegrationService struct {
diff --git a/builder/hyperv/common/step_export_vm.go b/builder/hyperv/common/step_export_vm.go
index 904a4b62e76..f3d96fbb676 100644
--- a/builder/hyperv/common/step_export_vm.go
+++ b/builder/hyperv/common/step_export_vm.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"io/ioutil"
 	"path/filepath"
 )
diff --git a/builder/hyperv/common/step_mount_dvddrive.go b/builder/hyperv/common/step_mount_dvddrive.go
index 58426a252f0..6321200537d 100644
--- a/builder/hyperv/common/step_mount_dvddrive.go
+++ b/builder/hyperv/common/step_mount_dvddrive.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/hyperv/common/step_mount_floppydrive.go b/builder/hyperv/common/step_mount_floppydrive.go
index bb9272c54f4..c787b1fe7ed 100644
--- a/builder/hyperv/common/step_mount_floppydrive.go
+++ b/builder/hyperv/common/step_mount_floppydrive.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"io"
 	"io/ioutil"
 	"log"
diff --git a/builder/hyperv/common/step_mount_guest_additions.go b/builder/hyperv/common/step_mount_guest_additions.go
index 66e3a8bc67d..954075d08cc 100644
--- a/builder/hyperv/common/step_mount_guest_additions.go
+++ b/builder/hyperv/common/step_mount_guest_additions.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/hyperv/common/step_mount_secondary_dvd_images.go b/builder/hyperv/common/step_mount_secondary_dvd_images.go
index 2550cd9f038..4e7663d4051 100644
--- a/builder/hyperv/common/step_mount_secondary_dvd_images.go
+++ b/builder/hyperv/common/step_mount_secondary_dvd_images.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/hyperv/common/step_output_dir.go b/builder/hyperv/common/step_output_dir.go
index 1443e5791e3..0054d1994d4 100644
--- a/builder/hyperv/common/step_output_dir.go
+++ b/builder/hyperv/common/step_output_dir.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepOutputDir sets up the output directory by creating it if it does
diff --git a/builder/hyperv/common/step_polling_installation.go b/builder/hyperv/common/step_polling_installation.go
index aa61a1e530a..8586940b183 100644
--- a/builder/hyperv/common/step_polling_installation.go
+++ b/builder/hyperv/common/step_polling_installation.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 const port string = "13000"
diff --git a/builder/hyperv/common/step_reboot_vm.go b/builder/hyperv/common/step_reboot_vm.go
index 6e45dfd62e8..9446781a282 100644
--- a/builder/hyperv/common/step_reboot_vm.go
+++ b/builder/hyperv/common/step_reboot_vm.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"time"
 )
 
diff --git a/builder/hyperv/common/step_run.go b/builder/hyperv/common/step_run.go
index b052b1050fd..12d621e1ce8 100644
--- a/builder/hyperv/common/step_run.go
+++ b/builder/hyperv/common/step_run.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"time"
 )
 
diff --git a/builder/hyperv/common/step_shutdown.go b/builder/hyperv/common/step_shutdown.go
index 84a20c26b74..9b341b3956c 100644
--- a/builder/hyperv/common/step_shutdown.go
+++ b/builder/hyperv/common/step_shutdown.go
@@ -7,8 +7,8 @@ import (
 	"log"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step shuts down the machine. It first attempts to do so gracefully,
diff --git a/builder/hyperv/common/step_sleep.go b/builder/hyperv/common/step_sleep.go
index ce61753e425..23f7e344f31 100644
--- a/builder/hyperv/common/step_sleep.go
+++ b/builder/hyperv/common/step_sleep.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"time"
 )
 
diff --git a/builder/hyperv/common/step_type_boot_command.go b/builder/hyperv/common/step_type_boot_command.go
index 2955813d4b7..dfeca61962f 100644
--- a/builder/hyperv/common/step_type_boot_command.go
+++ b/builder/hyperv/common/step_type_boot_command.go
@@ -7,10 +7,10 @@ import (
 	"unicode"
 	"unicode/utf8"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type bootCommandTemplateData struct {
diff --git a/builder/hyperv/common/step_unmount_dvddrive.go b/builder/hyperv/common/step_unmount_dvddrive.go
index 3af6566b306..7ba748f2fa9 100644
--- a/builder/hyperv/common/step_unmount_dvddrive.go
+++ b/builder/hyperv/common/step_unmount_dvddrive.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepUnmountDvdDrive struct {
diff --git a/builder/hyperv/common/step_unmount_floppydrive.go b/builder/hyperv/common/step_unmount_floppydrive.go
index c183f463b49..2d271584d37 100644
--- a/builder/hyperv/common/step_unmount_floppydrive.go
+++ b/builder/hyperv/common/step_unmount_floppydrive.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepUnmountFloppyDrive struct {
diff --git a/builder/hyperv/common/step_unmount_guest_additions.go b/builder/hyperv/common/step_unmount_guest_additions.go
index 16a4c14e893..b47e969d11a 100644
--- a/builder/hyperv/common/step_unmount_guest_additions.go
+++ b/builder/hyperv/common/step_unmount_guest_additions.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepUnmountGuestAdditions struct {
diff --git a/builder/hyperv/common/step_unmount_secondary_dvd_images.go b/builder/hyperv/common/step_unmount_secondary_dvd_images.go
index 175f6484b09..e59ad601413 100644
--- a/builder/hyperv/common/step_unmount_secondary_dvd_images.go
+++ b/builder/hyperv/common/step_unmount_secondary_dvd_images.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepUnmountSecondaryDvdImages struct {
diff --git a/builder/hyperv/common/step_wait_for_install_to_complete.go b/builder/hyperv/common/step_wait_for_install_to_complete.go
index b1674b2d625..51736ddb549 100644
--- a/builder/hyperv/common/step_wait_for_install_to_complete.go
+++ b/builder/hyperv/common/step_wait_for_install_to_complete.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"time"
 )
 
diff --git a/builder/hyperv/iso/builder.go b/builder/hyperv/iso/builder.go
index ede06cca00d..cd73c487305 100644
--- a/builder/hyperv/iso/builder.go
+++ b/builder/hyperv/iso/builder.go
@@ -7,15 +7,15 @@ import (
 	"os"
 	"strings"
 
+	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"
 	"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"
 )
 
 const (
diff --git a/builder/hyperv/iso/builder_test.go b/builder/hyperv/iso/builder_test.go
index 3adf05aa9ad..561b6110c39 100644
--- a/builder/hyperv/iso/builder_test.go
+++ b/builder/hyperv/iso/builder_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/builder/null/artifact_export_test.go b/builder/null/artifact_export_test.go
index 9e71613a6f9..aa054085157 100644
--- a/builder/null/artifact_export_test.go
+++ b/builder/null/artifact_export_test.go
@@ -1,7 +1,7 @@
 package null
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/builder/null/builder.go b/builder/null/builder.go
index cce9227d6d3..08eb363b51a 100644
--- a/builder/null/builder.go
+++ b/builder/null/builder.go
@@ -3,10 +3,10 @@ package null
 import (
 	"log"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
 )
 
 const BuilderId = "fnoeding.null"
diff --git a/builder/null/builder_test.go b/builder/null/builder_test.go
index 3749b2f68a2..2f77ccb392f 100644
--- a/builder/null/builder_test.go
+++ b/builder/null/builder_test.go
@@ -1,7 +1,7 @@
 package null
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/builder/null/config.go b/builder/null/config.go
index 697d40ce9ba..17d4925a1af 100644
--- a/builder/null/config.go
+++ b/builder/null/config.go
@@ -3,11 +3,11 @@ package null
 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 --git a/builder/null/config_test.go b/builder/null/config_test.go
index 428533e0ed2..29114806bb6 100644
--- a/builder/null/config_test.go
+++ b/builder/null/config_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/builder/null/ssh.go b/builder/null/ssh.go
index 483390e86a1..3c31df5cca3 100644
--- a/builder/null/ssh.go
+++ b/builder/null/ssh.go
@@ -2,8 +2,8 @@ package null
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/communicator/ssh"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 	"io/ioutil"
 )
diff --git a/builder/oneandone/builder.go b/builder/oneandone/builder.go
index 050a5f38ee5..f4f8e1dc3fe 100644
--- a/builder/oneandone/builder.go
+++ b/builder/oneandone/builder.go
@@ -3,10 +3,10 @@ package oneandone
 import (
 	"errors"
 	"fmt"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/oneandone/builder_acc_test.go b/builder/oneandone/builder_acc_test.go
index a15dce6d58b..57ca974f236 100644
--- a/builder/oneandone/builder_acc_test.go
+++ b/builder/oneandone/builder_acc_test.go
@@ -4,7 +4,7 @@ import (
 	"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 --git a/builder/oneandone/builder_test.go b/builder/oneandone/builder_test.go
index 808caf46a91..ae90f72b254 100644
--- a/builder/oneandone/builder_test.go
+++ b/builder/oneandone/builder_test.go
@@ -2,7 +2,7 @@ package oneandone
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/builder/oneandone/config.go b/builder/oneandone/config.go
index fcc3fca977a..e71ef2c9f1e 100644
--- a/builder/oneandone/config.go
+++ b/builder/oneandone/config.go
@@ -3,12 +3,12 @@ package oneandone
 import (
 	"errors"
 	"github.com/1and1/oneandone-cloudserver-sdk-go"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"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"
 	"os"
 	"strings"
 )
diff --git a/builder/oneandone/ssh.go b/builder/oneandone/ssh.go
index 669c571a53e..8f1856a8eac 100644
--- a/builder/oneandone/ssh.go
+++ b/builder/oneandone/ssh.go
@@ -2,8 +2,8 @@ package oneandone
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/communicator/ssh"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/oneandone/step_create_server.go b/builder/oneandone/step_create_server.go
index f6825a00bb6..2ad268ff88c 100644
--- a/builder/oneandone/step_create_server.go
+++ b/builder/oneandone/step_create_server.go
@@ -3,8 +3,8 @@ package oneandone
 import (
 	"fmt"
 	"github.com/1and1/oneandone-cloudserver-sdk-go"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"strings"
 	"time"
 )
diff --git a/builder/oneandone/step_create_sshkey.go b/builder/oneandone/step_create_sshkey.go
index bb655d39d55..0ad089c23cd 100644
--- a/builder/oneandone/step_create_sshkey.go
+++ b/builder/oneandone/step_create_sshkey.go
@@ -4,8 +4,8 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"golang.org/x/crypto/ssh"
 	"io/ioutil"
 )
diff --git a/builder/oneandone/step_take_snapshot.go b/builder/oneandone/step_take_snapshot.go
index 8e8cb88fdb5..b19790c7d35 100644
--- a/builder/oneandone/step_take_snapshot.go
+++ b/builder/oneandone/step_take_snapshot.go
@@ -2,8 +2,8 @@ package oneandone
 
 import (
 	"github.com/1and1/oneandone-cloudserver-sdk-go"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepTakeSnapshot struct{}
diff --git a/builder/openstack/access_config.go b/builder/openstack/access_config.go
index 04e7c854d92..10b4fd02e9a 100644
--- a/builder/openstack/access_config.go
+++ b/builder/openstack/access_config.go
@@ -8,7 +8,7 @@ import (
 
 	"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 --git a/builder/openstack/artifact_test.go b/builder/openstack/artifact_test.go
index 313fea7cf35..20f5fe3b5b4 100644
--- a/builder/openstack/artifact_test.go
+++ b/builder/openstack/artifact_test.go
@@ -1,7 +1,7 @@
 package openstack
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go
index 3d426343357..46d0e4e67ed 100644
--- a/builder/openstack/builder.go
+++ b/builder/openstack/builder.go
@@ -7,12 +7,12 @@ import (
 	"fmt"
 	"log"
 
+	"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"
 	"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"
 )
 
 // The unique ID for this builder
diff --git a/builder/openstack/builder_test.go b/builder/openstack/builder_test.go
index ce15873ebb6..14fb8f2f96f 100644
--- a/builder/openstack/builder_test.go
+++ b/builder/openstack/builder_test.go
@@ -1,7 +1,7 @@
 package openstack
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/builder/openstack/image_config.go b/builder/openstack/image_config.go
index 3e4319547ab..3bdc1fc50b7 100644
--- a/builder/openstack/image_config.go
+++ b/builder/openstack/image_config.go
@@ -5,7 +5,7 @@ import (
 	"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 @@ func (c *ImageConfig) Prepare(ctx *interpolate.Context) []error {
 	// "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 --git a/builder/openstack/run_config.go b/builder/openstack/run_config.go
index eddbae1ed56..1c138f7906d 100644
--- a/builder/openstack/run_config.go
+++ b/builder/openstack/run_config.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 
-	"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"
 )
 
 // RunConfig contains configuration for running an instance from a source
diff --git a/builder/openstack/run_config_test.go b/builder/openstack/run_config_test.go
index 1a71b3ca257..151dcd99d79 100644
--- a/builder/openstack/run_config_test.go
+++ b/builder/openstack/run_config_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func init() {
diff --git a/builder/openstack/ssh.go b/builder/openstack/ssh.go
index 9738c278ef6..3bf003e5eb1 100644
--- a/builder/openstack/ssh.go
+++ b/builder/openstack/ssh.go
@@ -11,8 +11,8 @@ import (
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
+	packerssh "github.com/hashicorp/packer/communicator/ssh"
 	"github.com/mitchellh/multistep"
-	packerssh "github.com/mitchellh/packer/communicator/ssh"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
 )
diff --git a/builder/openstack/step_add_image_members.go b/builder/openstack/step_add_image_members.go
index cd26b822ffa..642ed3d463c 100644
--- a/builder/openstack/step_add_image_members.go
+++ b/builder/openstack/step_add_image_members.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/gophercloud/gophercloud/openstack/imageservice/v2/members"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepAddImageMembers struct{}
diff --git a/builder/openstack/step_allocate_ip.go b/builder/openstack/step_allocate_ip.go
index 18f38505332..521e4263423 100644
--- a/builder/openstack/step_allocate_ip.go
+++ b/builder/openstack/step_allocate_ip.go
@@ -6,8 +6,8 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/gophercloud/gophercloud/pagination"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepAllocateIp struct {
diff --git a/builder/openstack/step_create_image.go b/builder/openstack/step_create_image.go
index c5b12b85e37..126bd497162 100644
--- a/builder/openstack/step_create_image.go
+++ b/builder/openstack/step_create_image.go
@@ -8,8 +8,8 @@ import (
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/images"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepCreateImage struct{}
diff --git a/builder/openstack/step_get_password.go b/builder/openstack/step_get_password.go
index dd11c98f35c..10800d5be6c 100644
--- a/builder/openstack/step_get_password.go
+++ b/builder/openstack/step_get_password.go
@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/openstack/step_key_pair.go b/builder/openstack/step_key_pair.go
index b2899403029..5125c6c8f16 100644
--- a/builder/openstack/step_key_pair.go
+++ b/builder/openstack/step_key_pair.go
@@ -9,8 +9,8 @@ import (
 	"runtime"
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
@@ -123,7 +123,7 @@ func (s *StepKeyPair) Run(state multistep.StateBag) multistep.StepAction {
 	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 --git a/builder/openstack/step_key_pair_test.go b/builder/openstack/step_key_pair_test.go
index 997844611d1..0ce45d6a70c 100644
--- a/builder/openstack/step_key_pair_test.go
+++ b/builder/openstack/step_key_pair_test.go
@@ -5,7 +5,7 @@ import (
 	"os/exec"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/openstack/step_load_extensions.go b/builder/openstack/step_load_extensions.go
index 4a3362fac40..84ab0c8d28c 100644
--- a/builder/openstack/step_load_extensions.go
+++ b/builder/openstack/step_load_extensions.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions"
 	"github.com/gophercloud/gophercloud/pagination"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepLoadExtensions gets the FlavorRef from a Flavor. It first assumes
diff --git a/builder/openstack/step_load_flavor.go b/builder/openstack/step_load_flavor.go
index bac84bfa963..816e0d8f462 100644
--- a/builder/openstack/step_load_flavor.go
+++ b/builder/openstack/step_load_flavor.go
@@ -5,8 +5,8 @@ import (
 	"log"
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepLoadFlavor gets the FlavorRef from a Flavor. It first assumes
diff --git a/builder/openstack/step_run_source_server.go b/builder/openstack/step_run_source_server.go
index 2d02173faff..427f507dcbb 100644
--- a/builder/openstack/step_run_source_server.go
+++ b/builder/openstack/step_run_source_server.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepRunSourceServer struct {
diff --git a/builder/openstack/step_stop_server.go b/builder/openstack/step_stop_server.go
index ede909b54fa..e0f240fbde1 100644
--- a/builder/openstack/step_stop_server.go
+++ b/builder/openstack/step_stop_server.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/startstop"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepStopServer struct{}
diff --git a/builder/openstack/step_update_image_visibility.go b/builder/openstack/step_update_image_visibility.go
index 96bd9d59cfa..fb83134bd15 100644
--- a/builder/openstack/step_update_image_visibility.go
+++ b/builder/openstack/step_update_image_visibility.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepUpdateImageVisibility struct{}
diff --git a/builder/openstack/step_wait_for_rackconnect.go b/builder/openstack/step_wait_for_rackconnect.go
index 0afbe137985..d791e9db08d 100644
--- a/builder/openstack/step_wait_for_rackconnect.go
+++ b/builder/openstack/step_wait_for_rackconnect.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepWaitForRackConnect struct {
diff --git a/builder/parallels/common/artifact.go b/builder/parallels/common/artifact.go
index 04961974be1..ec236151f5b 100644
--- a/builder/parallels/common/artifact.go
+++ b/builder/parallels/common/artifact.go
@@ -6,7 +6,7 @@ import (
 	"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 --git a/builder/parallels/common/artifact_test.go b/builder/parallels/common/artifact_test.go
index 3f24382005d..cb2da6d3973 100644
--- a/builder/parallels/common/artifact_test.go
+++ b/builder/parallels/common/artifact_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifact_impl(t *testing.T) {
diff --git a/builder/parallels/common/config_test.go b/builder/parallels/common/config_test.go
index eeeda864a3d..e6a902cc2c8 100644
--- a/builder/parallels/common/config_test.go
+++ b/builder/parallels/common/config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func testConfigTemplate(t *testing.T) *interpolate.Context {
diff --git a/builder/parallels/common/output_config.go b/builder/parallels/common/output_config.go
index 7514cf08957..f2e6cea5074 100644
--- a/builder/parallels/common/output_config.go
+++ b/builder/parallels/common/output_config.go
@@ -5,8 +5,8 @@ import (
 	"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 --git a/builder/parallels/common/output_config_test.go b/builder/parallels/common/output_config_test.go
index 1bfac27fe5a..c3161ff4264 100644
--- a/builder/parallels/common/output_config_test.go
+++ b/builder/parallels/common/output_config_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/common"
+	"github.com/hashicorp/packer/common"
 )
 
 func TestOutputConfigPrepare(t *testing.T) {
diff --git a/builder/parallels/common/prlctl_config.go b/builder/parallels/common/prlctl_config.go
index f69ddf9edb7..5d42c5ea49f 100644
--- a/builder/parallels/common/prlctl_config.go
+++ b/builder/parallels/common/prlctl_config.go
@@ -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 --git a/builder/parallels/common/prlctl_post_config.go b/builder/parallels/common/prlctl_post_config.go
index 5077bb1b35a..27f5cb234e4 100644
--- a/builder/parallels/common/prlctl_post_config.go
+++ b/builder/parallels/common/prlctl_post_config.go
@@ -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 --git a/builder/parallels/common/prlctl_version_config.go b/builder/parallels/common/prlctl_version_config.go
index b47d46fc57a..ab2641cb3e5 100644
--- a/builder/parallels/common/prlctl_version_config.go
+++ b/builder/parallels/common/prlctl_version_config.go
@@ -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 --git a/builder/parallels/common/run_config.go b/builder/parallels/common/run_config.go
index a3c4aba55c7..53fb8757b33 100644
--- a/builder/parallels/common/run_config.go
+++ b/builder/parallels/common/run_config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // RunConfig contains the configuration for VM run.
diff --git a/builder/parallels/common/shutdown_config.go b/builder/parallels/common/shutdown_config.go
index ee37ab938e9..4ebdf405fda 100644
--- a/builder/parallels/common/shutdown_config.go
+++ b/builder/parallels/common/shutdown_config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // ShutdownConfig contains the configuration for VM shutdown.
diff --git a/builder/parallels/common/ssh.go b/builder/parallels/common/ssh.go
index cdc5eab5cef..c4c76fabff6 100644
--- a/builder/parallels/common/ssh.go
+++ b/builder/parallels/common/ssh.go
@@ -1,9 +1,9 @@
 package common
 
 import (
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	packerssh "github.com/hashicorp/packer/communicator/ssh"
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	packerssh "github.com/mitchellh/packer/communicator/ssh"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/parallels/common/ssh_config.go b/builder/parallels/common/ssh_config.go
index 8612cc0c27a..10fdb30cc51 100644
--- a/builder/parallels/common/ssh_config.go
+++ b/builder/parallels/common/ssh_config.go
@@ -3,8 +3,8 @@ package common
 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 --git a/builder/parallels/common/ssh_config_test.go b/builder/parallels/common/ssh_config_test.go
index 64889195f3f..43b83f3ad2f 100644
--- a/builder/parallels/common/ssh_config_test.go
+++ b/builder/parallels/common/ssh_config_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func testSSHConfig() *SSHConfig {
diff --git a/builder/parallels/common/step_attach_floppy.go b/builder/parallels/common/step_attach_floppy.go
index 64bf9ffa009..8b970fef241 100644
--- a/builder/parallels/common/step_attach_floppy.go
+++ b/builder/parallels/common/step_attach_floppy.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepAttachFloppy is a step that attaches a floppy to the virtual machine.
diff --git a/builder/parallels/common/step_attach_parallels_tools.go b/builder/parallels/common/step_attach_parallels_tools.go
index a4fd0559b56..87d602df7c0 100644
--- a/builder/parallels/common/step_attach_parallels_tools.go
+++ b/builder/parallels/common/step_attach_parallels_tools.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepAttachParallelsTools is a step that attaches Parallels Tools ISO image
diff --git a/builder/parallels/common/step_compact_disk.go b/builder/parallels/common/step_compact_disk.go
index c6bd4e65ec1..2e88e7bd5eb 100644
--- a/builder/parallels/common/step_compact_disk.go
+++ b/builder/parallels/common/step_compact_disk.go
@@ -3,8 +3,8 @@ package common
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepCompactDisk is a step that removes all empty blocks from expanding
diff --git a/builder/parallels/common/step_output_dir.go b/builder/parallels/common/step_output_dir.go
index 0634dbdbb91..3accd2cbbc0 100644
--- a/builder/parallels/common/step_output_dir.go
+++ b/builder/parallels/common/step_output_dir.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepOutputDir sets up the output directory by creating it if it does
diff --git a/builder/parallels/common/step_prlctl.go b/builder/parallels/common/step_prlctl.go
index 7b29919f0fc..a38d8b7feac 100644
--- a/builder/parallels/common/step_prlctl.go
+++ b/builder/parallels/common/step_prlctl.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type commandTemplate struct {
diff --git a/builder/parallels/common/step_run.go b/builder/parallels/common/step_run.go
index 84b003de3b9..8f86e089b19 100644
--- a/builder/parallels/common/step_run.go
+++ b/builder/parallels/common/step_run.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepRun is a step that starts the virtual machine.
diff --git a/builder/parallels/common/step_shutdown.go b/builder/parallels/common/step_shutdown.go
index 3a93c176787..f8ec900092f 100644
--- a/builder/parallels/common/step_shutdown.go
+++ b/builder/parallels/common/step_shutdown.go
@@ -7,8 +7,8 @@ import (
 	"log"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepShutdown is a step that shuts down the machine. It first attempts to do
diff --git a/builder/parallels/common/step_shutdown_test.go b/builder/parallels/common/step_shutdown_test.go
index 72a4af6cf1b..de3baabda2a 100644
--- a/builder/parallels/common/step_shutdown_test.go
+++ b/builder/parallels/common/step_shutdown_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 func TestStepShutdown_impl(t *testing.T) {
diff --git a/builder/parallels/common/step_test.go b/builder/parallels/common/step_test.go
index 82ad8f4424a..cdaab79227b 100644
--- a/builder/parallels/common/step_test.go
+++ b/builder/parallels/common/step_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/parallels/common/step_type_boot_command.go b/builder/parallels/common/step_type_boot_command.go
index 01f9743cb3c..c3076b82c13 100644
--- a/builder/parallels/common/step_type_boot_command.go
+++ b/builder/parallels/common/step_type_boot_command.go
@@ -8,10 +8,10 @@ import (
 	"unicode"
 	"unicode/utf8"
 
+	packer_common "github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	packer_common "github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type bootCommandTemplateData struct {
diff --git a/builder/parallels/common/step_type_boot_command_test.go b/builder/parallels/common/step_type_boot_command_test.go
index 066ea25181a..ea33b936983 100644
--- a/builder/parallels/common/step_type_boot_command_test.go
+++ b/builder/parallels/common/step_type_boot_command_test.go
@@ -4,8 +4,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 func TestStepTypeBootCommand(t *testing.T) {
diff --git a/builder/parallels/common/step_upload_parallels_tools.go b/builder/parallels/common/step_upload_parallels_tools.go
index 97ba02d72f8..5769f1be5eb 100644
--- a/builder/parallels/common/step_upload_parallels_tools.go
+++ b/builder/parallels/common/step_upload_parallels_tools.go
@@ -5,9 +5,9 @@ import (
 	"log"
 	"os"
 
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 // This step uploads the Parallels Tools ISO to the virtual machine.
diff --git a/builder/parallels/common/step_upload_parallels_tools_test.go b/builder/parallels/common/step_upload_parallels_tools_test.go
index 25f0242eabb..263571ff68c 100644
--- a/builder/parallels/common/step_upload_parallels_tools_test.go
+++ b/builder/parallels/common/step_upload_parallels_tools_test.go
@@ -3,8 +3,8 @@ package common
 import (
 	"testing"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 func TestStepUploadParallelsTools_impl(t *testing.T) {
diff --git a/builder/parallels/common/step_upload_version.go b/builder/parallels/common/step_upload_version.go
index a120f14780b..6824b035e94 100644
--- a/builder/parallels/common/step_upload_version.go
+++ b/builder/parallels/common/step_upload_version.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepUploadVersion is a step that uploads a file containing the version of
diff --git a/builder/parallels/common/step_upload_version_test.go b/builder/parallels/common/step_upload_version_test.go
index c6ae76dec37..8aaf9cc9056 100644
--- a/builder/parallels/common/step_upload_version_test.go
+++ b/builder/parallels/common/step_upload_version_test.go
@@ -3,8 +3,8 @@ package common
 import (
 	"testing"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 func TestStepUploadVersion_impl(t *testing.T) {
diff --git a/builder/parallels/common/tools_config.go b/builder/parallels/common/tools_config.go
index c587a77adbb..c273d2e8762 100644
--- a/builder/parallels/common/tools_config.go
+++ b/builder/parallels/common/tools_config.go
@@ -4,7 +4,7 @@ import (
 	"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 --git a/builder/parallels/iso/builder.go b/builder/parallels/iso/builder.go
index e53509c50ab..14ae2991d39 100644
--- a/builder/parallels/iso/builder.go
+++ b/builder/parallels/iso/builder.go
@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"log"
 
+	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"
 	"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"
 )
 
 const BuilderId = "rickard-von-essen.parallels"
diff --git a/builder/parallels/iso/builder_test.go b/builder/parallels/iso/builder_test.go
index 8230941a151..b4b9eb917c2 100644
--- a/builder/parallels/iso/builder_test.go
+++ b/builder/parallels/iso/builder_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/builder/parallels/iso/step_attach_iso.go b/builder/parallels/iso/step_attach_iso.go
index df957081b20..4dead470502 100644
--- a/builder/parallels/iso/step_attach_iso.go
+++ b/builder/parallels/iso/step_attach_iso.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"log"
 
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step attaches the ISO to the virtual machine.
diff --git a/builder/parallels/iso/step_create_disk.go b/builder/parallels/iso/step_create_disk.go
index 1737dcf6aa7..0333472be86 100644
--- a/builder/parallels/iso/step_create_disk.go
+++ b/builder/parallels/iso/step_create_disk.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strconv"
 
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step creates the virtual disk that will be used as the
diff --git a/builder/parallels/iso/step_create_vm.go b/builder/parallels/iso/step_create_vm.go
index ca8c7c44e9b..52cbf3fbfa8 100644
--- a/builder/parallels/iso/step_create_vm.go
+++ b/builder/parallels/iso/step_create_vm.go
@@ -3,9 +3,9 @@ package iso
 import (
 	"fmt"
 
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step creates the actual virtual machine.
diff --git a/builder/parallels/iso/step_set_boot_order.go b/builder/parallels/iso/step_set_boot_order.go
index 8880c0310aa..a32249173c5 100644
--- a/builder/parallels/iso/step_set_boot_order.go
+++ b/builder/parallels/iso/step_set_boot_order.go
@@ -3,9 +3,9 @@ package iso
 import (
 	"fmt"
 
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step sets the device boot order for the virtual machine.
diff --git a/builder/parallels/pvm/builder.go b/builder/parallels/pvm/builder.go
index bcfc75b8b81..5db72bbaaf5 100644
--- a/builder/parallels/pvm/builder.go
+++ b/builder/parallels/pvm/builder.go
@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"log"
 
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"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"
 )
 
 // Builder implements packer.Builder and builds the actual Parallels
diff --git a/builder/parallels/pvm/config.go b/builder/parallels/pvm/config.go
index ddcadcfee29..7641e0c9dfc 100644
--- a/builder/parallels/pvm/config.go
+++ b/builder/parallels/pvm/config.go
@@ -4,11 +4,11 @@ import (
 	"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 --git a/builder/parallels/pvm/config_test.go b/builder/parallels/pvm/config_test.go
index 87fd96b3d2c..c6c36a0b41b 100644
--- a/builder/parallels/pvm/config_test.go
+++ b/builder/parallels/pvm/config_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig(t *testing.T) map[string]interface{} {
diff --git a/builder/parallels/pvm/step_import.go b/builder/parallels/pvm/step_import.go
index 123050f18bc..91b8878afb9 100644
--- a/builder/parallels/pvm/step_import.go
+++ b/builder/parallels/pvm/step_import.go
@@ -3,9 +3,9 @@ package pvm
 import (
 	"fmt"
 
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step imports an PVM VM into Parallels.
diff --git a/builder/parallels/pvm/step_test.go b/builder/parallels/pvm/step_test.go
index b9fdbb40482..827850a35d9 100644
--- a/builder/parallels/pvm/step_test.go
+++ b/builder/parallels/pvm/step_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
+	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	parallelscommon "github.com/mitchellh/packer/builder/parallels/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/profitbricks/artifact_test.go b/builder/profitbricks/artifact_test.go
index 5b9ad1a8c31..1760f3b6a62 100644
--- a/builder/profitbricks/artifact_test.go
+++ b/builder/profitbricks/artifact_test.go
@@ -3,7 +3,7 @@ package profitbricks
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifact_Impl(t *testing.T) {
diff --git a/builder/profitbricks/builder.go b/builder/profitbricks/builder.go
index a7f3a371f72..95a2b1b2db2 100644
--- a/builder/profitbricks/builder.go
+++ b/builder/profitbricks/builder.go
@@ -2,10 +2,10 @@ package profitbricks
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/profitbricks/builder_acc_test.go b/builder/profitbricks/builder_acc_test.go
index 921dc9d731c..93fd7946d29 100644
--- a/builder/profitbricks/builder_acc_test.go
+++ b/builder/profitbricks/builder_acc_test.go
@@ -4,7 +4,7 @@ import (
 	"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 --git a/builder/profitbricks/builder_test.go b/builder/profitbricks/builder_test.go
index 65e284690ce..70b73226f38 100644
--- a/builder/profitbricks/builder_test.go
+++ b/builder/profitbricks/builder_test.go
@@ -2,7 +2,7 @@ package profitbricks
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/builder/profitbricks/config.go b/builder/profitbricks/config.go
index 79c697a1981..62ffc18c8a8 100644
--- a/builder/profitbricks/config.go
+++ b/builder/profitbricks/config.go
@@ -2,12 +2,12 @@ package profitbricks
 
 import (
 	"errors"
+	"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"
 	"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"
 	"os"
 )
 
diff --git a/builder/profitbricks/ssh.go b/builder/profitbricks/ssh.go
index 55aa8095038..7069a77bab2 100644
--- a/builder/profitbricks/ssh.go
+++ b/builder/profitbricks/ssh.go
@@ -2,8 +2,8 @@ package profitbricks
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/communicator/ssh"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/profitbricks/step_create_server.go b/builder/profitbricks/step_create_server.go
index ef606e380e9..70c9148d5e3 100644
--- a/builder/profitbricks/step_create_server.go
+++ b/builder/profitbricks/step_create_server.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"github.com/profitbricks/profitbricks-sdk-go"
 )
 
diff --git a/builder/profitbricks/step_create_ssh_key.go b/builder/profitbricks/step_create_ssh_key.go
index eba23fc9d0e..0afccb494b7 100644
--- a/builder/profitbricks/step_create_ssh_key.go
+++ b/builder/profitbricks/step_create_ssh_key.go
@@ -4,8 +4,8 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"golang.org/x/crypto/ssh"
 	"io/ioutil"
 )
diff --git a/builder/profitbricks/step_take_snapshot.go b/builder/profitbricks/step_take_snapshot.go
index 1c172daef05..db63df73c2b 100644
--- a/builder/profitbricks/step_take_snapshot.go
+++ b/builder/profitbricks/step_take_snapshot.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"github.com/profitbricks/profitbricks-sdk-go"
 )
 
diff --git a/builder/qemu/builder.go b/builder/qemu/builder.go
index 3e2b79b11c7..2b6b206d9a2 100644
--- a/builder/qemu/builder.go
+++ b/builder/qemu/builder.go
@@ -10,12 +10,12 @@ import (
 	"runtime"
 	"time"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"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"
 )
 
 const BuilderId = "transcend.qemu"
diff --git a/builder/qemu/builder_test.go b/builder/qemu/builder_test.go
index 9704d37b811..24c5dc47e59 100644
--- a/builder/qemu/builder_test.go
+++ b/builder/qemu/builder_test.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 var testPem = `
diff --git a/builder/qemu/ssh.go b/builder/qemu/ssh.go
index 498d3fbe9c1..83c923f6731 100644
--- a/builder/qemu/ssh.go
+++ b/builder/qemu/ssh.go
@@ -1,9 +1,9 @@
 package qemu
 
 import (
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	"github.com/mitchellh/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/qemu/step_boot_wait.go b/builder/qemu/step_boot_wait.go
index 8557900a52a..3e4e4832072 100644
--- a/builder/qemu/step_boot_wait.go
+++ b/builder/qemu/step_boot_wait.go
@@ -2,8 +2,8 @@ package qemu
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"time"
 )
 
diff --git a/builder/qemu/step_configure_vnc.go b/builder/qemu/step_configure_vnc.go
index bda624f8911..2cbfd6820f4 100644
--- a/builder/qemu/step_configure_vnc.go
+++ b/builder/qemu/step_configure_vnc.go
@@ -6,8 +6,8 @@ import (
 	"math/rand"
 	"net"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step configures the VM to enable the VNC server.
diff --git a/builder/qemu/step_convert_disk.go b/builder/qemu/step_convert_disk.go
index 5017470fc1b..db7fe52c34c 100644
--- a/builder/qemu/step_convert_disk.go
+++ b/builder/qemu/step_convert_disk.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 
 	"os"
 )
diff --git a/builder/qemu/step_copy_disk.go b/builder/qemu/step_copy_disk.go
index e5d53fa5622..633d8d6b8c7 100644
--- a/builder/qemu/step_copy_disk.go
+++ b/builder/qemu/step_copy_disk.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step copies the virtual disk that will be used as the
diff --git a/builder/qemu/step_create_disk.go b/builder/qemu/step_create_disk.go
index 3af48cd4b4d..5d844e2a0f3 100644
--- a/builder/qemu/step_create_disk.go
+++ b/builder/qemu/step_create_disk.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step creates the virtual disk that will be used as the
diff --git a/builder/qemu/step_forward_ssh.go b/builder/qemu/step_forward_ssh.go
index c0653171be3..7737fcbd8a4 100644
--- a/builder/qemu/step_forward_ssh.go
+++ b/builder/qemu/step_forward_ssh.go
@@ -6,8 +6,8 @@ import (
 	"math/rand"
 	"net"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step adds a NAT port forwarding definition so that SSH is available
diff --git a/builder/qemu/step_prepare_output_dir.go b/builder/qemu/step_prepare_output_dir.go
index 0f3bd127855..7023ac9b8df 100644
--- a/builder/qemu/step_prepare_output_dir.go
+++ b/builder/qemu/step_prepare_output_dir.go
@@ -1,8 +1,8 @@
 package qemu
 
 import (
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 	"os"
 	"time"
diff --git a/builder/qemu/step_resize_disk.go b/builder/qemu/step_resize_disk.go
index 22c56dc37f4..fbbd8d57290 100644
--- a/builder/qemu/step_resize_disk.go
+++ b/builder/qemu/step_resize_disk.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step resizes the virtual disk that will be used as the
diff --git a/builder/qemu/step_run.go b/builder/qemu/step_run.go
index 12316dd977a..dc9dd2faaa6 100644
--- a/builder/qemu/step_run.go
+++ b/builder/qemu/step_run.go
@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 // stepRun runs the virtual machine
diff --git a/builder/qemu/step_set_iso.go b/builder/qemu/step_set_iso.go
index eb39f144800..f32a2687bf4 100644
--- a/builder/qemu/step_set_iso.go
+++ b/builder/qemu/step_set_iso.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step set iso_patch to available url
diff --git a/builder/qemu/step_shutdown.go b/builder/qemu/step_shutdown.go
index 2bca7a09eda..88fa42c34b4 100644
--- a/builder/qemu/step_shutdown.go
+++ b/builder/qemu/step_shutdown.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step shuts down the machine. It first attempts to do so gracefully,
diff --git a/builder/qemu/step_type_boot_command.go b/builder/qemu/step_type_boot_command.go
index 2ec58168505..526a792e3c9 100644
--- a/builder/qemu/step_type_boot_command.go
+++ b/builder/qemu/step_type_boot_command.go
@@ -10,11 +10,11 @@ import (
 	"unicode"
 	"unicode/utf8"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"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"
 	"os"
 )
 
diff --git a/builder/triton/access_config.go b/builder/triton/access_config.go
index 08deefdff21..229f63ec980 100644
--- a/builder/triton/access_config.go
+++ b/builder/triton/access_config.go
@@ -6,11 +6,11 @@ import (
 	"log"
 	"os"
 
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/template/interpolate"
 	"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"
 )
 
 // AccessConfig is for common configuration related to Triton access
diff --git a/builder/triton/builder.go b/builder/triton/builder.go
index 3c9f3e8564a..dd9ba30b937 100644
--- a/builder/triton/builder.go
+++ b/builder/triton/builder.go
@@ -4,11 +4,11 @@ import (
 	"log"
 
 	"github.com/hashicorp/go-multierror"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
 	"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"
 )
 
 const (
diff --git a/builder/triton/config.go b/builder/triton/config.go
index 683fb807c40..9a08508b51c 100644
--- a/builder/triton/config.go
+++ b/builder/triton/config.go
@@ -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 --git a/builder/triton/driver_triton.go b/builder/triton/driver_triton.go
index 277ab8ef9bc..cef18bab8e9 100644
--- a/builder/triton/driver_triton.go
+++ b/builder/triton/driver_triton.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/joyent/gosdc/cloudapi"
-	"github.com/mitchellh/packer/packer"
 )
 
 type driverTriton struct {
diff --git a/builder/triton/source_machine_config.go b/builder/triton/source_machine_config.go
index d98cce05b4a..549a2a114e1 100644
--- a/builder/triton/source_machine_config.go
+++ b/builder/triton/source_machine_config.go
@@ -3,7 +3,7 @@ package triton
 import (
 	"fmt"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // SourceMachineConfig represents the configuration to run a machine using
diff --git a/builder/triton/ssh.go b/builder/triton/ssh.go
index 084ad8909cf..496379318b4 100644
--- a/builder/triton/ssh.go
+++ b/builder/triton/ssh.go
@@ -3,8 +3,8 @@ package triton
 import (
 	"fmt"
 
+	packerssh "github.com/hashicorp/packer/communicator/ssh"
 	"github.com/mitchellh/multistep"
-	packerssh "github.com/mitchellh/packer/communicator/ssh"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
 	"io/ioutil"
diff --git a/builder/triton/step_create_image_from_machine.go b/builder/triton/step_create_image_from_machine.go
index dd22015760e..76c46a768fd 100644
--- a/builder/triton/step_create_image_from_machine.go
+++ b/builder/triton/step_create_image_from_machine.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepCreateImageFromMachine creates an image with the specified attributes
diff --git a/builder/triton/step_create_source_machine.go b/builder/triton/step_create_source_machine.go
index 6de30143e0d..b5a8aec1561 100644
--- a/builder/triton/step_create_source_machine.go
+++ b/builder/triton/step_create_source_machine.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepCreateSourceMachine creates an machine with the specified attributes
diff --git a/builder/triton/step_delete_machine.go b/builder/triton/step_delete_machine.go
index 1538212b687..d766f983377 100644
--- a/builder/triton/step_delete_machine.go
+++ b/builder/triton/step_delete_machine.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepDeleteMachine deletes the machine with the ID specified in state["machine"]
diff --git a/builder/triton/step_stop_machine.go b/builder/triton/step_stop_machine.go
index 1974eb7332d..00eb75958df 100644
--- a/builder/triton/step_stop_machine.go
+++ b/builder/triton/step_stop_machine.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepStopMachine stops the machine with the given Machine ID, and waits
diff --git a/builder/triton/step_test.go b/builder/triton/step_test.go
index 1816af2795b..61580edfeb4 100644
--- a/builder/triton/step_test.go
+++ b/builder/triton/step_test.go
@@ -2,8 +2,8 @@ package triton
 
 import (
 	"bytes"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"testing"
 )
 
diff --git a/builder/triton/step_wait_for_stop_to_not_fail.go b/builder/triton/step_wait_for_stop_to_not_fail.go
index dfe719466d9..cd4df47045f 100644
--- a/builder/triton/step_wait_for_stop_to_not_fail.go
+++ b/builder/triton/step_wait_for_stop_to_not_fail.go
@@ -3,8 +3,8 @@ package triton
 import (
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepWaitForStopNotToFail waits for 10 seconds before returning with continue
diff --git a/builder/triton/target_image_config.go b/builder/triton/target_image_config.go
index 3a180a8ee2c..53a9f58f748 100644
--- a/builder/triton/target_image_config.go
+++ b/builder/triton/target_image_config.go
@@ -3,7 +3,7 @@ package triton
 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 --git a/builder/virtualbox/common/artifact.go b/builder/virtualbox/common/artifact.go
index c28fb6c59cc..e560e788d2b 100644
--- a/builder/virtualbox/common/artifact.go
+++ b/builder/virtualbox/common/artifact.go
@@ -5,7 +5,7 @@ import (
 	"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 --git a/builder/virtualbox/common/artifact_test.go b/builder/virtualbox/common/artifact_test.go
index f9ddc5dbfc8..023d2dd44f6 100644
--- a/builder/virtualbox/common/artifact_test.go
+++ b/builder/virtualbox/common/artifact_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifact_impl(t *testing.T) {
diff --git a/builder/virtualbox/common/config_test.go b/builder/virtualbox/common/config_test.go
index eeeda864a3d..e6a902cc2c8 100644
--- a/builder/virtualbox/common/config_test.go
+++ b/builder/virtualbox/common/config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func testConfigTemplate(t *testing.T) *interpolate.Context {
diff --git a/builder/virtualbox/common/export_config.go b/builder/virtualbox/common/export_config.go
index 62e11e607c8..08dfb267c1b 100644
--- a/builder/virtualbox/common/export_config.go
+++ b/builder/virtualbox/common/export_config.go
@@ -3,7 +3,7 @@ package common
 import (
 	"errors"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type ExportConfig struct {
diff --git a/builder/virtualbox/common/export_opts.go b/builder/virtualbox/common/export_opts.go
index cd66da58601..de94a7caa71 100644
--- a/builder/virtualbox/common/export_opts.go
+++ b/builder/virtualbox/common/export_opts.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type ExportOpts struct {
diff --git a/builder/virtualbox/common/output_config.go b/builder/virtualbox/common/output_config.go
index 7b5ddcd4567..14eced008b9 100644
--- a/builder/virtualbox/common/output_config.go
+++ b/builder/virtualbox/common/output_config.go
@@ -3,8 +3,8 @@ package common
 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 --git a/builder/virtualbox/common/output_config_test.go b/builder/virtualbox/common/output_config_test.go
index a4d8e7999a9..08cff37d158 100644
--- a/builder/virtualbox/common/output_config_test.go
+++ b/builder/virtualbox/common/output_config_test.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/common"
+	"github.com/hashicorp/packer/common"
 	"io/ioutil"
 	"os"
 	"testing"
diff --git a/builder/virtualbox/common/run_config.go b/builder/virtualbox/common/run_config.go
index 595667b11ae..6d3f5868681 100644
--- a/builder/virtualbox/common/run_config.go
+++ b/builder/virtualbox/common/run_config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type RunConfig struct {
diff --git a/builder/virtualbox/common/shutdown_config.go b/builder/virtualbox/common/shutdown_config.go
index cbb9396452c..05180ef0975 100644
--- a/builder/virtualbox/common/shutdown_config.go
+++ b/builder/virtualbox/common/shutdown_config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type ShutdownConfig struct {
diff --git a/builder/virtualbox/common/ssh.go b/builder/virtualbox/common/ssh.go
index 0ad514be954..5316a1c31c2 100644
--- a/builder/virtualbox/common/ssh.go
+++ b/builder/virtualbox/common/ssh.go
@@ -1,9 +1,9 @@
 package common
 
 import (
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	"github.com/mitchellh/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/virtualbox/common/ssh_config.go b/builder/virtualbox/common/ssh_config.go
index 3d31781f1ab..3136bca9892 100644
--- a/builder/virtualbox/common/ssh_config.go
+++ b/builder/virtualbox/common/ssh_config.go
@@ -4,8 +4,8 @@ import (
 	"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 --git a/builder/virtualbox/common/ssh_config_test.go b/builder/virtualbox/common/ssh_config_test.go
index d31ab4f0bf2..b7dc7f90e55 100644
--- a/builder/virtualbox/common/ssh_config_test.go
+++ b/builder/virtualbox/common/ssh_config_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func testSSHConfig() *SSHConfig {
diff --git a/builder/virtualbox/common/step_attach_floppy.go b/builder/virtualbox/common/step_attach_floppy.go
index 5ebcf9b5f1e..2386195515e 100644
--- a/builder/virtualbox/common/step_attach_floppy.go
+++ b/builder/virtualbox/common/step_attach_floppy.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"io"
 	"io/ioutil"
 	"log"
diff --git a/builder/virtualbox/common/step_attach_guest_additions.go b/builder/virtualbox/common/step_attach_guest_additions.go
index 6017079d4e7..de51237a5e6 100644
--- a/builder/virtualbox/common/step_attach_guest_additions.go
+++ b/builder/virtualbox/common/step_attach_guest_additions.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/virtualbox/common/step_configure_vrdp.go b/builder/virtualbox/common/step_configure_vrdp.go
index b48a70d605b..9a966c50820 100644
--- a/builder/virtualbox/common/step_configure_vrdp.go
+++ b/builder/virtualbox/common/step_configure_vrdp.go
@@ -6,8 +6,8 @@ import (
 	"math/rand"
 	"net"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step configures the VM to enable the VRDP server
diff --git a/builder/virtualbox/common/step_download_guest_additions.go b/builder/virtualbox/common/step_download_guest_additions.go
index 5ade2457cfd..8039d0fa428 100644
--- a/builder/virtualbox/common/step_download_guest_additions.go
+++ b/builder/virtualbox/common/step_download_guest_additions.go
@@ -9,10 +9,10 @@ import (
 	"os"
 	"strings"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 var additionsVersionMap = map[string]string{
diff --git a/builder/virtualbox/common/step_export.go b/builder/virtualbox/common/step_export.go
index cf1bd18cf68..4e7a6411f82 100644
--- a/builder/virtualbox/common/step_export.go
+++ b/builder/virtualbox/common/step_export.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 	"path/filepath"
 	"strings"
diff --git a/builder/virtualbox/common/step_forward_ssh.go b/builder/virtualbox/common/step_forward_ssh.go
index 0f514a84373..002397395f7 100644
--- a/builder/virtualbox/common/step_forward_ssh.go
+++ b/builder/virtualbox/common/step_forward_ssh.go
@@ -6,9 +6,9 @@ import (
 	"math/rand"
 	"net"
 
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step adds a NAT port forwarding definition so that SSH is available
diff --git a/builder/virtualbox/common/step_output_dir.go b/builder/virtualbox/common/step_output_dir.go
index 1443e5791e3..0054d1994d4 100644
--- a/builder/virtualbox/common/step_output_dir.go
+++ b/builder/virtualbox/common/step_output_dir.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepOutputDir sets up the output directory by creating it if it does
diff --git a/builder/virtualbox/common/step_remove_devices.go b/builder/virtualbox/common/step_remove_devices.go
index 6508a138f06..52d32f1b291 100644
--- a/builder/virtualbox/common/step_remove_devices.go
+++ b/builder/virtualbox/common/step_remove_devices.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step removes any devices (floppy disks, ISOs, etc.) from the
diff --git a/builder/virtualbox/common/step_run.go b/builder/virtualbox/common/step_run.go
index 487f31430e8..3019c57d6b8 100644
--- a/builder/virtualbox/common/step_run.go
+++ b/builder/virtualbox/common/step_run.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step starts the virtual machine.
diff --git a/builder/virtualbox/common/step_shutdown.go b/builder/virtualbox/common/step_shutdown.go
index 1b70485b699..82bcb05abed 100644
--- a/builder/virtualbox/common/step_shutdown.go
+++ b/builder/virtualbox/common/step_shutdown.go
@@ -3,8 +3,8 @@ package common
 import (
 	"errors"
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 	"time"
 )
diff --git a/builder/virtualbox/common/step_shutdown_test.go b/builder/virtualbox/common/step_shutdown_test.go
index a80dec7cd29..769ed64f01e 100644
--- a/builder/virtualbox/common/step_shutdown_test.go
+++ b/builder/virtualbox/common/step_shutdown_test.go
@@ -1,8 +1,8 @@
 package common
 
 import (
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"testing"
 	"time"
 )
diff --git a/builder/virtualbox/common/step_suppress_messages.go b/builder/virtualbox/common/step_suppress_messages.go
index a99576f12fc..863606526c5 100644
--- a/builder/virtualbox/common/step_suppress_messages.go
+++ b/builder/virtualbox/common/step_suppress_messages.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/virtualbox/common/step_test.go b/builder/virtualbox/common/step_test.go
index 9bf6d5d67c1..c6424b692bc 100644
--- a/builder/virtualbox/common/step_test.go
+++ b/builder/virtualbox/common/step_test.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"bytes"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"testing"
 )
 
diff --git a/builder/virtualbox/common/step_type_boot_command.go b/builder/virtualbox/common/step_type_boot_command.go
index 26d5a965860..3220ca8b8ac 100644
--- a/builder/virtualbox/common/step_type_boot_command.go
+++ b/builder/virtualbox/common/step_type_boot_command.go
@@ -8,10 +8,10 @@ import (
 	"unicode"
 	"unicode/utf8"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 const KeyLeftShift uint32 = 0xFFE1
diff --git a/builder/virtualbox/common/step_upload_guest_additions.go b/builder/virtualbox/common/step_upload_guest_additions.go
index ccc054616e7..a98676555b0 100644
--- a/builder/virtualbox/common/step_upload_guest_additions.go
+++ b/builder/virtualbox/common/step_upload_guest_additions.go
@@ -5,9 +5,9 @@ import (
 	"log"
 	"os"
 
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type guestAdditionsPathTemplate struct {
diff --git a/builder/virtualbox/common/step_upload_version.go b/builder/virtualbox/common/step_upload_version.go
index 02566c8cbe1..ab1ca6c7f59 100644
--- a/builder/virtualbox/common/step_upload_version.go
+++ b/builder/virtualbox/common/step_upload_version.go
@@ -3,8 +3,8 @@ package common
 import (
 	"bytes"
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/virtualbox/common/step_upload_version_test.go b/builder/virtualbox/common/step_upload_version_test.go
index 234c4b5df1c..1414a2278c6 100644
--- a/builder/virtualbox/common/step_upload_version_test.go
+++ b/builder/virtualbox/common/step_upload_version_test.go
@@ -1,8 +1,8 @@
 package common
 
 import (
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"testing"
 )
 
diff --git a/builder/virtualbox/common/step_vboxmanage.go b/builder/virtualbox/common/step_vboxmanage.go
index 4eae387eef5..7544dbbceea 100644
--- a/builder/virtualbox/common/step_vboxmanage.go
+++ b/builder/virtualbox/common/step_vboxmanage.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type commandTemplate struct {
diff --git a/builder/virtualbox/common/vbox_version_config.go b/builder/virtualbox/common/vbox_version_config.go
index 5ece4d12ae4..2b2b8788616 100644
--- a/builder/virtualbox/common/vbox_version_config.go
+++ b/builder/virtualbox/common/vbox_version_config.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type VBoxVersionConfig struct {
diff --git a/builder/virtualbox/common/vboxmanage_config.go b/builder/virtualbox/common/vboxmanage_config.go
index 1670aee0d29..7ee0a19ce42 100644
--- a/builder/virtualbox/common/vboxmanage_config.go
+++ b/builder/virtualbox/common/vboxmanage_config.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type VBoxManageConfig struct {
diff --git a/builder/virtualbox/common/vboxmanage_post_config.go b/builder/virtualbox/common/vboxmanage_post_config.go
index 570e9b1fc68..d05913f9fbc 100644
--- a/builder/virtualbox/common/vboxmanage_post_config.go
+++ b/builder/virtualbox/common/vboxmanage_post_config.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type VBoxManagePostConfig struct {
diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go
index f9def252852..f5442184ef7 100644
--- a/builder/virtualbox/iso/builder.go
+++ b/builder/virtualbox/iso/builder.go
@@ -6,13 +6,13 @@ import (
 	"log"
 	"strings"
 
+	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"
 	"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"
 )
 
 const BuilderId = "mitchellh.virtualbox"
diff --git a/builder/virtualbox/iso/builder_acc_test.go b/builder/virtualbox/iso/builder_acc_test.go
index d756f452e95..630d4094f8a 100644
--- a/builder/virtualbox/iso/builder_acc_test.go
+++ b/builder/virtualbox/iso/builder_acc_test.go
@@ -3,7 +3,7 @@ package iso
 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 --git a/builder/virtualbox/iso/builder_test.go b/builder/virtualbox/iso/builder_test.go
index 5cf8bde2827..370ebe675de 100644
--- a/builder/virtualbox/iso/builder_test.go
+++ b/builder/virtualbox/iso/builder_test.go
@@ -5,8 +5,8 @@ import (
 	"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 --git a/builder/virtualbox/iso/step_attach_iso.go b/builder/virtualbox/iso/step_attach_iso.go
index dfba91b7b86..a997ee8230b 100644
--- a/builder/virtualbox/iso/step_attach_iso.go
+++ b/builder/virtualbox/iso/step_attach_iso.go
@@ -2,9 +2,9 @@ package iso
 
 import (
 	"fmt"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step attaches the ISO to the virtual machine.
diff --git a/builder/virtualbox/iso/step_create_disk.go b/builder/virtualbox/iso/step_create_disk.go
index 52e159687b6..bc581040ed4 100644
--- a/builder/virtualbox/iso/step_create_disk.go
+++ b/builder/virtualbox/iso/step_create_disk.go
@@ -2,9 +2,9 @@ package iso
 
 import (
 	"fmt"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/packer"
 	"path/filepath"
 	"strconv"
 	"strings"
diff --git a/builder/virtualbox/iso/step_create_vm.go b/builder/virtualbox/iso/step_create_vm.go
index 66cd75139d7..149fd6d9ac3 100644
--- a/builder/virtualbox/iso/step_create_vm.go
+++ b/builder/virtualbox/iso/step_create_vm.go
@@ -2,9 +2,9 @@ package iso
 
 import (
 	"fmt"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/packer"
 	"time"
 )
 
diff --git a/builder/virtualbox/ovf/builder.go b/builder/virtualbox/ovf/builder.go
index 9607a0717ed..475bbebcfa5 100644
--- a/builder/virtualbox/ovf/builder.go
+++ b/builder/virtualbox/ovf/builder.go
@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"log"
 
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"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"
 )
 
 // Builder implements packer.Builder and builds the actual VirtualBox
diff --git a/builder/virtualbox/ovf/config.go b/builder/virtualbox/ovf/config.go
index 0151c3ca127..51d394fdb20 100644
--- a/builder/virtualbox/ovf/config.go
+++ b/builder/virtualbox/ovf/config.go
@@ -4,11 +4,11 @@ import (
 	"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 --git a/builder/virtualbox/ovf/config_test.go b/builder/virtualbox/ovf/config_test.go
index 9797c48317f..980c4d4ef5e 100644
--- a/builder/virtualbox/ovf/config_test.go
+++ b/builder/virtualbox/ovf/config_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig(t *testing.T) map[string]interface{} {
diff --git a/builder/virtualbox/ovf/step_import.go b/builder/virtualbox/ovf/step_import.go
index 2d8887444d2..6e293d31bd0 100644
--- a/builder/virtualbox/ovf/step_import.go
+++ b/builder/virtualbox/ovf/step_import.go
@@ -2,9 +2,9 @@ package ovf
 
 import (
 	"fmt"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step imports an OVF VM into VirtualBox.
diff --git a/builder/virtualbox/ovf/step_import_test.go b/builder/virtualbox/ovf/step_import_test.go
index 7d535dc0514..217fee6327f 100644
--- a/builder/virtualbox/ovf/step_import_test.go
+++ b/builder/virtualbox/ovf/step_import_test.go
@@ -1,8 +1,8 @@
 package ovf
 
 import (
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
 	"testing"
 )
 
diff --git a/builder/virtualbox/ovf/step_test.go b/builder/virtualbox/ovf/step_test.go
index d53e2915489..cbd18dbd57d 100644
--- a/builder/virtualbox/ovf/step_test.go
+++ b/builder/virtualbox/ovf/step_test.go
@@ -2,9 +2,9 @@ package ovf
 
 import (
 	"bytes"
+	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	vboxcommon "github.com/mitchellh/packer/builder/virtualbox/common"
-	"github.com/mitchellh/packer/packer"
 	"testing"
 )
 
diff --git a/builder/vmware/common/artifact.go b/builder/vmware/common/artifact.go
index 15d797f3fc5..48fcb813946 100644
--- a/builder/vmware/common/artifact.go
+++ b/builder/vmware/common/artifact.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // BuilderId for the local artifacts
diff --git a/builder/vmware/common/artifact_test.go b/builder/vmware/common/artifact_test.go
index a0379b82d45..e081cc3583d 100644
--- a/builder/vmware/common/artifact_test.go
+++ b/builder/vmware/common/artifact_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestLocalArtifact_impl(t *testing.T) {
diff --git a/builder/vmware/common/config_test.go b/builder/vmware/common/config_test.go
index eeeda864a3d..e6a902cc2c8 100644
--- a/builder/vmware/common/config_test.go
+++ b/builder/vmware/common/config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func testConfigTemplate(t *testing.T) *interpolate.Context {
diff --git a/builder/vmware/common/driver_config.go b/builder/vmware/common/driver_config.go
index ecd42b0f558..13c9e96ac98 100644
--- a/builder/vmware/common/driver_config.go
+++ b/builder/vmware/common/driver_config.go
@@ -3,7 +3,7 @@ package common
 import (
 	"os"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type DriverConfig struct {
diff --git a/builder/vmware/common/output_config.go b/builder/vmware/common/output_config.go
index 7b5ddcd4567..14eced008b9 100644
--- a/builder/vmware/common/output_config.go
+++ b/builder/vmware/common/output_config.go
@@ -3,8 +3,8 @@ package common
 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 --git a/builder/vmware/common/output_config_test.go b/builder/vmware/common/output_config_test.go
index 7de378d8952..34983710fb1 100644
--- a/builder/vmware/common/output_config_test.go
+++ b/builder/vmware/common/output_config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/common"
+	"github.com/hashicorp/packer/common"
 )
 
 func TestOutputConfigPrepare(t *testing.T) {
diff --git a/builder/vmware/common/run_config.go b/builder/vmware/common/run_config.go
index 7af3b963493..89f48b9c60f 100644
--- a/builder/vmware/common/run_config.go
+++ b/builder/vmware/common/run_config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type RunConfig struct {
diff --git a/builder/vmware/common/shutdown_config.go b/builder/vmware/common/shutdown_config.go
index 83d2224c386..faa90268f0d 100644
--- a/builder/vmware/common/shutdown_config.go
+++ b/builder/vmware/common/shutdown_config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type ShutdownConfig struct {
diff --git a/builder/vmware/common/ssh.go b/builder/vmware/common/ssh.go
index 86e184bb55a..c03a4e2dfa5 100644
--- a/builder/vmware/common/ssh.go
+++ b/builder/vmware/common/ssh.go
@@ -7,9 +7,9 @@ import (
 	"log"
 	"os"
 
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	"github.com/mitchellh/packer/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/vmware/common/ssh_config.go b/builder/vmware/common/ssh_config.go
index a0bbf942ea9..47cb9b917e4 100644
--- a/builder/vmware/common/ssh_config.go
+++ b/builder/vmware/common/ssh_config.go
@@ -3,8 +3,8 @@ package common
 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 --git a/builder/vmware/common/ssh_config_test.go b/builder/vmware/common/ssh_config_test.go
index 64889195f3f..43b83f3ad2f 100644
--- a/builder/vmware/common/ssh_config_test.go
+++ b/builder/vmware/common/ssh_config_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mitchellh/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func testSSHConfig() *SSHConfig {
diff --git a/builder/vmware/common/step_clean_files.go b/builder/vmware/common/step_clean_files.go
index de3debccc01..6dc1a730c83 100644
--- a/builder/vmware/common/step_clean_files.go
+++ b/builder/vmware/common/step_clean_files.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"os"
 	"path/filepath"
 )
diff --git a/builder/vmware/common/step_clean_vmx.go b/builder/vmware/common/step_clean_vmx.go
index 42870f48e27..816a353b6cb 100755
--- a/builder/vmware/common/step_clean_vmx.go
+++ b/builder/vmware/common/step_clean_vmx.go
@@ -6,8 +6,8 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step cleans up the VMX by removing or changing this prior to
diff --git a/builder/vmware/common/step_compact_disk.go b/builder/vmware/common/step_compact_disk.go
index 9a81c98c838..d3eabec6f55 100644
--- a/builder/vmware/common/step_compact_disk.go
+++ b/builder/vmware/common/step_compact_disk.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/vmware/common/step_configure_vmx.go b/builder/vmware/common/step_configure_vmx.go
index 7c8ca77173e..854922a2c93 100755
--- a/builder/vmware/common/step_configure_vmx.go
+++ b/builder/vmware/common/step_configure_vmx.go
@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step configures a VMX by setting some default settings as well
diff --git a/builder/vmware/common/step_configure_vnc.go b/builder/vmware/common/step_configure_vnc.go
index bc65fc649a0..4b6a6cdaed5 100644
--- a/builder/vmware/common/step_configure_vnc.go
+++ b/builder/vmware/common/step_configure_vnc.go
@@ -8,8 +8,8 @@ import (
 	"net"
 	"os"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step configures the VM to enable the VNC server.
diff --git a/builder/vmware/common/step_output_dir.go b/builder/vmware/common/step_output_dir.go
index 9807296ba46..2b679f1fc7f 100644
--- a/builder/vmware/common/step_output_dir.go
+++ b/builder/vmware/common/step_output_dir.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepOutputDir sets up the output directory by creating it if it does
diff --git a/builder/vmware/common/step_run.go b/builder/vmware/common/step_run.go
index 3e81dab3385..bd463799d52 100644
--- a/builder/vmware/common/step_run.go
+++ b/builder/vmware/common/step_run.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"time"
 )
 
diff --git a/builder/vmware/common/step_shutdown.go b/builder/vmware/common/step_shutdown.go
index 8fcef74960a..829ea1a3b53 100644
--- a/builder/vmware/common/step_shutdown.go
+++ b/builder/vmware/common/step_shutdown.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 	"regexp"
 	"runtime"
diff --git a/builder/vmware/common/step_shutdown_test.go b/builder/vmware/common/step_shutdown_test.go
index cdbda852d01..b693527da2d 100644
--- a/builder/vmware/common/step_shutdown_test.go
+++ b/builder/vmware/common/step_shutdown_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 func testStepShutdownState(t *testing.T) multistep.StateBag {
diff --git a/builder/vmware/common/step_suppress_messages.go b/builder/vmware/common/step_suppress_messages.go
index a02b6933637..ca83506bf5b 100644
--- a/builder/vmware/common/step_suppress_messages.go
+++ b/builder/vmware/common/step_suppress_messages.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/vmware/common/step_test.go b/builder/vmware/common/step_test.go
index 9bf6d5d67c1..c6424b692bc 100644
--- a/builder/vmware/common/step_test.go
+++ b/builder/vmware/common/step_test.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"bytes"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"testing"
 )
 
diff --git a/builder/vmware/common/step_type_boot_command.go b/builder/vmware/common/step_type_boot_command.go
index f4d7367c8c6..e82a07031d8 100644
--- a/builder/vmware/common/step_type_boot_command.go
+++ b/builder/vmware/common/step_type_boot_command.go
@@ -11,11 +11,11 @@ import (
 	"unicode"
 	"unicode/utf8"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"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"
 )
 
 const KeyLeftShift uint32 = 0xFFE1
diff --git a/builder/vmware/common/step_upload_tools.go b/builder/vmware/common/step_upload_tools.go
index 3f721496599..dfa8fcb887c 100644
--- a/builder/vmware/common/step_upload_tools.go
+++ b/builder/vmware/common/step_upload_tools.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type toolsUploadPathTemplate struct {
diff --git a/builder/vmware/common/tools_config.go b/builder/vmware/common/tools_config.go
index 923e531bf10..8bf5c9bada9 100644
--- a/builder/vmware/common/tools_config.go
+++ b/builder/vmware/common/tools_config.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type ToolsConfig struct {
diff --git a/builder/vmware/common/vmx_config.go b/builder/vmware/common/vmx_config.go
index aac16d1e035..c8f19fa0d23 100644
--- a/builder/vmware/common/vmx_config.go
+++ b/builder/vmware/common/vmx_config.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type VMXConfig struct {
diff --git a/builder/vmware/iso/artifact_test.go b/builder/vmware/iso/artifact_test.go
index 4394c2735f3..c18e6011936 100644
--- a/builder/vmware/iso/artifact_test.go
+++ b/builder/vmware/iso/artifact_test.go
@@ -1,7 +1,7 @@
 package iso
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go
index 7d3b93a3b05..1f78944b7b9 100755
--- a/builder/vmware/iso/builder.go
+++ b/builder/vmware/iso/builder.go
@@ -8,13 +8,13 @@ import (
 	"os"
 	"time"
 
+	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"
 	"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"
 )
 
 const BuilderIdESX = "mitchellh.vmware-esx"
diff --git a/builder/vmware/iso/builder_test.go b/builder/vmware/iso/builder_test.go
index 886d01daef7..ab01a270c34 100644
--- a/builder/vmware/iso/builder_test.go
+++ b/builder/vmware/iso/builder_test.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/builder/vmware/iso/driver.go b/builder/vmware/iso/driver.go
index ba96afe07ea..6a1b899185d 100644
--- a/builder/vmware/iso/driver.go
+++ b/builder/vmware/iso/driver.go
@@ -3,7 +3,7 @@ package iso
 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 --git a/builder/vmware/iso/driver_esx5.go b/builder/vmware/iso/driver_esx5.go
index 80dc1878de0..cd0002abc11 100644
--- a/builder/vmware/iso/driver_esx5.go
+++ b/builder/vmware/iso/driver_esx5.go
@@ -14,10 +14,10 @@ import (
 	"strings"
 	"time"
 
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	"github.com/mitchellh/packer/communicator/ssh"
-	"github.com/mitchellh/packer/packer"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/vmware/iso/driver_esx5_test.go b/builder/vmware/iso/driver_esx5_test.go
index 3b0953f7403..6ce714ff1be 100644
--- a/builder/vmware/iso/driver_esx5_test.go
+++ b/builder/vmware/iso/driver_esx5_test.go
@@ -5,8 +5,8 @@ import (
 	"net"
 	"testing"
 
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
 )
 
 func TestESX5Driver_implDriver(t *testing.T) {
diff --git a/builder/vmware/iso/remote_driver.go b/builder/vmware/iso/remote_driver.go
index 378c949d49c..4c6dc18e4e5 100644
--- a/builder/vmware/iso/remote_driver.go
+++ b/builder/vmware/iso/remote_driver.go
@@ -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 --git a/builder/vmware/iso/remote_driver_mock.go b/builder/vmware/iso/remote_driver_mock.go
index dcd1ba0aa43..adf5fa7131c 100644
--- a/builder/vmware/iso/remote_driver_mock.go
+++ b/builder/vmware/iso/remote_driver_mock.go
@@ -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 --git a/builder/vmware/iso/remote_driver_mock_test.go b/builder/vmware/iso/remote_driver_mock_test.go
index 86779a8477b..dd7a26e0aff 100644
--- a/builder/vmware/iso/remote_driver_mock_test.go
+++ b/builder/vmware/iso/remote_driver_mock_test.go
@@ -3,7 +3,7 @@ package iso
 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 --git a/builder/vmware/iso/step_create_disk.go b/builder/vmware/iso/step_create_disk.go
index ded3a86dac7..46359978024 100644
--- a/builder/vmware/iso/step_create_disk.go
+++ b/builder/vmware/iso/step_create_disk.go
@@ -2,9 +2,9 @@ package iso
 
 import (
 	"fmt"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
 	"path/filepath"
 )
 
diff --git a/builder/vmware/iso/step_create_vmx.go b/builder/vmware/iso/step_create_vmx.go
index 23281cd0122..1f4ee812f9d 100755
--- a/builder/vmware/iso/step_create_vmx.go
+++ b/builder/vmware/iso/step_create_vmx.go
@@ -6,10 +6,10 @@ import (
 	"os"
 	"path/filepath"
 
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 type vmxTemplateData struct {
diff --git a/builder/vmware/iso/step_export.go b/builder/vmware/iso/step_export.go
index 734158b52b4..3d055ddb430 100644
--- a/builder/vmware/iso/step_export.go
+++ b/builder/vmware/iso/step_export.go
@@ -10,8 +10,8 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepExport struct {
diff --git a/builder/vmware/iso/step_register.go b/builder/vmware/iso/step_register.go
index 5a3c9bf6def..a90de5fa228 100644
--- a/builder/vmware/iso/step_register.go
+++ b/builder/vmware/iso/step_register.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"
 
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 type StepRegister struct {
diff --git a/builder/vmware/iso/step_remote_upload.go b/builder/vmware/iso/step_remote_upload.go
index 1fc66a54173..6ef27bce66f 100644
--- a/builder/vmware/iso/step_remote_upload.go
+++ b/builder/vmware/iso/step_remote_upload.go
@@ -2,9 +2,9 @@ package iso
 
 import (
 	"fmt"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
 	"log"
 )
 
diff --git a/builder/vmware/iso/step_test.go b/builder/vmware/iso/step_test.go
index aad099af509..783d38796a0 100644
--- a/builder/vmware/iso/step_test.go
+++ b/builder/vmware/iso/step_test.go
@@ -2,9 +2,9 @@ package iso
 
 import (
 	"bytes"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
 	"testing"
 )
 
diff --git a/builder/vmware/iso/step_upload_vmx.go b/builder/vmware/iso/step_upload_vmx.go
index 96dde2cfccd..39532674bb4 100644
--- a/builder/vmware/iso/step_upload_vmx.go
+++ b/builder/vmware/iso/step_upload_vmx.go
@@ -2,9 +2,9 @@ package iso
 
 import (
 	"fmt"
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
 	"path/filepath"
 )
 
diff --git a/builder/vmware/vmx/builder.go b/builder/vmware/vmx/builder.go
index f417b2e1fca..6576db46299 100644
--- a/builder/vmware/vmx/builder.go
+++ b/builder/vmware/vmx/builder.go
@@ -6,11 +6,11 @@ import (
 	"log"
 	"time"
 
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"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"
 )
 
 // Builder implements packer.Builder and builds the actual VMware
diff --git a/builder/vmware/vmx/builder_test.go b/builder/vmware/vmx/builder_test.go
index 22b639f2b88..841d4f718c6 100644
--- a/builder/vmware/vmx/builder_test.go
+++ b/builder/vmware/vmx/builder_test.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestBuilderPrepare_FloppyFiles(t *testing.T) {
diff --git a/builder/vmware/vmx/config.go b/builder/vmware/vmx/config.go
index 52ba61582ff..93e8347c6ff 100644
--- a/builder/vmware/vmx/config.go
+++ b/builder/vmware/vmx/config.go
@@ -4,11 +4,11 @@ import (
 	"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 --git a/builder/vmware/vmx/step_clone_vmx.go b/builder/vmware/vmx/step_clone_vmx.go
index a020e162788..eaa6607c5f1 100755
--- a/builder/vmware/vmx/step_clone_vmx.go
+++ b/builder/vmware/vmx/step_clone_vmx.go
@@ -5,9 +5,9 @@ import (
 	"log"
 	"path/filepath"
 
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepCloneVMX takes a VMX file and clones the VM into the output directory.
diff --git a/builder/vmware/vmx/step_clone_vmx_test.go b/builder/vmware/vmx/step_clone_vmx_test.go
index 8b8b5a056c1..3b4cea1d54c 100644
--- a/builder/vmware/vmx/step_clone_vmx_test.go
+++ b/builder/vmware/vmx/step_clone_vmx_test.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"testing"
 
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
 )
 
 func TestStepCloneVMX_impl(t *testing.T) {
diff --git a/builder/vmware/vmx/step_test.go b/builder/vmware/vmx/step_test.go
index ad8075a6150..60e2f890ce9 100644
--- a/builder/vmware/vmx/step_test.go
+++ b/builder/vmware/vmx/step_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
+	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	vmwcommon "github.com/mitchellh/packer/builder/vmware/common"
-	"github.com/mitchellh/packer/packer"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/checkpoint.go b/checkpoint.go
index 3fbd37b3fa9..bbefeef5e58 100644
--- a/checkpoint.go
+++ b/checkpoint.go
@@ -6,9 +6,9 @@ import (
 	"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 --git a/command/build.go b/command/build.go
index 9e79326a4b4..de9da51eeef 100644
--- a/command/build.go
+++ b/command/build.go
@@ -10,9 +10,9 @@ import (
 	"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 --git a/command/build_test.go b/command/build_test.go
index aa35a385f0b..f5ec395f884 100644
--- a/command/build_test.go
+++ b/command/build_test.go
@@ -6,8 +6,8 @@ import (
 	"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 --git a/command/command_test.go b/command/command_test.go
index 4ba4b878770..31f1e3d54d2 100644
--- a/command/command_test.go
+++ b/command/command_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 const fixturesDir = "./test-fixtures"
diff --git a/command/fix.go b/command/fix.go
index 451742ebbfe..1a94f5786e2 100644
--- a/command/fix.go
+++ b/command/fix.go
@@ -8,8 +8,8 @@ import (
 	"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 --git a/command/inspect.go b/command/inspect.go
index 49302b02324..71ddbba1dd5 100644
--- a/command/inspect.go
+++ b/command/inspect.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/mitchellh/packer/template"
+	"github.com/hashicorp/packer/template"
 )
 
 type InspectCommand struct {
diff --git a/command/meta.go b/command/meta.go
index d22efcababb..b8dfdfbf502 100644
--- a/command/meta.go
+++ b/command/meta.go
@@ -6,10 +6,10 @@ import (
 	"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 --git a/command/plugin.go b/command/plugin.go
index 8f09f0a7448..fdeab3e45f1 100644
--- a/command/plugin.go
+++ b/command/plugin.go
@@ -10,62 +10,62 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/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"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer/plugin"
+
+	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 --git a/command/push.go b/command/push.go
index 9394d4fe8eb..a0edd6b84cc 100644
--- a/command/push.go
+++ b/command/push.go
@@ -11,8 +11,8 @@ import (
 
 	"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 --git a/command/validate.go b/command/validate.go
index c8f333fcf19..a2fb47ff620 100644
--- a/command/validate.go
+++ b/command/validate.go
@@ -5,8 +5,8 @@ import (
 	"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 --git a/commands.go b/commands.go
index 9b02b594106..17b6a7f368c 100644
--- a/commands.go
+++ b/commands.go
@@ -1,9 +1,9 @@
 package main
 
 import (
+	"github.com/hashicorp/packer/command"
+	"github.com/hashicorp/packer/version"
 	"github.com/mitchellh/cli"
-	"github.com/mitchellh/packer/command"
-	"github.com/mitchellh/packer/version"
 )
 
 // Commands is the mapping of all the available Packer commands.
diff --git a/common/floppy_config.go b/common/floppy_config.go
index ecaa5eddb8d..b1338cbcb56 100644
--- a/common/floppy_config.go
+++ b/common/floppy_config.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type FloppyConfig struct {
diff --git a/common/http_config.go b/common/http_config.go
index 41381c2a04a..bb9b46b26a8 100644
--- a/common/http_config.go
+++ b/common/http_config.go
@@ -3,7 +3,7 @@ package common
 import (
 	"errors"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // HTTPConfig contains configuration for the local HTTP Server
diff --git a/common/iso_config.go b/common/iso_config.go
index 254296e7a86..07f005f7557 100644
--- a/common/iso_config.go
+++ b/common/iso_config.go
@@ -11,7 +11,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // ISOConfig contains configuration for downloading ISO images.
diff --git a/common/multistep_debug.go b/common/multistep_debug.go
index 8de05c48de2..b726ce2c3c0 100644
--- a/common/multistep_debug.go
+++ b/common/multistep_debug.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 	"time"
 )
diff --git a/common/multistep_runner.go b/common/multistep_runner.go
index 512a3ecd462..6f7c0a7cbf0 100644
--- a/common/multistep_runner.go
+++ b/common/multistep_runner.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 func newRunner(steps []multistep.Step, config PackerConfig, ui packer.Ui) (multistep.Runner, multistep.DebugPauseFn) {
diff --git a/common/powershell/hyperv/hyperv.go b/common/powershell/hyperv/hyperv.go
index a674857b0f3..125e5609932 100644
--- a/common/powershell/hyperv/hyperv.go
+++ b/common/powershell/hyperv/hyperv.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mitchellh/packer/common/powershell"
+	"github.com/hashicorp/packer/common/powershell"
 )
 
 func GetHostAdapterIpAddressForSwitch(switchName string) (string, error) {
diff --git a/common/step_create_floppy.go b/common/step_create_floppy.go
index d00bc4da87b..5f05eea78c0 100644
--- a/common/step_create_floppy.go
+++ b/common/step_create_floppy.go
@@ -10,10 +10,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/go-fs"
 	"github.com/mitchellh/go-fs/fat"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepCreateFloppy will create a floppy disk with the given files.
diff --git a/common/step_create_floppy_test.go b/common/step_create_floppy_test.go
index cfdf3989e7d..f5cc16b64a9 100644
--- a/common/step_create_floppy_test.go
+++ b/common/step_create_floppy_test.go
@@ -3,8 +3,8 @@ package common
 import (
 	"bytes"
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"io/ioutil"
 	"log"
 	"os"
diff --git a/common/step_download.go b/common/step_download.go
index b8bd60b5e72..f63070a041f 100644
--- a/common/step_download.go
+++ b/common/step_download.go
@@ -7,8 +7,8 @@ import (
 	"log"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepDownload downloads a remote file using the download client within
diff --git a/common/step_http_server.go b/common/step_http_server.go
index e1664a01bd3..3752b51c602 100644
--- a/common/step_http_server.go
+++ b/common/step_http_server.go
@@ -10,8 +10,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 // This step creates and runs the HTTP server that is serving files from the
diff --git a/common/step_provision.go b/common/step_provision.go
index f40cfd896dd..14074d7a138 100644
--- a/common/step_provision.go
+++ b/common/step_provision.go
@@ -1,8 +1,8 @@
 package common
 
 import (
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"log"
 	"time"
 )
diff --git a/communicator/none/communicator.go b/communicator/none/communicator.go
index 267c8c6c6a8..4e08aba1bf7 100644
--- a/communicator/none/communicator.go
+++ b/communicator/none/communicator.go
@@ -2,7 +2,7 @@ package none
 
 import (
 	"errors"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io"
 	"os"
 )
diff --git a/communicator/none/communicator_test.go b/communicator/none/communicator_test.go
index 1153afb5c94..081fbfe7751 100644
--- a/communicator/none/communicator_test.go
+++ b/communicator/none/communicator_test.go
@@ -3,7 +3,7 @@ package none
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestCommIsCommunicator(t *testing.T) {
diff --git a/communicator/ssh/communicator.go b/communicator/ssh/communicator.go
index ab828d747e9..a6a7f9cf9bc 100644
--- a/communicator/ssh/communicator.go
+++ b/communicator/ssh/communicator.go
@@ -15,7 +15,7 @@ import (
 	"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 --git a/communicator/ssh/communicator_test.go b/communicator/ssh/communicator_test.go
index b0bc03508a9..fa43ed1eeb7 100644
--- a/communicator/ssh/communicator_test.go
+++ b/communicator/ssh/communicator_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/communicator/winrm/communicator.go b/communicator/winrm/communicator.go
index d3c6ee46dce..69f89194e56 100644
--- a/communicator/winrm/communicator.go
+++ b/communicator/winrm/communicator.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/masterzen/winrm"
-	"github.com/mitchellh/packer/packer"
 	"github.com/packer-community/winrmcp/winrmcp"
 )
 
diff --git a/communicator/winrm/communicator_test.go b/communicator/winrm/communicator_test.go
index dde9dd38156..5f61680f91a 100644
--- a/communicator/winrm/communicator_test.go
+++ b/communicator/winrm/communicator_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/dylanmei/winrmtest"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func newMockWinRMServer(t *testing.T) *winrmtest.Remote {
diff --git a/config.go b/config.go
index a62e28323f7..409b8f12d9b 100644
--- a/config.go
+++ b/config.go
@@ -11,10 +11,10 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/hashicorp/packer/command"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer/plugin"
 	"github.com/kardianos/osext"
-	"github.com/mitchellh/packer/command"
-	"github.com/mitchellh/packer/packer"
-	"github.com/mitchellh/packer/packer/plugin"
 )
 
 // PACKERSPACE is used to represent the spaces that separate args for a command
diff --git a/helper/builder/testing/testing.go b/helper/builder/testing/testing.go
index 0bfb136ae23..7e862af9dfb 100644
--- a/helper/builder/testing/testing.go
+++ b/helper/builder/testing/testing.go
@@ -8,8 +8,8 @@ import (
 	"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 --git a/helper/communicator/config.go b/helper/communicator/config.go
index 5c55fee629c..560b061b780 100644
--- a/helper/communicator/config.go
+++ b/helper/communicator/config.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/masterzen/winrm"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 // Config is the common configuration that communicators allow within
diff --git a/helper/communicator/config_test.go b/helper/communicator/config_test.go
index a6c7cfac28c..a81dba53fc1 100644
--- a/helper/communicator/config_test.go
+++ b/helper/communicator/config_test.go
@@ -3,7 +3,7 @@ package communicator
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func testConfig() *Config {
diff --git a/helper/communicator/step_connect.go b/helper/communicator/step_connect.go
index 4e3ddaf1475..7d738e4cce8 100644
--- a/helper/communicator/step_connect.go
+++ b/helper/communicator/step_connect.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/packer/communicator/none"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/communicator/none"
-	"github.com/mitchellh/packer/packer"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff --git a/helper/communicator/step_connect_ssh.go b/helper/communicator/step_connect_ssh.go
index 71a6d1a3992..f3f5c5bdb89 100644
--- a/helper/communicator/step_connect_ssh.go
+++ b/helper/communicator/step_connect_ssh.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 	"time"
 
+	commonssh "github.com/hashicorp/packer/common/ssh"
+	"github.com/hashicorp/packer/communicator/ssh"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	commonssh "github.com/mitchellh/packer/common/ssh"
-	"github.com/mitchellh/packer/communicator/ssh"
-	"github.com/mitchellh/packer/packer"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff --git a/helper/communicator/step_connect_test.go b/helper/communicator/step_connect_test.go
index bf908f8fbe1..d83625dd2ff 100644
--- a/helper/communicator/step_connect_test.go
+++ b/helper/communicator/step_connect_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 func TestStepConnect_impl(t *testing.T) {
diff --git a/helper/communicator/step_connect_winrm.go b/helper/communicator/step_connect_winrm.go
index a2b53ea9007..2318bc1c0c7 100644
--- a/helper/communicator/step_connect_winrm.go
+++ b/helper/communicator/step_connect_winrm.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"time"
 
+	"github.com/hashicorp/packer/communicator/winrm"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/communicator/winrm"
-	"github.com/mitchellh/packer/packer"
 )
 
 // StepConnectWinRM is a multistep Step implementation that waits for WinRM
diff --git a/helper/config/decode.go b/helper/config/decode.go
index 620198e35ce..8e573dd13ef 100644
--- a/helper/config/decode.go
+++ b/helper/config/decode.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/hashicorp/go-multierror"
+	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/mapstructure"
-	"github.com/mitchellh/packer/template/interpolate"
 )
 
 // DecodeOpts are the options for decoding configuration.
diff --git a/helper/config/decode_test.go b/helper/config/decode_test.go
index f325ae4a5ea..a04329f27e9 100644
--- a/helper/config/decode_test.go
+++ b/helper/config/decode_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mitchellh/packer/template/interpolate"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func TestDecode(t *testing.T) {
diff --git a/main.go b/main.go
index 06a4c7402bf..6bca18d2de5 100644
--- a/main.go
+++ b/main.go
@@ -16,11 +16,11 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-uuid"
+	"github.com/hashicorp/packer/command"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer/plugin"
+	"github.com/hashicorp/packer/version"
 	"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/mitchellh/panicwrap"
 	"github.com/mitchellh/prefixedio"
 )
diff --git a/main_test.go b/main_test.go
index 0bc7ba96ffa..f4d44bbf120 100644
--- a/main_test.go
+++ b/main_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/hashicorp/packer/command"
 	"github.com/mitchellh/cli"
-	"github.com/mitchellh/packer/command"
 )
 
 func TestExcludeHelpFunc(t *testing.T) {
diff --git a/packer/core.go b/packer/core.go
index 860e1808b44..4371fbbc400 100644
--- a/packer/core.go
+++ b/packer/core.go
@@ -6,8 +6,8 @@ import (
 
 	"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 --git a/packer/core_test.go b/packer/core_test.go
index 07acea43cf4..6edf63c168a 100644
--- a/packer/core_test.go
+++ b/packer/core_test.go
@@ -6,8 +6,8 @@ import (
 	"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 --git a/packer/plugin/builder.go b/packer/plugin/builder.go
index a0a89d57bc0..9036cc1b1cc 100644
--- a/packer/plugin/builder.go
+++ b/packer/plugin/builder.go
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff --git a/packer/plugin/client.go b/packer/plugin/client.go
index e4eabfa3aae..67f2ad23e65 100644
--- a/packer/plugin/client.go
+++ b/packer/plugin/client.go
@@ -4,8 +4,8 @@ import (
 	"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 --git a/packer/plugin/hook.go b/packer/plugin/hook.go
index 5d4dbf06a3b..7d9f8f03f12 100644
--- a/packer/plugin/hook.go
+++ b/packer/plugin/hook.go
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff --git a/packer/plugin/plugin_test.go b/packer/plugin/plugin_test.go
index 23f994ea0ff..d35e7bb7b98 100644
--- a/packer/plugin/plugin_test.go
+++ b/packer/plugin/plugin_test.go
@@ -2,7 +2,7 @@ package plugin
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"os"
 	"os/exec"
diff --git a/packer/plugin/post_processor.go b/packer/plugin/post_processor.go
index 48314056413..bb801448a15 100644
--- a/packer/plugin/post_processor.go
+++ b/packer/plugin/post_processor.go
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff --git a/packer/plugin/post_processor_test.go b/packer/plugin/post_processor_test.go
index df8a799f7cb..4c545142d8a 100644
--- a/packer/plugin/post_processor_test.go
+++ b/packer/plugin/post_processor_test.go
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"os/exec"
 	"testing"
 )
diff --git a/packer/plugin/provisioner.go b/packer/plugin/provisioner.go
index 0feb9d727d5..d71854a58d7 100644
--- a/packer/plugin/provisioner.go
+++ b/packer/plugin/provisioner.go
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 )
 
diff --git a/packer/plugin/server.go b/packer/plugin/server.go
index 191b8ba312f..667907a5f39 100644
--- a/packer/plugin/server.go
+++ b/packer/plugin/server.go
@@ -10,7 +10,7 @@ package plugin
 import (
 	"errors"
 	"fmt"
-	packrpc "github.com/mitchellh/packer/packer/rpc"
+	packrpc "github.com/hashicorp/packer/packer/rpc"
 	"io/ioutil"
 	"log"
 	"math/rand"
diff --git a/packer/rpc/artifact.go b/packer/rpc/artifact.go
index 3532cfbadfd..4d01bbabd89 100644
--- a/packer/rpc/artifact.go
+++ b/packer/rpc/artifact.go
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"net/rpc"
 )
 
diff --git a/packer/rpc/artifact_test.go b/packer/rpc/artifact_test.go
index 37f4cef9f73..6959c32394f 100644
--- a/packer/rpc/artifact_test.go
+++ b/packer/rpc/artifact_test.go
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"reflect"
 	"testing"
 )
diff --git a/packer/rpc/build.go b/packer/rpc/build.go
index 7a99a54a4ca..8573b2e8c65 100644
--- a/packer/rpc/build.go
+++ b/packer/rpc/build.go
@@ -3,7 +3,7 @@ package rpc
 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 --git a/packer/rpc/build_test.go b/packer/rpc/build_test.go
index 57a4b8dc283..1dfb3d6f45e 100644
--- a/packer/rpc/build_test.go
+++ b/packer/rpc/build_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 var testBuildArtifact = &packer.MockArtifact{}
diff --git a/packer/rpc/builder.go b/packer/rpc/builder.go
index 0e2464bd766..ed847fa919d 100644
--- a/packer/rpc/builder.go
+++ b/packer/rpc/builder.go
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"net/rpc"
 )
diff --git a/packer/rpc/builder_test.go b/packer/rpc/builder_test.go
index 51dbf704484..25587735210 100644
--- a/packer/rpc/builder_test.go
+++ b/packer/rpc/builder_test.go
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"reflect"
 	"testing"
 )
diff --git a/packer/rpc/cache.go b/packer/rpc/cache.go
index a4539ae66e5..ce5a231bb42 100644
--- a/packer/rpc/cache.go
+++ b/packer/rpc/cache.go
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"net/rpc"
 )
diff --git a/packer/rpc/cache_test.go b/packer/rpc/cache_test.go
index 702ca98e441..1fa76f0e44a 100644
--- a/packer/rpc/cache_test.go
+++ b/packer/rpc/cache_test.go
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/packer/rpc/client.go b/packer/rpc/client.go
index 85d1ff5509d..37571a450e1 100644
--- a/packer/rpc/client.go
+++ b/packer/rpc/client.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"net/rpc"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/ugorji/go/codec"
 )
 
diff --git a/packer/rpc/communicator.go b/packer/rpc/communicator.go
index f52bd30d402..e1aab41e0f3 100644
--- a/packer/rpc/communicator.go
+++ b/packer/rpc/communicator.go
@@ -7,7 +7,7 @@ import (
 	"net/rpc"
 	"os"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // An implementation of packer.Communicator where the communicator is actually
diff --git a/packer/rpc/communicator_test.go b/packer/rpc/communicator_test.go
index 0e517aec9a6..1af9e53c82a 100644
--- a/packer/rpc/communicator_test.go
+++ b/packer/rpc/communicator_test.go
@@ -2,7 +2,7 @@ package rpc
 
 import (
 	"bufio"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io"
 	"reflect"
 	"testing"
diff --git a/packer/rpc/hook.go b/packer/rpc/hook.go
index 4aa7d75bcf0..590b0899ab5 100644
--- a/packer/rpc/hook.go
+++ b/packer/rpc/hook.go
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"net/rpc"
 )
diff --git a/packer/rpc/hook_test.go b/packer/rpc/hook_test.go
index b3f4a420c51..8043e6ad9a5 100644
--- a/packer/rpc/hook_test.go
+++ b/packer/rpc/hook_test.go
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"reflect"
 	"sync"
 	"testing"
diff --git a/packer/rpc/post_processor.go b/packer/rpc/post_processor.go
index 5831b125eeb..0107558deaa 100644
--- a/packer/rpc/post_processor.go
+++ b/packer/rpc/post_processor.go
@@ -3,7 +3,7 @@ package rpc
 import (
 	"net/rpc"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // An implementation of packer.PostProcessor where the PostProcessor is actually
diff --git a/packer/rpc/post_processor_test.go b/packer/rpc/post_processor_test.go
index d9ea9c86f6a..99258c50ee3 100644
--- a/packer/rpc/post_processor_test.go
+++ b/packer/rpc/post_processor_test.go
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"reflect"
 	"testing"
 )
diff --git a/packer/rpc/provisioner.go b/packer/rpc/provisioner.go
index 08d31700a10..80c57e26477 100644
--- a/packer/rpc/provisioner.go
+++ b/packer/rpc/provisioner.go
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"net/rpc"
 )
diff --git a/packer/rpc/provisioner_test.go b/packer/rpc/provisioner_test.go
index 421990ffd97..448946682ae 100644
--- a/packer/rpc/provisioner_test.go
+++ b/packer/rpc/provisioner_test.go
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"reflect"
 	"testing"
 )
diff --git a/packer/rpc/server.go b/packer/rpc/server.go
index ff175326994..8982ec0e708 100644
--- a/packer/rpc/server.go
+++ b/packer/rpc/server.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"net/rpc"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"github.com/ugorji/go/codec"
 )
 
diff --git a/packer/rpc/ui.go b/packer/rpc/ui.go
index da032160a3b..1b84e5cd1e6 100644
--- a/packer/rpc/ui.go
+++ b/packer/rpc/ui.go
@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"log"
 	"net/rpc"
 )
diff --git a/panic.go b/panic.go
index 4f5d6a10b40..480d0432427 100644
--- a/panic.go
+++ b/panic.go
@@ -19,7 +19,7 @@ A crash log has been placed at "crash.log" relative to your current
 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 --git a/plugin/example/main.go b/plugin/example/main.go
index 3d20ef7653a..7f4edf6c46b 100644
--- a/plugin/example/main.go
+++ b/plugin/example/main.go
@@ -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 --git a/post-processor/amazon-import/post-processor.go b/post-processor/amazon-import/post-processor.go
index 236436e13ae..36a8f58449f 100644
--- a/post-processor/amazon-import/post-processor.go
+++ b/post-processor/amazon-import/post-processor.go
@@ -11,11 +11,11 @@ import (
 	"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 --git a/post-processor/artifice/post-processor.go b/post-processor/artifice/post-processor.go
index ff33184de9d..030b52c0794 100644
--- a/post-processor/artifice/post-processor.go
+++ b/post-processor/artifice/post-processor.go
@@ -4,10 +4,10 @@ import (
 	"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 --git a/post-processor/atlas/post-processor.go b/post-processor/atlas/post-processor.go
index fb42f9443c4..587942631f0 100644
--- a/post-processor/atlas/post-processor.go
+++ b/post-processor/atlas/post-processor.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/hashicorp/atlas-go/archive"
 	"github.com/hashicorp/atlas-go/v1"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"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"
 )
 
 const (
diff --git a/post-processor/atlas/post-processor_test.go b/post-processor/atlas/post-processor_test.go
index add222bb6be..fc1862aa753 100644
--- a/post-processor/atlas/post-processor_test.go
+++ b/post-processor/atlas/post-processor_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestPostProcessorConfigure(t *testing.T) {
diff --git a/post-processor/checksum/post-processor.go b/post-processor/checksum/post-processor.go
index 82d8c39a0af..8da32d5d99a 100644
--- a/post-processor/checksum/post-processor.go
+++ b/post-processor/checksum/post-processor.go
@@ -11,10 +11,10 @@ import (
 	"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 --git a/post-processor/checksum/post-processor_test.go b/post-processor/checksum/post-processor_test.go
index 8b60df2b43f..fb4d0faf1ae 100644
--- a/post-processor/checksum/post-processor_test.go
+++ b/post-processor/checksum/post-processor_test.go
@@ -8,9 +8,9 @@ import (
 	"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 --git a/post-processor/compress/artifact_test.go b/post-processor/compress/artifact_test.go
index 108ed84e774..2abde78d776 100644
--- a/post-processor/compress/artifact_test.go
+++ b/post-processor/compress/artifact_test.go
@@ -1,7 +1,7 @@
 package compress
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/post-processor/compress/post-processor.go b/post-processor/compress/post-processor.go
index 2d99e0ea073..d1bf89f1a51 100644
--- a/post-processor/compress/post-processor.go
+++ b/post-processor/compress/post-processor.go
@@ -12,11 +12,11 @@ import (
 	"runtime"
 
 	"github.com/biogo/hts/bgzf"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"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/pierrec/lz4"
 )
 
diff --git a/post-processor/compress/post-processor_test.go b/post-processor/compress/post-processor_test.go
index ea1d973ebbf..685e738ed8c 100644
--- a/post-processor/compress/post-processor_test.go
+++ b/post-processor/compress/post-processor_test.go
@@ -8,9 +8,9 @@ import (
 	"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 --git a/post-processor/docker-import/post-processor.go b/post-processor/docker-import/post-processor.go
index 38c73ab55c8..80b99c8b349 100644
--- a/post-processor/docker-import/post-processor.go
+++ b/post-processor/docker-import/post-processor.go
@@ -3,12 +3,12 @@ package dockerimport
 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 --git a/post-processor/docker-import/post-processor_test.go b/post-processor/docker-import/post-processor_test.go
index 43ac0b4efca..4df15486e7f 100644
--- a/post-processor/docker-import/post-processor_test.go
+++ b/post-processor/docker-import/post-processor_test.go
@@ -2,7 +2,7 @@ package dockerimport
 
 import (
 	"bytes"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/post-processor/docker-push/post-processor.go b/post-processor/docker-push/post-processor.go
index 17a0f617ce6..5d44cecf0c9 100644
--- a/post-processor/docker-push/post-processor.go
+++ b/post-processor/docker-push/post-processor.go
@@ -3,13 +3,13 @@ package dockerpush
 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 --git a/post-processor/docker-push/post-processor_test.go b/post-processor/docker-push/post-processor_test.go
index c78e2b13676..a79b4dc2173 100644
--- a/post-processor/docker-push/post-processor_test.go
+++ b/post-processor/docker-push/post-processor_test.go
@@ -2,9 +2,9 @@ package dockerpush
 
 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 --git a/post-processor/docker-save/post-processor.go b/post-processor/docker-save/post-processor.go
index 2e3b36b4e1a..6cb348bf85f 100644
--- a/post-processor/docker-save/post-processor.go
+++ b/post-processor/docker-save/post-processor.go
@@ -4,13 +4,13 @@ import (
 	"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 --git a/post-processor/docker-save/post-processor_test.go b/post-processor/docker-save/post-processor_test.go
index 2d29d58b906..45ef4198665 100644
--- a/post-processor/docker-save/post-processor_test.go
+++ b/post-processor/docker-save/post-processor_test.go
@@ -2,7 +2,7 @@ package dockersave
 
 import (
 	"bytes"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/post-processor/docker-tag/post-processor.go b/post-processor/docker-tag/post-processor.go
index 2f52e965dc3..e9311d12f7a 100644
--- a/post-processor/docker-tag/post-processor.go
+++ b/post-processor/docker-tag/post-processor.go
@@ -3,12 +3,12 @@ package dockertag
 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 --git a/post-processor/docker-tag/post-processor_test.go b/post-processor/docker-tag/post-processor_test.go
index 1c0221c1fe3..fef434ee923 100644
--- a/post-processor/docker-tag/post-processor_test.go
+++ b/post-processor/docker-tag/post-processor_test.go
@@ -4,9 +4,9 @@ import (
 	"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 --git a/post-processor/googlecompute-export/post-processor.go b/post-processor/googlecompute-export/post-processor.go
index ab198cea480..9fd39aa46b0 100644
--- a/post-processor/googlecompute-export/post-processor.go
+++ b/post-processor/googlecompute-export/post-processor.go
@@ -5,12 +5,12 @@ import (
 	"io/ioutil"
 	"strings"
 
+	"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"
 	"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"
 )
 
 type Config struct {
diff --git a/post-processor/manifest/post-processor.go b/post-processor/manifest/post-processor.go
index 5a75bd34ca9..f5807dbb2d8 100644
--- a/post-processor/manifest/post-processor.go
+++ b/post-processor/manifest/post-processor.go
@@ -9,10 +9,10 @@ import (
 	"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 --git a/post-processor/shell-local/communicator.go b/post-processor/shell-local/communicator.go
index 9b937027aa2..b0bfb008f77 100644
--- a/post-processor/shell-local/communicator.go
+++ b/post-processor/shell-local/communicator.go
@@ -7,7 +7,7 @@ import (
 	"os/exec"
 	"syscall"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type Communicator struct{}
diff --git a/post-processor/shell-local/communicator_test.go b/post-processor/shell-local/communicator_test.go
index 037629d1af0..025deec545a 100644
--- a/post-processor/shell-local/communicator_test.go
+++ b/post-processor/shell-local/communicator_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestCommunicator_impl(t *testing.T) {
diff --git a/post-processor/shell-local/post-processor.go b/post-processor/shell-local/post-processor.go
index afe4eb4866c..c2bd2d5c0f6 100644
--- a/post-processor/shell-local/post-processor.go
+++ b/post-processor/shell-local/post-processor.go
@@ -10,10 +10,10 @@ import (
 	"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 --git a/post-processor/shell-local/post-processor_test.go b/post-processor/shell-local/post-processor_test.go
index c5681694af7..094b8409689 100644
--- a/post-processor/shell-local/post-processor_test.go
+++ b/post-processor/shell-local/post-processor_test.go
@@ -1,7 +1,7 @@
 package shell_local
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"testing"
diff --git a/post-processor/vagrant-cloud/artifact_test.go b/post-processor/vagrant-cloud/artifact_test.go
index b95e0451108..e22090612ee 100644
--- a/post-processor/vagrant-cloud/artifact_test.go
+++ b/post-processor/vagrant-cloud/artifact_test.go
@@ -1,7 +1,7 @@
 package vagrantcloud
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/post-processor/vagrant-cloud/post-processor.go b/post-processor/vagrant-cloud/post-processor.go
index 53d75dac10c..ef1af114b44 100644
--- a/post-processor/vagrant-cloud/post-processor.go
+++ b/post-processor/vagrant-cloud/post-processor.go
@@ -9,11 +9,11 @@ import (
 	"log"
 	"strings"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"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"
 )
 
 const VAGRANT_CLOUD_URL = "https://vagrantcloud.com/api/v1"
diff --git a/post-processor/vagrant-cloud/post-processor_test.go b/post-processor/vagrant-cloud/post-processor_test.go
index 985df88cc17..53cc64e84bf 100644
--- a/post-processor/vagrant-cloud/post-processor_test.go
+++ b/post-processor/vagrant-cloud/post-processor_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testGoodConfig() map[string]interface{} {
diff --git a/post-processor/vagrant-cloud/step_create_provider.go b/post-processor/vagrant-cloud/step_create_provider.go
index 6e19f3f3e14..c3e3665c8a1 100644
--- a/post-processor/vagrant-cloud/step_create_provider.go
+++ b/post-processor/vagrant-cloud/step_create_provider.go
@@ -2,8 +2,8 @@ package vagrantcloud
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type Provider struct {
diff --git a/post-processor/vagrant-cloud/step_create_version.go b/post-processor/vagrant-cloud/step_create_version.go
index 58c3051a712..0a544ceba1f 100644
--- a/post-processor/vagrant-cloud/step_create_version.go
+++ b/post-processor/vagrant-cloud/step_create_version.go
@@ -2,8 +2,8 @@ package vagrantcloud
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type Version struct {
diff --git a/post-processor/vagrant-cloud/step_prepare_upload.go b/post-processor/vagrant-cloud/step_prepare_upload.go
index d28a9fd2bc6..62e270fd886 100644
--- a/post-processor/vagrant-cloud/step_prepare_upload.go
+++ b/post-processor/vagrant-cloud/step_prepare_upload.go
@@ -2,8 +2,8 @@ package vagrantcloud
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type Upload struct {
diff --git a/post-processor/vagrant-cloud/step_release_version.go b/post-processor/vagrant-cloud/step_release_version.go
index 6301d5f199b..7b6b25e9359 100644
--- a/post-processor/vagrant-cloud/step_release_version.go
+++ b/post-processor/vagrant-cloud/step_release_version.go
@@ -2,8 +2,8 @@ package vagrantcloud
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"strings"
 )
 
diff --git a/post-processor/vagrant-cloud/step_upload.go b/post-processor/vagrant-cloud/step_upload.go
index 0d53a99d60a..cca7ef83f80 100644
--- a/post-processor/vagrant-cloud/step_upload.go
+++ b/post-processor/vagrant-cloud/step_upload.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepUpload struct {
diff --git a/post-processor/vagrant-cloud/step_verify_box.go b/post-processor/vagrant-cloud/step_verify_box.go
index cc3f48b85d5..c3c7ef4a6d8 100644
--- a/post-processor/vagrant-cloud/step_verify_box.go
+++ b/post-processor/vagrant-cloud/step_verify_box.go
@@ -2,8 +2,8 @@ package vagrantcloud
 
 import (
 	"fmt"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type Box struct {
diff --git a/post-processor/vagrant-cloud/step_verify_upload.go b/post-processor/vagrant-cloud/step_verify_upload.go
index 4a90ffa2da6..2aab64b0819 100644
--- a/post-processor/vagrant-cloud/step_verify_upload.go
+++ b/post-processor/vagrant-cloud/step_verify_upload.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"time"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepVerifyUpload struct {
diff --git a/post-processor/vagrant/artifact_test.go b/post-processor/vagrant/artifact_test.go
index 6e16285a2bc..3676e1d9817 100644
--- a/post-processor/vagrant/artifact_test.go
+++ b/post-processor/vagrant/artifact_test.go
@@ -1,7 +1,7 @@
 package vagrant
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"testing"
 )
 
diff --git a/post-processor/vagrant/aws.go b/post-processor/vagrant/aws.go
index da9088ffca5..be23f038d68 100644
--- a/post-processor/vagrant/aws.go
+++ b/post-processor/vagrant/aws.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type AWSProvider struct{}
diff --git a/post-processor/vagrant/aws_test.go b/post-processor/vagrant/aws_test.go
index 02eb023657f..d242985d11b 100644
--- a/post-processor/vagrant/aws_test.go
+++ b/post-processor/vagrant/aws_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestAWSProvider_impl(t *testing.T) {
diff --git a/post-processor/vagrant/digitalocean.go b/post-processor/vagrant/digitalocean.go
index f14284e373a..2aaba90673c 100644
--- a/post-processor/vagrant/digitalocean.go
+++ b/post-processor/vagrant/digitalocean.go
@@ -3,7 +3,7 @@ package vagrant
 import (
 	"bytes"
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"strings"
 	"text/template"
 )
diff --git a/post-processor/vagrant/digitalocean_test.go b/post-processor/vagrant/digitalocean_test.go
index 6256fc249a8..c666b06a35b 100644
--- a/post-processor/vagrant/digitalocean_test.go
+++ b/post-processor/vagrant/digitalocean_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestDigitalOceanProvider_impl(t *testing.T) {
diff --git a/post-processor/vagrant/hyperv.go b/post-processor/vagrant/hyperv.go
index 2f7dc144059..cf71820e9b2 100644
--- a/post-processor/vagrant/hyperv.go
+++ b/post-processor/vagrant/hyperv.go
@@ -2,7 +2,7 @@ package vagrant
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"os"
 	"path/filepath"
 	"strings"
diff --git a/post-processor/vagrant/libvirt.go b/post-processor/vagrant/libvirt.go
index 1afdcac459d..ece535bf0e6 100644
--- a/post-processor/vagrant/libvirt.go
+++ b/post-processor/vagrant/libvirt.go
@@ -2,7 +2,7 @@ package vagrant
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"path/filepath"
 	"strings"
 )
diff --git a/post-processor/vagrant/parallels.go b/post-processor/vagrant/parallels.go
index 61e6ee5e634..41f9afa1a2a 100644
--- a/post-processor/vagrant/parallels.go
+++ b/post-processor/vagrant/parallels.go
@@ -5,7 +5,7 @@ import (
 	"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 --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go
index 472a182eb8d..aa65b2292d3 100644
--- a/post-processor/vagrant/post-processor.go
+++ b/post-processor/vagrant/post-processor.go
@@ -11,11 +11,11 @@ import (
 	"path/filepath"
 	"text/template"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"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"
 )
 
 var builtins = map[string]string{
diff --git a/post-processor/vagrant/post-processor_test.go b/post-processor/vagrant/post-processor_test.go
index 1bcb50be36c..8b8bfe10a7a 100644
--- a/post-processor/vagrant/post-processor_test.go
+++ b/post-processor/vagrant/post-processor_test.go
@@ -3,7 +3,7 @@ package vagrant
 import (
 	"bytes"
 	"compress/flate"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"strings"
diff --git a/post-processor/vagrant/provider.go b/post-processor/vagrant/provider.go
index cda29fcb7ac..e9b76d0c7a3 100644
--- a/post-processor/vagrant/provider.go
+++ b/post-processor/vagrant/provider.go
@@ -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 --git a/post-processor/vagrant/util.go b/post-processor/vagrant/util.go
index 6ae2c337fd6..bc154d64000 100644
--- a/post-processor/vagrant/util.go
+++ b/post-processor/vagrant/util.go
@@ -11,8 +11,8 @@ import (
 	"path/filepath"
 	"runtime"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/klauspost/pgzip"
-	"github.com/mitchellh/packer/packer"
 )
 
 var (
diff --git a/post-processor/vagrant/virtualbox.go b/post-processor/vagrant/virtualbox.go
index ade31b2fb5d..29201a01abb 100644
--- a/post-processor/vagrant/virtualbox.go
+++ b/post-processor/vagrant/virtualbox.go
@@ -4,7 +4,7 @@ import (
 	"archive/tar"
 	"errors"
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io"
 	"io/ioutil"
 	"log"
diff --git a/post-processor/vagrant/vmware.go b/post-processor/vagrant/vmware.go
index 75427397e3c..3fe2aed4e8e 100644
--- a/post-processor/vagrant/vmware.go
+++ b/post-processor/vagrant/vmware.go
@@ -2,7 +2,7 @@ package vagrant
 
 import (
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"path/filepath"
 )
 
diff --git a/post-processor/vsphere/post-processor.go b/post-processor/vsphere/post-processor.go
index 55ceded4ac7..e971473348f 100644
--- a/post-processor/vsphere/post-processor.go
+++ b/post-processor/vsphere/post-processor.go
@@ -8,10 +8,10 @@ import (
 	"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 --git a/provisioner/ansible-local/provisioner.go b/provisioner/ansible-local/provisioner.go
index 23562ec9a4b..88138e67fe3 100644
--- a/provisioner/ansible-local/provisioner.go
+++ b/provisioner/ansible-local/provisioner.go
@@ -7,11 +7,11 @@ import (
 	"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 --git a/provisioner/ansible-local/provisioner_test.go b/provisioner/ansible-local/provisioner_test.go
index 236c6252a24..2195b710754 100644
--- a/provisioner/ansible-local/provisioner_test.go
+++ b/provisioner/ansible-local/provisioner_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/provisioner/ansible/adapter.go b/provisioner/ansible/adapter.go
index eb481abd62a..c3dfd349534 100644
--- a/provisioner/ansible/adapter.go
+++ b/provisioner/ansible/adapter.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/google/shlex"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/provisioner/ansible/adapter_test.go b/provisioner/ansible/adapter_test.go
index 41aab358c71..2ab2d350b5b 100644
--- a/provisioner/ansible/adapter_test.go
+++ b/provisioner/ansible/adapter_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 
 	"golang.org/x/crypto/ssh"
 )
diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go
index 0577c58f3b6..c6e055e0116 100644
--- a/provisioner/ansible/provisioner.go
+++ b/provisioner/ansible/provisioner.go
@@ -24,10 +24,10 @@ import (
 
 	"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 --git a/provisioner/ansible/provisioner_test.go b/provisioner/ansible/provisioner_test.go
index 13042c5e1c5..bda07080b48 100644
--- a/provisioner/ansible/provisioner_test.go
+++ b/provisioner/ansible/provisioner_test.go
@@ -11,7 +11,7 @@ import (
 	"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 --git a/provisioner/ansible/scp.go b/provisioner/ansible/scp.go
index 6378bdc1496..0d951c728f3 100644
--- a/provisioner/ansible/scp.go
+++ b/provisioner/ansible/scp.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 const (
diff --git a/provisioner/ansible/test-fixtures/long-debug-message.yml b/provisioner/ansible/test-fixtures/long-debug-message.yml
index cdd72e8b329..e633061bda8 100644
--- a/provisioner/ansible/test-fixtures/long-debug-message.yml
+++ b/provisioner/ansible/test-fixtures/long-debug-message.yml
@@ -3,6 +3,6 @@
   connection: local
 
   tasks:
-    - name: Very long Ansible output (>65535 chars) (Issue https://github.com/mitchellh/packer/issues/3268)
+    - name: Very long Ansible output (>65535 chars) (Issue https://github.com/hashicorp/packer/issues/3268)
       debug:
         msg: "{{ lipsum(n=300, html=false) }}"
diff --git a/provisioner/chef-client/provisioner.go b/provisioner/chef-client/provisioner.go
index a0be8df9bc7..3853613fc6e 100644
--- a/provisioner/chef-client/provisioner.go
+++ b/provisioner/chef-client/provisioner.go
@@ -12,12 +12,12 @@ import (
 	"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 --git a/provisioner/chef-client/provisioner_test.go b/provisioner/chef-client/provisioner_test.go
index e84c81c72b8..ac148721a1a 100644
--- a/provisioner/chef-client/provisioner_test.go
+++ b/provisioner/chef-client/provisioner_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/provisioner/chef-solo/provisioner.go b/provisioner/chef-solo/provisioner.go
index c4ca5fd61de..981619a1828 100644
--- a/provisioner/chef-solo/provisioner.go
+++ b/provisioner/chef-solo/provisioner.go
@@ -12,11 +12,11 @@ import (
 	"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 --git a/provisioner/chef-solo/provisioner_test.go b/provisioner/chef-solo/provisioner_test.go
index 67fc1009a10..15ae499c7ea 100644
--- a/provisioner/chef-solo/provisioner_test.go
+++ b/provisioner/chef-solo/provisioner_test.go
@@ -1,7 +1,7 @@
 package chefsolo
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"testing"
diff --git a/provisioner/converge/provisioner.go b/provisioner/converge/provisioner.go
index dab86111562..924cfa4930b 100644
--- a/provisioner/converge/provisioner.go
+++ b/provisioner/converge/provisioner.go
@@ -12,10 +12,10 @@ import (
 
 	"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 --git a/provisioner/converge/provisioner_test.go b/provisioner/converge/provisioner_test.go
index b4cd2d3616e..ee38905a5ff 100644
--- a/provisioner/converge/provisioner_test.go
+++ b/provisioner/converge/provisioner_test.go
@@ -3,7 +3,7 @@ package converge
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/provisioner/file/provisioner.go b/provisioner/file/provisioner.go
index 433c9f23ae3..b3283b20c94 100644
--- a/provisioner/file/provisioner.go
+++ b/provisioner/file/provisioner.go
@@ -7,10 +7,10 @@ import (
 	"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 --git a/provisioner/file/provisioner_test.go b/provisioner/file/provisioner_test.go
index 2169c96a366..762eb83f8d0 100644
--- a/provisioner/file/provisioner_test.go
+++ b/provisioner/file/provisioner_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go
index 8448cf819e5..1443c56dc9e 100644
--- a/provisioner/powershell/provisioner.go
+++ b/provisioner/powershell/provisioner.go
@@ -14,11 +14,11 @@ import (
 	"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 --git a/provisioner/powershell/provisioner_test.go b/provisioner/powershell/provisioner_test.go
index 7291159fa89..a0d6d80c065 100644
--- a/provisioner/powershell/provisioner_test.go
+++ b/provisioner/powershell/provisioner_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/provisioner/puppet-masterless/provisioner.go b/provisioner/puppet-masterless/provisioner.go
index ba4c7345809..6f1b6eee485 100644
--- a/provisioner/puppet-masterless/provisioner.go
+++ b/provisioner/puppet-masterless/provisioner.go
@@ -9,10 +9,10 @@ import (
 	"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 --git a/provisioner/puppet-masterless/provisioner_test.go b/provisioner/puppet-masterless/provisioner_test.go
index 581919beeb2..6c58f63d700 100644
--- a/provisioner/puppet-masterless/provisioner_test.go
+++ b/provisioner/puppet-masterless/provisioner_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/provisioner/puppet-server/provisioner.go b/provisioner/puppet-server/provisioner.go
index 9986d12d367..9e5e6a498a2 100644
--- a/provisioner/puppet-server/provisioner.go
+++ b/provisioner/puppet-server/provisioner.go
@@ -7,10 +7,10 @@ import (
 	"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 --git a/provisioner/puppet-server/provisioner_test.go b/provisioner/puppet-server/provisioner_test.go
index 46702dfc3e8..a41a6bec5bb 100644
--- a/provisioner/puppet-server/provisioner_test.go
+++ b/provisioner/puppet-server/provisioner_test.go
@@ -1,7 +1,7 @@
 package puppetserver
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"testing"
diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go
index dc22fd4ca92..41d1e261b45 100644
--- a/provisioner/salt-masterless/provisioner.go
+++ b/provisioner/salt-masterless/provisioner.go
@@ -9,10 +9,10 @@ import (
 	"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 --git a/provisioner/salt-masterless/provisioner_test.go b/provisioner/salt-masterless/provisioner_test.go
index 09f97df26f4..2b7f3a0262e 100644
--- a/provisioner/salt-masterless/provisioner_test.go
+++ b/provisioner/salt-masterless/provisioner_test.go
@@ -1,7 +1,7 @@
 package saltmasterless
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"strings"
diff --git a/provisioner/shell-local/communicator.go b/provisioner/shell-local/communicator.go
index 0470bb3a0ea..2afbe10281a 100644
--- a/provisioner/shell-local/communicator.go
+++ b/provisioner/shell-local/communicator.go
@@ -7,8 +7,8 @@ import (
 	"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 --git a/provisioner/shell-local/communicator_test.go b/provisioner/shell-local/communicator_test.go
index 90402324ba3..8ebd4fa6026 100644
--- a/provisioner/shell-local/communicator_test.go
+++ b/provisioner/shell-local/communicator_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestCommunicator_impl(t *testing.T) {
diff --git a/provisioner/shell-local/provisioner.go b/provisioner/shell-local/provisioner.go
index f3c4519515e..3f8222c1922 100644
--- a/provisioner/shell-local/provisioner.go
+++ b/provisioner/shell-local/provisioner.go
@@ -5,10 +5,10 @@ import (
 	"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 --git a/provisioner/shell-local/provisioner_test.go b/provisioner/shell-local/provisioner_test.go
index ad8f3065d80..9f4fb9d2a60 100644
--- a/provisioner/shell-local/provisioner_test.go
+++ b/provisioner/shell-local/provisioner_test.go
@@ -3,7 +3,7 @@ package shell
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestProvisioner_impl(t *testing.T) {
diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go
index 30468aee1c1..5e9c587a130 100644
--- a/provisioner/shell/provisioner.go
+++ b/provisioner/shell/provisioner.go
@@ -15,10 +15,10 @@ import (
 	"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 --git a/provisioner/shell/provisioner_test.go b/provisioner/shell/provisioner_test.go
index c2bcb455dc6..ee0edf95baa 100644
--- a/provisioner/shell/provisioner_test.go
+++ b/provisioner/shell/provisioner_test.go
@@ -1,7 +1,7 @@
 package shell
 
 import (
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"os"
 	"regexp"
diff --git a/provisioner/windows-restart/provisioner.go b/provisioner/windows-restart/provisioner.go
index ae58dd9d1d7..ed7dfee6332 100644
--- a/provisioner/windows-restart/provisioner.go
+++ b/provisioner/windows-restart/provisioner.go
@@ -6,11 +6,11 @@ import (
 	"sync"
 	"time"
 
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 	"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"
 )
 
 var DefaultRestartCommand = "shutdown /r /f /t 0 /c \"packer restart\""
diff --git a/provisioner/windows-restart/provisioner_test.go b/provisioner/windows-restart/provisioner_test.go
index 6ba63f8b55e..05b6b204a6e 100644
--- a/provisioner/windows-restart/provisioner_test.go
+++ b/provisioner/windows-restart/provisioner_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testConfig() map[string]interface{} {
diff --git a/provisioner/windows-shell/provisioner.go b/provisioner/windows-shell/provisioner.go
index 6baebe70a24..585fa437cf0 100644
--- a/provisioner/windows-shell/provisioner.go
+++ b/provisioner/windows-shell/provisioner.go
@@ -13,10 +13,10 @@ import (
 	"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 --git a/provisioner/windows-shell/provisioner_test.go b/provisioner/windows-shell/provisioner_test.go
index a086fb7394b..62f78f20a73 100644
--- a/provisioner/windows-shell/provisioner_test.go
+++ b/provisioner/windows-shell/provisioner_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 	"io/ioutil"
 	"log"
 	"os"
diff --git a/scripts/build.ps1 b/scripts/build.ps1
index d82f1e67918..5287704aa24 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -70,7 +70,7 @@ echo "==> Building..."
 gox.exe `
   -os="${XC_OS}" `
   -arch="${XC_ARCH}" `
-  -ldflags "-X github.com/mitchellh/packer/version.GitCommit=${GIT_COMMIT}${GIT_DIRTY}" `
+  -ldflags "-X github.com/hashicorp/packer/version.GitCommit=${GIT_COMMIT}${GIT_DIRTY}" `
   -output "pkg/{{.OS}}_{{.Arch}}/packer" `
   .
 
diff --git a/scripts/build.sh b/scripts/build.sh
index 3c2c889e068..98c7449b1d2 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -37,7 +37,7 @@ set +e
 gox \
     -os="${XC_OS}" \
     -arch="${XC_ARCH}" \
-    -ldflags "-X github.com/mitchellh/packer/version.GitCommit=${GIT_COMMIT}${GIT_DIRTY}" \
+    -ldflags "-X github.com/hashicorp/packer/version.GitCommit=${GIT_COMMIT}${GIT_DIRTY}" \
     -output "pkg/{{.OS}}_{{.Arch}}/packer" \
     .
 set -e
diff --git a/scripts/generate-plugins.go b/scripts/generate-plugins.go
index 6d5cfcc28ed..80f561636be 100644
--- a/scripts/generate-plugins.go
+++ b/scripts/generate-plugins.go
@@ -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 @@ func makeImports(builders, provisioners, postProcessors []plugin) string {
 	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 @@ import (
 	"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 --git a/scripts/prepare_changelog.sh b/scripts/prepare_changelog.sh
index bc5a121b914..f44bd93bd8e 100755
--- a/scripts/prepare_changelog.sh
+++ b/scripts/prepare_changelog.sh
@@ -19,7 +19,7 @@ do
     fi
 done | while read line
 do
-    echo "https://github.com/mitchellh/packer/pull/${line}"
+    echo "https://github.com/hashicorp/packer/pull/${line}"
     #TODO get tags. ignore docs
     echo $line
     vared -ch ok
diff --git a/template/interpolate/funcs.go b/template/interpolate/funcs.go
index 1244a55fc6d..ee5e21ccca6 100644
--- a/template/interpolate/funcs.go
+++ b/template/interpolate/funcs.go
@@ -10,7 +10,7 @@ import (
 	"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
diff --git a/website/source/community.html.erb b/website/source/community.html.erb
index e26b00be352..6fc8b332d25 100644
--- a/website/source/community.html.erb
+++ b/website/source/community.html.erb
@@ -23,7 +23,7 @@ description: |-
 </p>
 <p>
   <strong>Bug Tracker:</strong>
-  <a href="https://github.com/mitchellh/packer/issues">Issue tracker
+  <a href="https://github.com/hashicorp/packer/issues">Issue tracker
   on GitHub</a>. Please only use this for reporting bugs. Do not ask
   for general help here. Use IRC or the mailing list for that.
 </p>
diff --git a/website/source/docs/builders/azure-setup.html.md b/website/source/docs/builders/azure-setup.html.md
index 882fd072d1a..0c040584486 100644
--- a/website/source/docs/builders/azure-setup.html.md
+++ b/website/source/docs/builders/azure-setup.html.md
@@ -61,7 +61,7 @@ $ npm install -g azure-cli --no-progress
 
 ## Guided Setup
 
-The Packer project includes a [setup script](https://github.com/mitchellh/packer/blob/master/contrib/azure-setup.sh) that can help you setup your account. It uses an interactive bash script to log you into Azure, name your resources, and export your Packer configuration.
+The Packer project includes a [setup script](https://github.com/hashicorp/packer/blob/master/contrib/azure-setup.sh) that can help you setup your account. It uses an interactive bash script to log you into Azure, name your resources, and export your Packer configuration.
 
 ## Manual Setup
 
diff --git a/website/source/docs/builders/azure.html.md b/website/source/docs/builders/azure.html.md
index d7f1ec0b412..5027ceb4c8d 100644
--- a/website/source/docs/builders/azure.html.md
+++ b/website/source/docs/builders/azure.html.md
@@ -151,7 +151,7 @@ Here is a basic example for Azure.
 
 Azure VMs should be deprovisioned at the end of every build.  For Windows this means executing sysprep, and for Linux this means executing the waagent deprovision process.
 
-Please refer to the Azure [examples](https://github.com/mitchellh/packer/tree/master/examples/azure) for complete examples showing the deprovision process.
+Please refer to the Azure [examples](https://github.com/hashicorp/packer/tree/master/examples/azure) for complete examples showing the deprovision process.
 
 ### Windows
 
@@ -286,5 +286,5 @@ minimal, so overall impact is small.
  > The KeyVault certificate is protected using the object_id of the SPN.  This is why Windows builds require object_id,
  and an SPN.  The KeyVault is deleted when the resource group is deleted.
 
-See the [examples/azure](https://github.com/mitchellh/packer/tree/master/examples/azure) folder in the packer project
+See the [examples/azure](https://github.com/hashicorp/packer/tree/master/examples/azure) folder in the packer project
 for more examples.
diff --git a/website/source/docs/builders/vmware-iso.html.md b/website/source/docs/builders/vmware-iso.html.md
index b3b3bfa5d3e..377ab9018ab 100644
--- a/website/source/docs/builders/vmware-iso.html.md
+++ b/website/source/docs/builders/vmware-iso.html.md
@@ -401,7 +401,7 @@ Ubuntu 12.04 installer:
 The heart of a VMware machine is the "vmx" file. This contains all the virtual
 hardware metadata necessary for the VM to function. Packer by default uses a
 [safe, flexible VMX
-file](https://github.com/mitchellh/packer/blob/20541a7eda085aa5cf35bfed5069592ca49d106e/builder/vmware/step_create_vmx.go#L84).
+file](https://github.com/hashicorp/packer/blob/20541a7eda085aa5cf35bfed5069592ca49d106e/builder/vmware/step_create_vmx.go#L84).
 But for advanced users, this template can be customized. This allows Packer to
 build virtual machines of effectively any guest operating system type.
 
diff --git a/website/source/docs/extending/custom-builders.html.md b/website/source/docs/extending/custom-builders.html.md
index 48461455086..6b5a7e708f1 100644
--- a/website/source/docs/extending/custom-builders.html.md
+++ b/website/source/docs/extending/custom-builders.html.md
@@ -123,7 +123,7 @@ the artifact results, so it is important it never changes.
 
 Other than the builder ID, the rest should be self-explanatory by reading the
 [packer.Artifact interface
-documentation](https://github.com/mitchellh/packer/blob/master/packer/artifact.go).
+documentation](https://github.com/hashicorp/packer/blob/master/packer/artifact.go).
 
 ## Provisioning
 
@@ -166,5 +166,5 @@ The locking mechanisms of the cache allow one of the builders to download it
 only once, but allow both builders to share the downloaded file.
 
 The [documentation for
-packer.Cache](https://github.com/mitchellh/packer/blob/master/packer/cache.go)
+packer.Cache](https://github.com/hashicorp/packer/blob/master/packer/cache.go)
 is very detailed in how it works.
diff --git a/website/source/docs/extending/custom-provisioners.html.md b/website/source/docs/extending/custom-provisioners.html.md
index ffd3db38f01..582a5704d81 100644
--- a/website/source/docs/extending/custom-provisioners.html.md
+++ b/website/source/docs/extending/custom-provisioners.html.md
@@ -86,7 +86,7 @@ some sort) or it may be remote (in a cloud). The communicator interface
 abstracts this away so that communication is the same overall.
 
 The documentation around the [code
-itself](https://github.com/mitchellh/packer/blob/master/packer/communicator.go)
+itself](https://github.com/hashicorp/packer/blob/master/packer/communicator.go)
 is really great as an overview of how to use the interface. You should begin by
 reading this. Once you have read it, you can see some example usage below:
 
diff --git a/website/source/docs/extending/plugins.html.md b/website/source/docs/extending/plugins.html.md
index 894396ebf1b..97b8c4ebf71 100644
--- a/website/source/docs/extending/plugins.html.md
+++ b/website/source/docs/extending/plugins.html.md
@@ -116,7 +116,7 @@ dependencies.
 -   `github.com/mitchellh/packer` - Contains all the interfaces that you have to
     implement for any given plugin.
 
--   `github.com/mitchellh/packer/packer/plugin` - Contains the code to serve
+-   `github.com/hashicorp/packer/packer/plugin` - Contains the code to serve
     the plugin. This handles all the inter-process communication stuff.
 
 There are two steps involved in creating a plugin:
@@ -132,7 +132,7 @@ implements the `packer.Builder` interface:
 
 ```go
 import (
-  "github.com/mitchellh/packer/packer/plugin"
+  "github.com/hashicorp/packer/packer/plugin"
 )
 
 // Assume this implements packer.Builder
diff --git a/website/source/downloads.html.erb b/website/source/downloads.html.erb
index 7d411136493..0b975246ab7 100644
--- a/website/source/downloads.html.erb
+++ b/website/source/downloads.html.erb
@@ -29,7 +29,7 @@ description: |-
         You can also <a href="https://releases.hashicorp.com/packer/" target="_blank" rel="nofollow noopener noreferrer">download other versions of Packer</a> from the releases service.
       </p>
       <p>
-      Check out the <a href="https://github.com/mitchellh/packer/blob/v<%= latest_version %>/CHANGELOG.md">v<%= latest_version %> CHANGELOG</a> for information on the latest release.
+      Check out the <a href="https://github.com/hashicorp/packer/blob/v<%= latest_version %>/CHANGELOG.md">v<%= latest_version %> CHANGELOG</a> for information on the latest release.
       </p>
     </div>
   </div>
diff --git a/website/source/intro/getting-started/install.html.md b/website/source/intro/getting-started/install.html.md
index 3ccd45adb3f..a0efa616a99 100644
--- a/website/source/intro/getting-started/install.html.md
+++ b/website/source/intro/getting-started/install.html.md
@@ -16,7 +16,7 @@ Packer must first be installed on the machine you want to run it on. To make
 installation easy, Packer is distributed as a [binary package](/downloads.html)
 for all supported platforms and architectures. This page will not cover how to
 compile Packer from source, as that is covered in the
-[README](https://github.com/mitchellh/packer/blob/master/README.md) and is only
+[README](https://github.com/hashicorp/packer/blob/master/README.md) and is only
 recommended for advanced users.
 
 ## Installing Packer