diff --git a/addr/addr.go b/addr/addr.go
index c74147527b946cb7dfe3f6536944030259b694c6..39f00dba1c65078b7796150492abce8d64a144df 100644
--- a/addr/addr.go
+++ b/addr/addr.go
@@ -3,11 +3,11 @@ package addrutil
 import (
 	"fmt"
 
-	logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log"
+	logging "github.com/ipfs/go-log"
 
-	manet "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net"
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	ma "github.com/jbenet/go-multiaddr"
+	manet "github.com/jbenet/go-multiaddr-net"
+	context "golang.org/x/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 120195a12291261b97bc1debac015319cd3e5e42..49eec13511dd4ef99ee4db9d0eb7929f98bfff2e 100644
--- a/addr/addr_test.go
+++ b/addr/addr_test.go
@@ -3,8 +3,8 @@ package addrutil
 import (
 	"testing"
 
-	manet "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net"
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
+	ma "github.com/jbenet/go-multiaddr"
+	manet "github.com/jbenet/go-multiaddr-net"
 )
 
 func newMultiaddr(t *testing.T, s string) ma.Multiaddr {
diff --git a/dial_test.go b/dial_test.go
index 0df87fd293bcf9f8623dad9665f82aa2fe682533..57a4d7f1613c603a31c79646f8c494d7f00c0549 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"
 
-	manet "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net"
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	ma "github.com/jbenet/go-multiaddr"
+	manet "github.com/jbenet/go-multiaddr-net"
+	context "golang.org/x/net/context"
 )
 
 func acceptAndHang(l net.Listener) {
diff --git a/peers_test.go b/peers_test.go
index ef9c22ff6000840d49528aee39b4d9c77f3a5cf1..b107fbfe839b1ca47fcb8ebbe9d021d121402caf 100644
--- a/peers_test.go
+++ b/peers_test.go
@@ -5,8 +5,8 @@ import (
 
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	ma "github.com/jbenet/go-multiaddr"
+	context "golang.org/x/net/context"
 )
 
 func TestPeers(t *testing.T) {
diff --git a/simul_test.go b/simul_test.go
index 408b39b244ee03e32a14bd4c10034133a84626c9..bd753e7660ed960530edf35b10c77af589651071 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 "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	ma "github.com/jbenet/go-multiaddr"
+	context "golang.org/x/net/context"
 )
 
 func TestSimultOpen(t *testing.T) {
diff --git a/swarm.go b/swarm.go
index 41c2ca95b0121521b4b8b657be43c334de814d94..c71ef359dedcbaca48467f599e3b188f016ceed9 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"
 
-	ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream"
-	pst "gx/QmRmT6MSnfhRDW1PTUGSd3z4fqXK48GUequQAZzeT4c5iC/go-stream-muxer"
-	psmss "gx/QmRmT6MSnfhRDW1PTUGSd3z4fqXK48GUequQAZzeT4c5iC/go-stream-muxer/multistream"
-	mafilter "gx/QmVCmuhgDFer5MW5737Z8GtBEGpUyEkFnLUv4ASDWnLZdC/multiaddr-filter"
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
-	"gx/QmfDXyLfKNfja2XebomRZjZ2UZCa4BDyFoCymKtzNRVQ5b/goprocess"
-	goprocessctx "gx/QmfDXyLfKNfja2XebomRZjZ2UZCa4BDyFoCymKtzNRVQ5b/goprocess/context"
-
-	logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log"
+	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"
 )
 
 var log = logging.Logger("swarm2")
diff --git a/swarm_addr.go b/swarm_addr.go
index 81a77bb8e00f8cea6f2041c76e3744b70a85b977..039683bfb9cb77000dc3295778446c1218fd836a 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 "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
+	ma "github.com/jbenet/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 7383beeabe3200f92fe1b3fd0883eef5fce8cfb8..7db46d3444b2a119b74440b6e20900b98524cf8f 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 "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	ma "github.com/jbenet/go-multiaddr"
+	context "golang.org/x/net/context"
 )
 
 func TestFilterAddrs(t *testing.T) {
diff --git a/swarm_conn.go b/swarm_conn.go
index e7d1ec91dcda0d135eac9b9f49746f25c5d5ca8d..840a9b465c111ae6ea3c8936ceba76617cf13e4a 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"
 
-	ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream"
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	ma "github.com/jbenet/go-multiaddr"
+	ps "github.com/jbenet/go-peerstream"
+	context "golang.org/x/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 fa4fce1e47ab05cea525e757de9a57c45cebcf38..0cb2858768bca0b71ae3cb879bdf12dcf995f738 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"
-	"gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net"
+	"github.com/jbenet/go-multiaddr-net"
 
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	ma "github.com/jbenet/go-multiaddr"
+	context "golang.org/x/net/context"
 )
 
 // Diagram of dial sync:
diff --git a/swarm_listen.go b/swarm_listen.go
index bd1810b46291853d499ca5eec48b51b03b960ae2..f184640658e9e6b4f80e7d9d819933a6bd5ba528 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"
 
-	ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream"
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	ma "github.com/jbenet/go-multiaddr"
+	ps "github.com/jbenet/go-peerstream"
+	context "golang.org/x/net/context"
 )
 
 // Open listeners and reuse-dialers for the given addresses
diff --git a/swarm_net.go b/swarm_net.go
index e5a6e0216a14b663ee25d515d9e23126380d0aea..a8361fc5bb668d8cc8e93059836d7a29e9f5200d 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 "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
-	"gx/QmfDXyLfKNfja2XebomRZjZ2UZCa4BDyFoCymKtzNRVQ5b/goprocess"
+	ma "github.com/jbenet/go-multiaddr"
+	"github.com/jbenet/goprocess"
+	context "golang.org/x/net/context"
 )
 
 // Network implements the inet.Network interface.
diff --git a/swarm_net_test.go b/swarm_net_test.go
index c40b89cc6382c11f031ac2d8faa0afcc45761e16..14c590b9d17dc2fa29e423dce28e77ef568b7779 100644
--- a/swarm_net_test.go
+++ b/swarm_net_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
+	context "golang.org/x/net/context"
 )
 
 // TestConnectednessCorrect starts a few networks, connects a few
diff --git a/swarm_notif_test.go b/swarm_notif_test.go
index 9b59bb24d9e534c0989de7eede72a33448aa8314..0d976e81d0c16aefd5e2264e83226c93537b602d 100644
--- a/swarm_notif_test.go
+++ b/swarm_notif_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	ma "github.com/jbenet/go-multiaddr"
+	context "golang.org/x/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 f4ee314958383786c576fe24cae5c33a5a100747..7965d2743984d85d34e2e8c3ae61dcf897529d41 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 "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream"
+	ps "github.com/jbenet/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 b6aa692cb01edb8d52f9ba16c6f97d75af8048a0..a1c35696dc7ce722f456c875d0dd58a39d0995f9 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 "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr"
-	context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
+	ma "github.com/jbenet/go-multiaddr"
+	context "golang.org/x/net/context"
 )
 
 func EchoStreamHandler(stream inet.Stream) {