diff --git a/dial_test.go b/dial_test.go
index 6e987e24dd18f7a2c97a9880ae0d8b61ce3b77b2..d21af292d865af5cb963fd495c665da9c501bb4e 100644
--- a/dial_test.go
+++ b/dial_test.go
@@ -8,10 +8,9 @@ import (
 	"time"
 
 	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
-	peer "github.com/ipfs/go-libp2p/p2p/peer"
-
 	testutil "github.com/ipfs/go-libp2p/testutil"
 	ci "github.com/ipfs/go-libp2p/testutil/ci"
+	peer "gx/ipfs/QmY1xNhBfF9xA1pmD8yejyQAyd77K68qNN6JPM1CN2eiRu/go-libp2p-peer"
 
 	manet "gx/ipfs/QmYVqhVfbK4BKvbW88Lhm26b3ud14sTBvcm1H7uWUx1Fkp/go-multiaddr-net"
 	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
diff --git a/peers_test.go b/peers_test.go
index 8b71f77f340ef7393bad06caf0c0e395b5e3185d..9976d3bf4c82d011c66fb646d24bbc5a31211615 100644
--- a/peers_test.go
+++ b/peers_test.go
@@ -3,8 +3,7 @@ package swarm
 import (
 	"testing"
 
-	peer "github.com/ipfs/go-libp2p/p2p/peer"
-
+	peer "gx/ipfs/QmY1xNhBfF9xA1pmD8yejyQAyd77K68qNN6JPM1CN2eiRu/go-libp2p-peer"
 	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 	ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
 )
diff --git a/simul_test.go b/simul_test.go
index 8c626b805d0af5ebc8d91cfbfaa293abcc563907..b0256b8489f9bdf87d185b95654f64901e9d5587 100644
--- a/simul_test.go
+++ b/simul_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	ci "github.com/ipfs/go-libp2p/testutil/ci"
+	peer "gx/ipfs/QmY1xNhBfF9xA1pmD8yejyQAyd77K68qNN6JPM1CN2eiRu/go-libp2p-peer"
 
 	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 	ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
diff --git a/swarm.go b/swarm.go
index b8e041e81101630ece17fad034ebcb8ca18a28f6..5326bf4a7ff1575328d93ef7d1dfd96203ca1ada 100644
--- a/swarm.go
+++ b/swarm.go
@@ -14,16 +14,15 @@ import (
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	filter "github.com/ipfs/go-libp2p/p2p/net/filter"
 	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
-	transport "github.com/ipfs/go-libp2p/p2p/net/transport"
-	peer "github.com/ipfs/go-libp2p/p2p/peer"
-
 	mafilter "gx/ipfs/QmPwfFAHUmvWDucLHRS9Xz2Kb1TNX2cY4LJ7pQjg9kVcae/multiaddr-filter"
 	"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
 	goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
+	transport "gx/ipfs/QmR4HhZm1fL8epXz8661Ru8ks5Y1Uk2u51quAWaCTD1zHg/go-libp2p-transport"
 	pst "gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer"
 	psmss "gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/multistream"
 	spdy "gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/spdystream"
 	yamux "gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/yamux"
+	peer "gx/ipfs/QmY1xNhBfF9xA1pmD8yejyQAyd77K68qNN6JPM1CN2eiRu/go-libp2p-peer"
 	ps "gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream"
 	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 	logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
diff --git a/swarm_addr_test.go b/swarm_addr_test.go
index 2e69e14e114bc460bb03760beaa2c4456c9778cd..9cef367c78fcf34381bdbf2bf7f6e379b9d66a80 100644
--- a/swarm_addr_test.go
+++ b/swarm_addr_test.go
@@ -5,8 +5,8 @@ import (
 
 	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
 	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
-	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	testutil "github.com/ipfs/go-libp2p/testutil"
+	peer "gx/ipfs/QmY1xNhBfF9xA1pmD8yejyQAyd77K68qNN6JPM1CN2eiRu/go-libp2p-peer"
 
 	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 	ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
diff --git a/swarm_conn.go b/swarm_conn.go
index 04e9a4034feb5b84cc290a37f34de0f26f8ae642..3ff2b91fcc658563b6197fd93e60cda3ba463a21 100644
--- a/swarm_conn.go
+++ b/swarm_conn.go
@@ -3,13 +3,13 @@ package swarm
 import (
 	"fmt"
 
-	ic "github.com/ipfs/go-libp2p/p2p/crypto"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
-	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
+	peer "gx/ipfs/QmY1xNhBfF9xA1pmD8yejyQAyd77K68qNN6JPM1CN2eiRu/go-libp2p-peer"
 	ps "gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream"
 	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
+	ic "gx/ipfs/QmaP38GJApheTr84f8R89vsT7oJLQw1AeCz4HqrQgv2njB/go-libp2p-crypto"
 	ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
 )
 
diff --git a/swarm_dial.go b/swarm_dial.go
index 283bef1afbdce3969012757da29cf068def401a0..b569f92fa448ea72a35fed4f6316fcec0502cd5b 100644
--- a/swarm_dial.go
+++ b/swarm_dial.go
@@ -8,10 +8,10 @@ import (
 	"sync"
 	"time"
 
-	lgbl "github.com/ipfs/go-libp2p/loggables"
 	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"
+	lgbl "gx/ipfs/QmSyBhZt2upyQ3NJmTpab1pX6hesA59vcYTGmgoDorZZbw/go-libp2p-loggables"
+	peer "gx/ipfs/QmY1xNhBfF9xA1pmD8yejyQAyd77K68qNN6JPM1CN2eiRu/go-libp2p-peer"
 	"gx/ipfs/QmYVqhVfbK4BKvbW88Lhm26b3ud14sTBvcm1H7uWUx1Fkp/go-multiaddr-net"
 	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 	ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
diff --git a/swarm_listen.go b/swarm_listen.go
index b83df4551c522c6fb8b45d1ccfb55801863d4d40..cf0c3a332680e56d2ce3fac396e9a5ff7e2eb47f 100644
--- a/swarm_listen.go
+++ b/swarm_listen.go
@@ -3,12 +3,11 @@ package swarm
 import (
 	"fmt"
 
-	lgbl "github.com/ipfs/go-libp2p/loggables"
 	mconn "github.com/ipfs/go-libp2p/p2p/metrics/conn"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
-	transport "github.com/ipfs/go-libp2p/p2p/net/transport"
-
+	transport "gx/ipfs/QmR4HhZm1fL8epXz8661Ru8ks5Y1Uk2u51quAWaCTD1zHg/go-libp2p-transport"
+	lgbl "gx/ipfs/QmSyBhZt2upyQ3NJmTpab1pX6hesA59vcYTGmgoDorZZbw/go-libp2p-loggables"
 	ps "gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream"
 	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 	ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
diff --git a/swarm_net.go b/swarm_net.go
index 863da8efecdd660471462e69d7e768b19ecf35a4..d99e04e1358cdb96aab190b02632b659d69fbf33 100644
--- a/swarm_net.go
+++ b/swarm_net.go
@@ -3,10 +3,9 @@ package swarm
 import (
 	"fmt"
 
-	peer "github.com/ipfs/go-libp2p/p2p/peer"
-
 	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
+	peer "gx/ipfs/QmY1xNhBfF9xA1pmD8yejyQAyd77K68qNN6JPM1CN2eiRu/go-libp2p-peer"
 
 	"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
 	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
diff --git a/swarm_notif_test.go b/swarm_notif_test.go
index 9a8052e9ef83f1cb1296bdc5ee0cbe324e9f4ae3..29292eedbd3f9db7c0e676014adccc0dab0a1101 100644
--- a/swarm_notif_test.go
+++ b/swarm_notif_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	inet "github.com/ipfs/go-libp2p/p2p/net"
-	peer "github.com/ipfs/go-libp2p/p2p/peer"
+	peer "gx/ipfs/QmY1xNhBfF9xA1pmD8yejyQAyd77K68qNN6JPM1CN2eiRu/go-libp2p-peer"
 	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 	ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
 )
diff --git a/swarm_test.go b/swarm_test.go
index c69c7db38f35fc4f131bbf47f92294eaf1bdba10..f637203a3095d8a9ece5adcf32a4d9c1ed93d7bc 100644
--- a/swarm_test.go
+++ b/swarm_test.go
@@ -11,8 +11,8 @@ import (
 
 	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
-	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	testutil "github.com/ipfs/go-libp2p/testutil"
+	peer "gx/ipfs/QmY1xNhBfF9xA1pmD8yejyQAyd77K68qNN6JPM1CN2eiRu/go-libp2p-peer"
 
 	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 	ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"