diff --git a/addr/addrsrcs.go b/addr/addrsrcs.go
index d8b942b..a172373 100644
--- a/addr/addrsrcs.go
+++ b/addr/addrsrcs.go
@@ -2,7 +2,7 @@
 package addr
 
 import (
-	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/jbenet/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 ea75a2b..4614064 100644
--- a/addr/addrsrcs_test.go
+++ b/addr/addrsrcs_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/jbenet/go-multiaddr"
 )
 
 func newAddrOrFatal(t *testing.T, s string) ma.Multiaddr {
diff --git a/addr_manager.go b/addr_manager.go
index 02b0fd1..87b8206 100644
--- a/addr_manager.go
+++ b/addr_manager.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/jbenet/go-multiaddr"
 )
 
 const (
diff --git a/addr_manager_test.go b/addr_manager_test.go
index 2bd480f..3e19530 100644
--- a/addr_manager_test.go
+++ b/addr_manager_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/jbenet/go-multiaddr"
 )
 
 func IDS(t *testing.T, ids string) ID {
diff --git a/metrics_test.go b/metrics_test.go
index 7975ac2..4343c08 100644
--- a/metrics_test.go
+++ b/metrics_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	testutil "github.com/ipfs/go-ipfs/util/testutil"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
+	testutil "util/testutil"
 )
 
 func TestLatencyEWMAFun(t *testing.T) {
diff --git a/peer.go b/peer.go
index d076ac8..549b209 100644
--- a/peer.go
+++ b/peer.go
@@ -7,13 +7,13 @@ import (
 	"fmt"
 	"strings"
 
-	b58 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
-	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
+	b58 "github.com/jbenet/go-base58"
+	ma "github.com/jbenet/go-multiaddr"
+	mh "github.com/jbenet/go-multihash"
 
-	u "github.com/ipfs/go-ipfs/util"
-	logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
+	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
+	u "util"
 )
 
 var log = logging.Logger("peer")
diff --git a/peer_test.go b/peer_test.go
index 9d420d3..1d4ca25 100644
--- a/peer_test.go
+++ b/peer_test.go
@@ -6,12 +6,12 @@ import (
 	"strings"
 	"testing"
 
-	u "github.com/ipfs/go-ipfs/util"
-	tu "github.com/ipfs/go-ipfs/util/testutil"
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
 	. "github.com/ipfs/go-libp2p/p2p/peer"
+	u "util"
+	tu "util/testutil"
 
-	b58 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
+	b58 "github.com/jbenet/go-base58"
 )
 
 var gen1 keyset // generated
diff --git a/peerstore.go b/peerstore.go
index c9bc643..9f3a98d 100644
--- a/peerstore.go
+++ b/peerstore.go
@@ -7,9 +7,9 @@ import (
 
 	ic "github.com/ipfs/go-libp2p/p2p/crypto"
 
-	ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
-	dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
-	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ds "github.com/jbenet/go-datastore"
+	dssync "github.com/jbenet/go-datastore/sync"
+	ma "github.com/jbenet/go-multiaddr"
 )
 
 const (
diff --git a/queue/distance.go b/queue/distance.go
index ada2aed..6b721ab 100644
--- a/queue/distance.go
+++ b/queue/distance.go
@@ -5,9 +5,9 @@ import (
 	"math/big"
 	"sync"
 
-	key "github.com/ipfs/go-ipfs/blocks/key"
-	ks "github.com/ipfs/go-ipfs/routing/keyspace"
+	ks "Qma4vHVBYKDiKS5VpvtLNJHHDbL7S6VRsvxxmBnBFfKP3k/go-keyspace"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
+	key "github.com/whyrusleeping/go-key"
 )
 
 // peerMetric tracks a peer and its distance to something else.
diff --git a/queue/queue_test.go b/queue/queue_test.go
index 7e31b5f..d85f84b 100644
--- a/queue/queue_test.go
+++ b/queue/queue_test.go
@@ -6,11 +6,11 @@ import (
 	"testing"
 	"time"
 
-	key "github.com/ipfs/go-ipfs/blocks/key"
-	u "github.com/ipfs/go-ipfs/util"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
+	key "github.com/whyrusleeping/go-key"
+	u "util"
 
-	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	context "golang.org/x/net/context"
 )
 
 func TestQueue(t *testing.T) {
diff --git a/queue/sync.go b/queue/sync.go
index 04eac7e..2a88683 100644
--- a/queue/sync.go
+++ b/queue/sync.go
@@ -1,9 +1,9 @@
 package queue
 
 import (
-	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
+	context "golang.org/x/net/context"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
+	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
 )
 
 var log = logging.Logger("peerqueue")