diff --git a/addr/addr.go b/addr/addr.go
index 39f00dba1c65078b7796150492abce8d64a144df..8711e8daec04814d1697306976d511c401f0f4a3 100644
--- a/addr/addr.go
+++ b/addr/addr.go
@@ -3,11 +3,11 @@ package addrutil
 import (
 	"fmt"
 
-	logging "github.com/ipfs/go-log"
+	logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
 
-	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr-net"
-	context "golang.org/x/net/context"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+	manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
+	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 )
 
 var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/net/swarm/addr")
diff --git a/addr/addr_test.go b/addr/addr_test.go
index 49eec13511dd4ef99ee4db9d0eb7929f98bfff2e..aa82097c3da0d4920d2e26cb89f1f40ca02f3ae4 100644
--- a/addr/addr_test.go
+++ b/addr/addr_test.go
@@ -3,8 +3,8 @@ package addrutil
 import (
 	"testing"
 
-	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr-net"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+	manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
 )
 
 func newMultiaddr(t *testing.T, s string) ma.Multiaddr {
diff --git a/dial_test.go b/dial_test.go
index 57a4d7f1613c603a31c79646f8c494d7f00c0549..72dd85860a98866b6e4a8a8dd1d0598a9d6eecc2 100644
--- a/dial_test.go
+++ b/dial_test.go
@@ -13,9 +13,9 @@ import (
 	testutil "github.com/ipfs/go-libp2p/testutil"
 	ci "github.com/ipfs/go-libp2p/testutil/ci"
 
-	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr-net"
-	context "golang.org/x/net/context"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+	manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
+	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 )
 
 func acceptAndHang(l net.Listener) {
diff --git a/peers_test.go b/peers_test.go
index b107fbfe839b1ca47fcb8ebbe9d021d121402caf..3451ec1f510de9bc13a5126ac02da72fd215c755 100644
--- a/peers_test.go
+++ b/peers_test.go
@@ -5,8 +5,8 @@ import (
 
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
-	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 )
 
 func TestPeers(t *testing.T) {
diff --git a/simul_test.go b/simul_test.go
index bd753e7660ed960530edf35b10c77af589651071..a838f3044da83fa8a33f8fb108350c01de0b08ac 100644
--- a/simul_test.go
+++ b/simul_test.go
@@ -9,8 +9,8 @@ import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	ci "github.com/ipfs/go-libp2p/testutil/ci"
 
-	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 )
 
 func TestSimultOpen(t *testing.T) {
diff --git a/swarm.go b/swarm.go
index c71ef359dedcbaca48467f599e3b188f016ceed9..c422645c5c3b55251e7f5a4ae8a1d291d3b50bce 100644
--- a/swarm.go
+++ b/swarm.go
@@ -16,16 +16,16 @@ import (
 	transport "github.com/ipfs/go-libp2p/p2p/net/transport"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
-	ma "github.com/jbenet/go-multiaddr"
-	ps "github.com/jbenet/go-peerstream"
-	pst "github.com/jbenet/go-stream-muxer"
-	psmss "github.com/jbenet/go-stream-muxer/multistream"
-	"github.com/jbenet/goprocess"
-	goprocessctx "github.com/jbenet/goprocess/context"
-	mafilter "github.com/whyrusleeping/multiaddr-filter"
-	context "golang.org/x/net/context"
-
-	logging "github.com/ipfs/go-log"
+	ps "gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream"
+	"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
+	goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+	pst "gx/ipfs/QmTYr6RrJs8b63LTVwahmtytnuqzsLfNPBJp6EvmFWHbGh/go-stream-muxer"
+	psmss "gx/ipfs/QmTYr6RrJs8b63LTVwahmtytnuqzsLfNPBJp6EvmFWHbGh/go-stream-muxer/multistream"
+	mafilter "gx/ipfs/QmW3Q7RQa8D1qCEEeyKCBV1drgFxvHBqAZ3zgCujEwKpHD/multiaddr-filter"
+	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
+
+	logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
 )
 
 var log = logging.Logger("swarm2")
diff --git a/swarm_addr.go b/swarm_addr.go
index 039683bfb9cb77000dc3295778446c1218fd836a..5b7aae5fb217bca3abba795282eb867a07a73f12 100644
--- a/swarm_addr.go
+++ b/swarm_addr.go
@@ -4,7 +4,7 @@ import (
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
 )
 
 // ListenAddresses returns a list of addresses at which this swarm listens.
diff --git a/swarm_addr_test.go b/swarm_addr_test.go
index 7db46d3444b2a119b74440b6e20900b98524cf8f..f48291bcd1481d5c7c79f15a6104b530dd971941 100644
--- a/swarm_addr_test.go
+++ b/swarm_addr_test.go
@@ -8,8 +8,8 @@ import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	testutil "github.com/ipfs/go-libp2p/testutil"
 
-	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 )
 
 func TestFilterAddrs(t *testing.T) {
diff --git a/swarm_conn.go b/swarm_conn.go
index 840a9b465c111ae6ea3c8936ceba76617cf13e4a..b8c5633f1e177feac0977bd1830de1b0bdacc78f 100644
--- a/swarm_conn.go
+++ b/swarm_conn.go
@@ -8,9 +8,9 @@ import (
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
-	ma "github.com/jbenet/go-multiaddr"
-	ps "github.com/jbenet/go-peerstream"
-	context "golang.org/x/net/context"
+	ps "gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 )
 
 // a Conn is a simple wrapper around a ps.Conn that also exposes
diff --git a/swarm_dial.go b/swarm_dial.go
index 0cb2858768bca0b71ae3cb879bdf12dcf995f738..e05a2a2f371bb7ffe3166c4628c33dc3d537e348 100644
--- a/swarm_dial.go
+++ b/swarm_dial.go
@@ -12,10 +12,10 @@ import (
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
-	"github.com/jbenet/go-multiaddr-net"
+	"gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
 
-	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 )
 
 // Diagram of dial sync:
diff --git a/swarm_listen.go b/swarm_listen.go
index f184640658e9e6b4f80e7d9d819933a6bd5ba528..4584250f7dd1546c2ed152217dd82a74967607f0 100644
--- a/swarm_listen.go
+++ b/swarm_listen.go
@@ -9,9 +9,9 @@ import (
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	transport "github.com/ipfs/go-libp2p/p2p/net/transport"
 
-	ma "github.com/jbenet/go-multiaddr"
-	ps "github.com/jbenet/go-peerstream"
-	context "golang.org/x/net/context"
+	ps "gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 )
 
 // Open listeners and reuse-dialers for the given addresses
diff --git a/swarm_net.go b/swarm_net.go
index a8361fc5bb668d8cc8e93059836d7a29e9f5200d..1d75814da1f36f4fec04f09ea4ea3ca33ea2b14d 100644
--- a/swarm_net.go
+++ b/swarm_net.go
@@ -8,9 +8,9 @@ import (
 	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 
-	ma "github.com/jbenet/go-multiaddr"
-	"github.com/jbenet/goprocess"
-	context "golang.org/x/net/context"
+	"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 )
 
 // Network implements the inet.Network interface.
diff --git a/swarm_net_test.go b/swarm_net_test.go
index 14c590b9d17dc2fa29e423dce28e77ef568b7779..1ffb44812e04e3854750aaa14c9ec33dfe4b2f29 100644
--- a/swarm_net_test.go
+++ b/swarm_net_test.go
@@ -7,7 +7,7 @@ import (
 
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
-	context "golang.org/x/net/context"
+	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 )
 
 // TestConnectednessCorrect starts a few networks, connects a few
diff --git a/swarm_notif_test.go b/swarm_notif_test.go
index 0d976e81d0c16aefd5e2264e83226c93537b602d..d6f06da7cea5e6a7facc90176fc9b481361fa55b 100644
--- a/swarm_notif_test.go
+++ b/swarm_notif_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
diff --git a/swarm_stream.go b/swarm_stream.go
index 7965d2743984d85d34e2e8c3ae61dcf897529d41..3f9115fc6c74ec9796a834a44b98cf610ff90881 100644
--- a/swarm_stream.go
+++ b/swarm_stream.go
@@ -3,7 +3,7 @@ package swarm
 import (
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 
-	ps "github.com/jbenet/go-peerstream"
+	ps "gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream"
 )
 
 // a Stream is a wrapper around a ps.Stream that exposes a way to get
diff --git a/swarm_test.go b/swarm_test.go
index a1c35696dc7ce722f456c875d0dd58a39d0995f9..1166f52f1f332300f38e608cca6d074adb5cfa81 100644
--- a/swarm_test.go
+++ b/swarm_test.go
@@ -14,8 +14,8 @@ import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	testutil "github.com/ipfs/go-libp2p/testutil"
 
-	ma "github.com/jbenet/go-multiaddr"
-	context "golang.org/x/net/context"
+	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 )
 
 func EchoStreamHandler(stream inet.Stream) {