diff --git a/go/svc/topo/.gitignore b/go/svc/topo/.gitignore
new file mode 100644
index 0000000..ed84ead
--- /dev/null
+++ b/go/svc/topo/.gitignore
@@ -0,0 +1 @@
+a_main-packr.go
diff --git a/go/svc/topo/graph/graph.go b/go/svc/topo/graph/graph.go
index a5139e6..e076797 100644
--- a/go/svc/topo/graph/graph.go
+++ b/go/svc/topo/graph/graph.go
@@ -10,7 +10,7 @@
 	"github.com/digitalocean/go-netbox/netbox/models"
 	"github.com/golang/glog"
 
-	confpb "code.hackerspace.pl/q3k/topo/proto/config"
+	confpb "code.hackerspace.pl/hscloud/go/svc/topo/proto/config"
 )
 
 type MachinePort struct {
diff --git a/go/svc/topo/main.go b/go/svc/topo/main.go
index bbaba70..5cc73b4 100644
--- a/go/svc/topo/main.go
+++ b/go/svc/topo/main.go
@@ -7,16 +7,16 @@
 	"flag"
 	"io/ioutil"
 
-	"code.hackerspace.pl/q3k/mirko"
+	"code.hackerspace.pl/hscloud/go/mirko"
 	"github.com/digitalocean/go-netbox/netbox"
 	"github.com/digitalocean/go-netbox/netbox/client"
 	"github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
 
-	confpb "code.hackerspace.pl/q3k/topo/proto/config"
+	confpb "code.hackerspace.pl/hscloud/go/svc/topo/proto/config"
 
-	"code.hackerspace.pl/q3k/topo/graph"
-	"code.hackerspace.pl/q3k/topo/state"
+	"code.hackerspace.pl/hscloud/go/svc/topo/graph"
+	"code.hackerspace.pl/hscloud/go/svc/topo/state"
 )
 
 var (
diff --git a/go/svc/topo/service.go b/go/svc/topo/service.go
index ec75153..198859a 100644
--- a/go/svc/topo/service.go
+++ b/go/svc/topo/service.go
@@ -7,15 +7,15 @@
 	"sort"
 	"strings"
 
-	"code.hackerspace.pl/q3k/mirko"
+	"code.hackerspace.pl/hscloud/go/mirko"
 	"github.com/gobuffalo/packr"
 	"github.com/q3k/statusz"
 	"vbom.ml/util/sortorder"
 
-	"code.hackerspace.pl/q3k/topo/graph"
-	"code.hackerspace.pl/q3k/topo/state"
+	"code.hackerspace.pl/hscloud/go/svc/topo/graph"
+	"code.hackerspace.pl/hscloud/go/svc/topo/state"
 
-	pb "code.hackerspace.pl/q3k/topo/proto/control"
+	pb "code.hackerspace.pl/hscloud/go/svc/topo/proto/control"
 )
 
 type Service struct {
diff --git a/go/svc/topo/state/state.go b/go/svc/topo/state/state.go
index e9ccce6..58a1fdd 100644
--- a/go/svc/topo/state/state.go
+++ b/go/svc/topo/state/state.go
@@ -7,10 +7,10 @@
 
 	"google.golang.org/grpc"
 
-	cpb "code.hackerspace.pl/q3k/topo/proto/config"
-	pb "code.hackerspace.pl/q3k/topo/proto/control"
+	cpb "code.hackerspace.pl/hscloud/go/svc/topo/proto/config"
+	pb "code.hackerspace.pl/hscloud/go/svc/topo/proto/control"
 
-	"code.hackerspace.pl/q3k/hspki"
+	"code.hackerspace.pl/hscloud/go/pki"
 )
 
 type SwitchportState struct {
@@ -56,7 +56,7 @@
 		conn, ok := s.Conns[sw.ControlAddress]
 		if !ok {
 			var err error
-			conn, err = grpc.Dial(sw.ControlAddress, hspki.WithClientHSPKI())
+			conn, err = grpc.Dial(sw.ControlAddress, pki.WithClientHSPKI())
 			if err != nil {
 				return fmt.Errorf("when connecting to switch %s: %v", sw.Name, err)
 			}