diff --git a/addr/addrsrcs.go b/addr/addrsrcs.go
index 2cbde1a..9be78d5 100644
--- a/addr/addrsrcs.go
+++ b/addr/addrsrcs.go
@@ -2,7 +2,7 @@
 package addr
 
 import (
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // AddrSource is a source of addresses. It allows clients to retrieve
diff --git a/addr/addrsrcs_test.go b/addr/addrsrcs_test.go
index 23e3a22..06bea07 100644
--- a/addr/addrsrcs_test.go
+++ b/addr/addrsrcs_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func newAddrOrFatal(t *testing.T, s string) ma.Multiaddr {
diff --git a/addr/sorting.go b/addr/sorting.go
index 74c6d91..f8a8915 100644
--- a/addr/sorting.go
+++ b/addr/sorting.go
@@ -3,9 +3,9 @@ package addr
 import (
 	"bytes"
 
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	manet "gx/ipfs/QmVCNGTyD4EkvNYaAp253uMQ9Rjsjy2oGMvcdJJUoVRfja/go-multiaddr-net"
-	mafmt "gx/ipfs/QmYjJnSTfXWhYL2cV1xFphPqjqowJqH7ZKLA1As8QrPHbn/mafmt"
+	ma "github.com/multiformats/go-multiaddr"
+	manet "github.com/multiformats/go-multiaddr-net"
+	mafmt "github.com/whyrusleeping/mafmt"
 )
 
 func isFDCostlyTransport(a ma.Multiaddr) bool {
diff --git a/addr_manager.go b/addr_manager.go
index 1c9e3a0..a676f44 100644
--- a/addr_manager.go
+++ b/addr_manager.go
@@ -6,9 +6,9 @@ import (
 	"sync"
 	"time"
 
+	peer "github.com/libp2p/go-libp2p-peer"
 	addr "github.com/libp2p/go-libp2p-peerstore/addr"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 const (
diff --git a/addr_manager_test.go b/addr_manager_test.go
index 018474b..b9cbfd9 100644
--- a/addr_manager_test.go
+++ b/addr_manager_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	"gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	"github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func IDS(t *testing.T, ids string) peer.ID {
diff --git a/metrics.go b/metrics.go
index 145d918..05b8676 100644
--- a/metrics.go
+++ b/metrics.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	"github.com/libp2p/go-libp2p-peer"
 )
 
 // LatencyEWMASmooting governs the decay of the EWMA (the speed
diff --git a/metrics_test.go b/metrics_test.go
index 990b48f..94a7411 100644
--- a/metrics_test.go
+++ b/metrics_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	testutil "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer/test"
+	testutil "github.com/libp2p/go-libp2p-peer/test"
 )
 
 func TestLatencyEWMAFun(t *testing.T) {
diff --git a/peerinfo.go b/peerinfo.go
index da76a7b..a42d5ef 100644
--- a/peerinfo.go
+++ b/peerinfo.go
@@ -3,8 +3,8 @@ package peerstore
 import (
 	"encoding/json"
 
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	"gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	"github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // PeerInfo is a small struct used to pass around a peer with
diff --git a/peerinfo_test.go b/peerinfo_test.go
index d813679..ca73430 100644
--- a/peerinfo_test.go
+++ b/peerinfo_test.go
@@ -3,8 +3,8 @@ package peerstore
 import (
 	"testing"
 
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func mustAddr(t *testing.T, s string) ma.Multiaddr {
diff --git a/peerstore.go b/peerstore.go
index 8406db4..9747984 100644
--- a/peerstore.go
+++ b/peerstore.go
@@ -7,13 +7,13 @@ import (
 	"sync"
 	"time"
 
-	ic "gx/ipfs/QmTuX6VtWTbWgPwd5PMXHyp411RKsW5nBqLKVVRfJMNneb/go-libp2p-crypto"
+	ic "github.com/libp2p/go-libp2p-crypto"
 
 	//ds "github.com/jbenet/go-datastore"
 	//dssync "github.com/jbenet/go-datastore/sync"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
-	"gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	logging "github.com/ipfs/go-log"
+	"github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 var log = logging.Logger("peerstore")
diff --git a/peerstore_test.go b/peerstore_test.go
index a24a523..6dbd8ab 100644
--- a/peerstore_test.go
+++ b/peerstore_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func getAddrs(t *testing.T, n int) []ma.Multiaddr {
diff --git a/queue/distance.go b/queue/distance.go
index 2248318..f89e8d4 100644
--- a/queue/distance.go
+++ b/queue/distance.go
@@ -5,8 +5,8 @@ import (
 	"math/big"
 	"sync"
 
-	ks "gx/ipfs/QmUusaX99BZoELh7dmPgirqRQ1FAmMnmnBn3oiqDFGBUSc/go-keyspace"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-peer"
+	ks "github.com/whyrusleeping/go-keyspace"
 )
 
 // peerMetric tracks a peer and its distance to something else.
diff --git a/queue/interface.go b/queue/interface.go
index 6eb69fb..eab523a 100644
--- a/queue/interface.go
+++ b/queue/interface.go
@@ -1,6 +1,6 @@
 package queue
 
-import peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+import peer "github.com/libp2p/go-libp2p-peer"
 
 // PeerQueue maintains a set of peers ordered according to a metric.
 // Implementations of PeerQueue could order peers based on distances along
diff --git a/queue/queue_test.go b/queue/queue_test.go
index a81bc23..cd3c80d 100644
--- a/queue/queue_test.go
+++ b/queue/queue_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	u "gx/ipfs/QmZuY8aV7zbNXVy6DyN9SmnuH3o9nG852F4aTiSBpts8d1/go-ipfs-util"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	u "github.com/ipfs/go-ipfs-util"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 func TestQueue(t *testing.T) {
diff --git a/queue/sync.go b/queue/sync.go
index 9c7c514..a1edc2c 100644
--- a/queue/sync.go
+++ b/queue/sync.go
@@ -3,8 +3,8 @@ package queue
 import (
 	"context"
 
-	logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	logging "github.com/ipfs/go-log"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 var log = logging.Logger("peerqueue")
diff --git a/test/utils.go b/test/utils.go
index 81795b1..6c4f0be 100644
--- a/test/utils.go
+++ b/test/utils.go
@@ -3,9 +3,9 @@ package testutil
 import (
 	"io"
 
-	ci "gx/ipfs/QmTuX6VtWTbWgPwd5PMXHyp411RKsW5nBqLKVVRfJMNneb/go-libp2p-crypto"
-	u "gx/ipfs/QmZuY8aV7zbNXVy6DyN9SmnuH3o9nG852F4aTiSBpts8d1/go-ipfs-util"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	u "github.com/ipfs/go-ipfs-util"
+	ci "github.com/libp2p/go-libp2p-crypto"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 func RandPeerID() (peer.ID, error) {