diff --git a/dial_test.go b/dial_test.go
index 0ed10f4d30ae94253d7af71c581584c039ce08d7..4d4ea1515e4f8b707f12645bff5b46031d73350f 100644
--- a/dial_test.go
+++ b/dial_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
 	testutil "github.com/ipfs/go-ipfs/util/testutil"
 	ci "github.com/ipfs/go-ipfs/util/testutil/ci"
diff --git a/peers_test.go b/peers_test.go
index 2f8b07ef0bbc0efff0e779c62a3b4293523d2b13..65756a6c2b0c2a332ff20af6caa633f2d168e4ec 100644
--- a/peers_test.go
+++ b/peers_test.go
@@ -3,7 +3,7 @@ package swarm
 import (
 	"testing"
 
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
diff --git a/simul_test.go b/simul_test.go
index dfb775c971f4fd2901d3d9771db0f4b926edfb23..09be20a60a931f04967b49dff3f24fd4618f7c40 100644
--- a/simul_test.go
+++ b/simul_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
 	ci "github.com/ipfs/go-ipfs/util/testutil/ci"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
diff --git a/swarm.go b/swarm.go
index 512369013c5cccf5974a1dd7fcd10ff3162d9987..b20b1289305df0540026bc58cc929858110b99fb 100644
--- a/swarm.go
+++ b/swarm.go
@@ -7,12 +7,12 @@ import (
 	"sync"
 	"time"
 
-	metrics "github.com/ipfs/go-ipfs/metrics"
-	inet "github.com/ipfs/go-ipfs/p2p/net"
-	filter "github.com/ipfs/go-ipfs/p2p/net/filter"
-	addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
 	logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	filter "github.com/ipfs/go-libp2p/p2p/net/filter"
+	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
+	metrics "github.com/ipfs/go-libp2p/util/metrics"
 
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
diff --git a/swarm_addr.go b/swarm_addr.go
index 8f9360d9d073265b8a57c20ae2d35e3ffd413d98..c3eaa3b0012824c789748ad5c5854d9699e2ca64 100644
--- a/swarm_addr.go
+++ b/swarm_addr.go
@@ -1,8 +1,8 @@
 package swarm
 
 import (
-	conn "github.com/ipfs/go-ipfs/p2p/net/conn"
-	addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
+	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
+	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
 
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
diff --git a/swarm_addr_test.go b/swarm_addr_test.go
index b75b491c42b55c5e942735ca2d1d7816ac661207..fbfbcb8c3b7ce8d974fad94a4edaf8828f3802b5 100644
--- a/swarm_addr_test.go
+++ b/swarm_addr_test.go
@@ -3,10 +3,10 @@ package swarm
 import (
 	"testing"
 
-	metrics "github.com/ipfs/go-ipfs/metrics"
-	addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
 	testutil "github.com/ipfs/go-ipfs/util/testutil"
+	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
+	metrics "github.com/ipfs/go-libp2p/util/metrics"
 
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
diff --git a/swarm_conn.go b/swarm_conn.go
index 126ace627a5057bec597baac072a38b9c889b0f7..dd9f308eeff94e6b2113f98709a2d9d9694abcb0 100644
--- a/swarm_conn.go
+++ b/swarm_conn.go
@@ -3,10 +3,10 @@ package swarm
 import (
 	"fmt"
 
-	ic "github.com/ipfs/go-ipfs/p2p/crypto"
-	inet "github.com/ipfs/go-ipfs/p2p/net"
-	conn "github.com/ipfs/go-ipfs/p2p/net/conn"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	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"
 
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
diff --git a/swarm_dial.go b/swarm_dial.go
index a68d2880590b2bbf28c2a880fe2173527a0517d4..d48d8a95f7c3e147b3de66ef1d14bfb93fd0f366 100644
--- a/swarm_dial.go
+++ b/swarm_dial.go
@@ -8,11 +8,11 @@ import (
 	"sync"
 	"time"
 
-	mconn "github.com/ipfs/go-ipfs/metrics/conn"
-	conn "github.com/ipfs/go-ipfs/p2p/net/conn"
-	addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
-	lgbl "github.com/ipfs/go-ipfs/util/eventlog/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 "github.com/ipfs/go-libp2p/util/eventlog/loggables"
+	mconn "github.com/ipfs/go-libp2p/util/metrics/conn"
 
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
diff --git a/swarm_listen.go b/swarm_listen.go
index d1bcb075212881bdf65f8cc9ccf3f5476351b7f0..d41e173574e34c6487f3d94f63260bb1d54f6ffc 100644
--- a/swarm_listen.go
+++ b/swarm_listen.go
@@ -3,11 +3,11 @@ package swarm
 import (
 	"fmt"
 
-	mconn "github.com/ipfs/go-ipfs/metrics/conn"
-	inet "github.com/ipfs/go-ipfs/p2p/net"
-	conn "github.com/ipfs/go-ipfs/p2p/net/conn"
-	addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
-	lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
+	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
+	lgbl "github.com/ipfs/go-libp2p/util/eventlog/loggables"
+	mconn "github.com/ipfs/go-libp2p/util/metrics/conn"
 
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
diff --git a/swarm_net.go b/swarm_net.go
index da9b52251e21b600f5018e1b825bc1290d83aa43..863ef5e64f7786fc9ec42ccc6867a92c8e0869ac 100644
--- a/swarm_net.go
+++ b/swarm_net.go
@@ -3,10 +3,10 @@ package swarm
 import (
 	"fmt"
 
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
-	metrics "github.com/ipfs/go-ipfs/metrics"
-	inet "github.com/ipfs/go-ipfs/p2p/net"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	metrics "github.com/ipfs/go-libp2p/util/metrics"
 
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
diff --git a/swarm_net_test.go b/swarm_net_test.go
index b5f5c569967adcd2c9c6d30f13f4882f2e544138..59c4892b8712ecd16a39bea1608fa36bd06c39d5 100644
--- a/swarm_net_test.go
+++ b/swarm_net_test.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	inet "github.com/ipfs/go-ipfs/p2p/net"
-	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
 )
 
 // TestConnectednessCorrect starts a few networks, connects a few
diff --git a/swarm_notif_test.go b/swarm_notif_test.go
index 9b0e3a9babb40395dcdb1384c18d8cb7c2db8c12..9bbf43e5298ff10400857c0080fa239f4c2ad0b4 100644
--- a/swarm_notif_test.go
+++ b/swarm_notif_test.go
@@ -7,8 +7,8 @@ import (
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 
-	inet "github.com/ipfs/go-ipfs/p2p/net"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
 )
 
 func TestNotifications(t *testing.T) {
diff --git a/swarm_stream.go b/swarm_stream.go
index 66dd6353b71416807f4a06bcef62af2f94208213..bcb188bc492cf62ffd308fe7432eb4f9591f4acf 100644
--- a/swarm_stream.go
+++ b/swarm_stream.go
@@ -1,7 +1,7 @@
 package swarm
 
 import (
-	inet "github.com/ipfs/go-ipfs/p2p/net"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
 
 	ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
 )
diff --git a/swarm_test.go b/swarm_test.go
index 9193db0109a3f86bbeb3500728f2146ec7c72d22..1d0479f2cbb2b964370697e18d1f123f45225cbc 100644
--- a/swarm_test.go
+++ b/swarm_test.go
@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	metrics "github.com/ipfs/go-ipfs/metrics"
-	inet "github.com/ipfs/go-ipfs/p2p/net"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
 	testutil "github.com/ipfs/go-ipfs/util/testutil"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
+	metrics "github.com/ipfs/go-libp2p/util/metrics"
 
 	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"