diff --git a/m6220-proxy/cli.go b/go/svc/m6220-proxy/cli.go
similarity index 100%
rename from m6220-proxy/cli.go
rename to go/svc/m6220-proxy/cli.go
diff --git a/m6220-proxy/main.go b/go/svc/m6220-proxy/main.go
similarity index 98%
rename from m6220-proxy/main.go
rename to go/svc/m6220-proxy/main.go
index ed3520a..5e92ac1 100644
--- a/m6220-proxy/main.go
+++ b/go/svc/m6220-proxy/main.go
@@ -8,14 +8,14 @@ import (
 	"strconv"
 	"strings"
 
-	"code.hackerspace.pl/q3k/mirko"
+	"code.hackerspace.pl/hscloud/go/mirko"
 	"github.com/golang/glog"
 	"github.com/ziutek/telnet"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	pb "code.hackerspace.pl/q3k/m6220-proxy/proto"
-	tpb "code.hackerspace.pl/q3k/topo/proto/control"
+	tpb "code.hackerspace.pl/hscloud/go/proto/control"
+	pb "code.hackerspace.pl/hscloud/go/svc/m6220-proxy/proto"
 )
 
 var (
diff --git a/m6220-proxy/proto/generate.go b/go/svc/m6220-proxy/proto/generate.go
similarity index 100%
rename from m6220-proxy/proto/generate.go
rename to go/svc/m6220-proxy/proto/generate.go
diff --git a/m6220-proxy/proto/proxy.pb.go b/go/svc/m6220-proxy/proto/proxy.pb.go
similarity index 100%
rename from m6220-proxy/proto/proxy.pb.go
rename to go/svc/m6220-proxy/proto/proxy.pb.go
diff --git a/m6220-proxy/proxy.proto b/go/svc/m6220-proxy/proxy.proto
similarity index 100%
rename from m6220-proxy/proxy.proto
rename to go/svc/m6220-proxy/proxy.proto