diff --git a/middleware/middleware.go b/middleware/middleware.go
index 21bdbdefb..9d72767a5 100644
--- a/middleware/middleware.go
+++ b/middleware/middleware.go
@@ -2,8 +2,9 @@ package middleware
 
 import (
 	"net/http"
+
+	"github.com/hootsuite/atlantis/logging"
 	"github.com/urfave/negroni"
-	"github.hootops.com/production-delivery/atlantis/logging"
 )
 
 func NewNon200Logger(logger *logging.SimpleLogger) *FailedRequestLogger {
@@ -11,7 +12,7 @@ func NewNon200Logger(logger *logging.SimpleLogger) *FailedRequestLogger {
 }
 
 // FailedRequestLogger logs the request when a response code >= 400 is sent
-type FailedRequestLogger struct{
+type FailedRequestLogger struct {
 	logger *logging.SimpleLogger
 }
 
diff --git a/plan_executor.go b/plan_executor.go
index 6874c148c..8348c81a3 100644
--- a/plan_executor.go
+++ b/plan_executor.go
@@ -9,7 +9,8 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
-	"github.hootops.com/production-delivery/atlantis/logging"
+
+	"github.com/hootsuite/atlantis/logging"
 )
 
 // PlanExecutor handles everything related to running the Terraform plan including integration with Stash, S3, Terraform, and Github
diff --git a/pre_run.go b/pre_run.go
index 693bbae7e..003ea1bd5 100644
--- a/pre_run.go
+++ b/pre_run.go
@@ -6,7 +6,8 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"github.hootops.com/production-delivery/atlantis/logging"
+
+	"github.com/hootsuite/atlantis/logging"
 )
 
 const InlineShebang = "/bin/sh -e"
diff --git a/pre_run_test.go b/pre_run_test.go
index 89b4a3d78..dbe5d313d 100644
--- a/pre_run_test.go
+++ b/pre_run_test.go
@@ -4,7 +4,8 @@ import (
 	"log"
 	"os"
 	"testing"
-	"github.hootops.com/production-delivery/atlantis/logging"
+
+	"github.com/hootsuite/atlantis/logging"
 )
 
 var level = logging.Info
diff --git a/server.go b/server.go
index 0574de090..977954448 100644
--- a/server.go
+++ b/server.go
@@ -2,21 +2,21 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"log"
 	"net/http"
 	"net/url"
 	"os"
 	"strings"
-	"encoding/json"
 
-	"github.com/google/go-github/github"
-	"github.com/urfave/cli"
-	"github.hootops.com/production-delivery/atlantis/recovery"
-	"github.com/urfave/negroni"
-	"github.hootops.com/production-delivery/atlantis/middleware"
-	"github.hootops.com/production-delivery/atlantis/logging"
 	"github.com/elazarl/go-bindata-assetfs"
+	"github.com/google/go-github/github"
+	"github.com/hootsuite/atlantis/logging"
+	"github.com/hootsuite/atlantis/middleware"
+	"github.com/hootsuite/atlantis/recovery"
+	"github.com/urfave/cli"
+	"github.com/urfave/negroni"
 )
 
 // WebhookServer listens for Github webhooks and runs the necessary Atlantis command
@@ -36,17 +36,17 @@ type Server struct {
 }
 
 type ServerConfig struct {
-	githubUsername   string
-	githubPassword   string
-	githubHostname   string
-	sshKey           string
-	awsAssumeRole    string
-	port             int
-	scratchDir       string
-	awsRegion        string
-	s3Bucket         string
-	logLevel         string
-	requireApproval  bool
+	githubUsername  string
+	githubPassword  string
+	githubHostname  string
+	sshKey          string
+	awsAssumeRole   string
+	port            int
+	scratchDir      string
+	awsRegion       string
+	s3Bucket        string
+	logLevel        string
+	requireApproval bool
 }
 
 type ExecutionContext struct {
diff --git a/stash_client.go b/stash_client.go
index bf5c50f33..dcece480a 100644
--- a/stash_client.go
+++ b/stash_client.go
@@ -5,7 +5,8 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
-	"github.hootops.com/production-delivery/atlantis/logging"
+
+	"github.com/hootsuite/atlantis/logging"
 )
 
 const stashUrl = "http://stash.hootops.com"
diff --git a/stash_pr_client.go b/stash_pr_client.go
index 871380096..933a01e76 100644
--- a/stash_pr_client.go
+++ b/stash_pr_client.go
@@ -3,7 +3,8 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.hootops.com/production-delivery/atlantis/logging"
+
+	"github.com/hootsuite/atlantis/logging"
 )
 
 type StashPullRequestContext struct {
diff --git a/terraform_client.go b/terraform_client.go
index eac2e99c6..8a8bb593d 100644
--- a/terraform_client.go
+++ b/terraform_client.go
@@ -6,7 +6,8 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
-	"github.hootops.com/production-delivery/atlantis/logging"
+
+	"github.com/hootsuite/atlantis/logging"
 )
 
 type TerraformClient struct {