diff --git a/builder/oracle/bmcs/artifact.go b/builder/oracle/bmcs/artifact.go
index 61a3d9046..7ff8940c6 100644
--- a/builder/oracle/bmcs/artifact.go
+++ b/builder/oracle/bmcs/artifact.go
@@ -8,7 +8,7 @@ package bmcs
 
 import (
 	"fmt"
-	client "github.com/mitchellh/packer/builder/oracle/bmcs/client"
+	client "github.com/hashicorp/packer/builder/oracle/bmcs/client"
 )
 
 // Artifact is an artifact implementation that contains a built Custom Image.
diff --git a/builder/oracle/bmcs/artifact_test.go b/builder/oracle/bmcs/artifact_test.go
index fe5b85894..3896ce114 100644
--- a/builder/oracle/bmcs/artifact_test.go
+++ b/builder/oracle/bmcs/artifact_test.go
@@ -9,7 +9,7 @@ package bmcs
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifactImpl(t *testing.T) {
diff --git a/builder/oracle/bmcs/builder.go b/builder/oracle/bmcs/builder.go
index 701d06fb9..98695751b 100644
--- a/builder/oracle/bmcs/builder.go
+++ b/builder/oracle/bmcs/builder.go
@@ -12,11 +12,11 @@ import (
 	"fmt"
 	"log"
 
+	client "github.com/hashicorp/packer/builder/oracle/bmcs/client"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	client "github.com/mitchellh/packer/builder/oracle/bmcs/client"
-	"github.com/mitchellh/packer/common"
-	"github.com/mitchellh/packer/helper/communicator"
-	"github.com/mitchellh/packer/packer"
 )
 
 // BuilderId uniquely identifies the builder
diff --git a/builder/oracle/bmcs/builder_test.go b/builder/oracle/bmcs/builder_test.go
index e87044505..cf2241f77 100644
--- a/builder/oracle/bmcs/builder_test.go
+++ b/builder/oracle/bmcs/builder_test.go
@@ -9,7 +9,7 @@ package bmcs
 import (
 	"testing"
 
-	"github.com/mitchellh/packer/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestBuilder_ImplementsBuilder(t *testing.T) {
diff --git a/builder/oracle/bmcs/config.go b/builder/oracle/bmcs/config.go
index 944906033..689054db3 100644
--- a/builder/oracle/bmcs/config.go
+++ b/builder/oracle/bmcs/config.go
@@ -12,12 +12,12 @@ import (
 	"os"
 	"path/filepath"
 
-	client "github.com/mitchellh/packer/builder/oracle/bmcs/client"
-	"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"
+	client "github.com/hashicorp/packer/builder/oracle/bmcs/client"
+	"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/go-homedir"
 )
diff --git a/builder/oracle/bmcs/config_test.go b/builder/oracle/bmcs/config_test.go
index 8c48ae50c..2fb4123c7 100644
--- a/builder/oracle/bmcs/config_test.go
+++ b/builder/oracle/bmcs/config_test.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"testing"
 
-	client "github.com/mitchellh/packer/builder/oracle/bmcs/client"
+	client "github.com/hashicorp/packer/builder/oracle/bmcs/client"
 )
 
 func testConfig(accessConfFile *os.File) map[string]interface{} {
diff --git a/builder/oracle/bmcs/driver.go b/builder/oracle/bmcs/driver.go
index 309eb1f6f..dcd620e22 100644
--- a/builder/oracle/bmcs/driver.go
+++ b/builder/oracle/bmcs/driver.go
@@ -7,7 +7,7 @@
 package bmcs
 
 import (
-	client "github.com/mitchellh/packer/builder/oracle/bmcs/client"
+	client "github.com/hashicorp/packer/builder/oracle/bmcs/client"
 )
 
 // Driver interfaces between the builder steps and the BMCS SDK.
diff --git a/builder/oracle/bmcs/driver_bmcs.go b/builder/oracle/bmcs/driver_bmcs.go
index 23e79b0c2..885108449 100644
--- a/builder/oracle/bmcs/driver_bmcs.go
+++ b/builder/oracle/bmcs/driver_bmcs.go
@@ -10,7 +10,7 @@ import (
 	"errors"
 	"fmt"
 
-	client "github.com/mitchellh/packer/builder/oracle/bmcs/client"
+	client "github.com/hashicorp/packer/builder/oracle/bmcs/client"
 )
 
 // driverBMCS implements the Driver interface and communicates with Oracle
diff --git a/builder/oracle/bmcs/driver_mock.go b/builder/oracle/bmcs/driver_mock.go
index 7db872469..f1688497f 100644
--- a/builder/oracle/bmcs/driver_mock.go
+++ b/builder/oracle/bmcs/driver_mock.go
@@ -7,7 +7,7 @@
 package bmcs
 
 import (
-	client "github.com/mitchellh/packer/builder/oracle/bmcs/client"
+	client "github.com/hashicorp/packer/builder/oracle/bmcs/client"
 )
 
 // driverMock implements the Driver interface and communicates with Oracle
diff --git a/builder/oracle/bmcs/ssh.go b/builder/oracle/bmcs/ssh.go
index 20fa8b6d3..c5c826991 100644
--- a/builder/oracle/bmcs/ssh.go
+++ b/builder/oracle/bmcs/ssh.go
@@ -9,8 +9,8 @@ package bmcs
 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"
 )
 
diff --git a/builder/oracle/bmcs/step_create_instance.go b/builder/oracle/bmcs/step_create_instance.go
index 52c130514..da53bb15d 100644
--- a/builder/oracle/bmcs/step_create_instance.go
+++ b/builder/oracle/bmcs/step_create_instance.go
@@ -9,8 +9,8 @@ package bmcs
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepCreateInstance struct{}
diff --git a/builder/oracle/bmcs/step_create_ssh_key.go b/builder/oracle/bmcs/step_create_ssh_key.go
index 6e6cdf73e..56ff853f5 100644
--- a/builder/oracle/bmcs/step_create_ssh_key.go
+++ b/builder/oracle/bmcs/step_create_ssh_key.go
@@ -15,8 +15,8 @@ import (
 	"os"
 	"runtime"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/oracle/bmcs/step_image.go b/builder/oracle/bmcs/step_image.go
index 0c96a337b..70706aec1 100644
--- a/builder/oracle/bmcs/step_image.go
+++ b/builder/oracle/bmcs/step_image.go
@@ -9,8 +9,8 @@ package bmcs
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepImage struct{}
diff --git a/builder/oracle/bmcs/step_instance_info.go b/builder/oracle/bmcs/step_instance_info.go
index e72fae5c6..169e27b34 100644
--- a/builder/oracle/bmcs/step_instance_info.go
+++ b/builder/oracle/bmcs/step_instance_info.go
@@ -9,8 +9,8 @@ package bmcs
 import (
 	"fmt"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 )
 
 type stepInstanceInfo struct{}
diff --git a/builder/oracle/bmcs/step_test.go b/builder/oracle/bmcs/step_test.go
index df954cdd5..3e638b9d3 100644
--- a/builder/oracle/bmcs/step_test.go
+++ b/builder/oracle/bmcs/step_test.go
@@ -10,10 +10,10 @@ import (
 	"bytes"
 	"os"
 
+	"github.com/hashicorp/packer/packer"
 	"github.com/mitchellh/multistep"
-	"github.com/mitchellh/packer/packer"
 
-	client "github.com/mitchellh/packer/builder/oracle/bmcs/client"
+	client "github.com/hashicorp/packer/builder/oracle/bmcs/client"
 )
 
 // TODO(apryde): It would be good not to have to write a key file to disk to
diff --git a/command/plugin.go b/command/plugin.go
index 47f5ff26f..20580b8c6 100644
--- a/command/plugin.go
+++ b/command/plugin.go
@@ -29,6 +29,7 @@ import (
 	nullbuilder "github.com/hashicorp/packer/builder/null"
 	oneandonebuilder "github.com/hashicorp/packer/builder/oneandone"
 	openstackbuilder "github.com/hashicorp/packer/builder/openstack"
+	oraclebmcsbuilder "github.com/hashicorp/packer/builder/oracle/bmcs"
 	parallelsisobuilder "github.com/hashicorp/packer/builder/parallels/iso"
 	parallelspvmbuilder "github.com/hashicorp/packer/builder/parallels/pvm"
 	profitbricksbuilder "github.com/hashicorp/packer/builder/profitbricks"
@@ -68,7 +69,6 @@ import (
 	shelllocalprovisioner "github.com/hashicorp/packer/provisioner/shell-local"
 	windowsrestartprovisioner "github.com/hashicorp/packer/provisioner/windows-restart"
 	windowsshellprovisioner "github.com/hashicorp/packer/provisioner/windows-shell"
-	oraclebmcsbuilder "github.com/mitchellh/packer/builder/oracle/bmcs"
 )
 
 type PluginCommand struct {