diff --git a/swarm.go b/swarm.go
index 9107d7160a84619fba28963c0e0b9ed5963c3822..77c7daff040f6bd0ded6bca57248f472a06199ac 100644
--- a/swarm.go
+++ b/swarm.go
@@ -11,10 +11,6 @@ import (
 	"sync"
 	"time"
 
-	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
-	mconn "github.com/libp2p/go-libp2p/p2p/metrics/conn"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
-
 	ci "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
@@ -26,6 +22,9 @@ import (
 	goprocessctx "github.com/jbenet/goprocess/context"
 	addrutil "github.com/libp2p/go-addr-util"
 	conn "github.com/libp2p/go-libp2p-conn"
+	metrics "github.com/libp2p/go-libp2p-metrics"
+	mconn "github.com/libp2p/go-libp2p-metrics/conn"
+	inet "github.com/libp2p/go-libp2p-net"
 	transport "github.com/libp2p/go-libp2p-transport"
 	filter "github.com/libp2p/go-maddr-filter"
 	tcpt "github.com/libp2p/go-tcp-transport"
diff --git a/swarm_addr_test.go b/swarm_addr_test.go
index bd48d4f601cb0db92a4ffd428a68b4b7c9c6be19..5d2225405ab2517ef79d478381c7858345c13870 100644
--- a/swarm_addr_test.go
+++ b/swarm_addr_test.go
@@ -4,11 +4,10 @@ import (
 	"context"
 	"testing"
 
-	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
-
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
 	addrutil "github.com/libp2p/go-addr-util"
+	metrics "github.com/libp2p/go-libp2p-metrics"
 	testutil "github.com/libp2p/go-testutil"
 )
 
diff --git a/swarm_conn.go b/swarm_conn.go
index 30ef800edba0fd29e47dae316736ee6f3f4677ff..42fc8905dac4a77c24c23088b8670280a2ac350b 100644
--- a/swarm_conn.go
+++ b/swarm_conn.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	inet "github.com/libp2p/go-libp2p/p2p/net"
+	inet "github.com/libp2p/go-libp2p-net"
 
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
diff --git a/swarm_listen.go b/swarm_listen.go
index 702ef54b7e53cedfbb88ffda03500ee71b553881..0c9d8597356fdfd53acc35362beb15dee52b861d 100644
--- a/swarm_listen.go
+++ b/swarm_listen.go
@@ -4,14 +4,13 @@ import (
 	"context"
 	"fmt"
 
-	inet "github.com/libp2p/go-libp2p/p2p/net"
-
 	lgbl "github.com/ipfs/go-libp2p-loggables"
 	ma "github.com/jbenet/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
 	conn "github.com/libp2p/go-libp2p-conn"
+	mconn "github.com/libp2p/go-libp2p-metrics/conn"
+	inet "github.com/libp2p/go-libp2p-net"
 	transport "github.com/libp2p/go-libp2p-transport"
-	mconn "github.com/libp2p/go-libp2p/p2p/metrics/conn"
 )
 
 func (s *Swarm) AddListenAddr(a ma.Multiaddr) error {
diff --git a/swarm_net.go b/swarm_net.go
index d9e83d5fdc02e3eaae5ae3ad01119c5a4f81562b..86755cf8bed6a93fa0ed35eece8b30c7d7c94340 100644
--- a/swarm_net.go
+++ b/swarm_net.go
@@ -1,16 +1,15 @@
 package swarm
 
 import (
+	"context"
 	"fmt"
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
-	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
-
-	"context"
 	ma "github.com/jbenet/go-multiaddr"
 	"github.com/jbenet/goprocess"
+	metrics "github.com/libp2p/go-libp2p-metrics"
+	inet "github.com/libp2p/go-libp2p-net"
 )
 
 // Network implements the inet.Network interface.
diff --git a/swarm_net_test.go b/swarm_net_test.go
index 205b841a19ddac873e992781a482c369eef50023..ebf3bb82a22d34d5a0f661782d16d87bc32df3e7 100644
--- a/swarm_net_test.go
+++ b/swarm_net_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	inet "github.com/libp2p/go-libp2p/p2p/net"
-	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
 	"context"
+	inet "github.com/libp2p/go-libp2p-net"
+	testutil "github.com/libp2p/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 2bc663e0a55666c6f0ceceee8b240b1d3aa20f18..9e914b8218b99faf7f72a39c9e76d09d5ee28c0f 100644
--- a/swarm_notif_test.go
+++ b/swarm_notif_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	ma "github.com/jbenet/go-multiaddr"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
+	inet "github.com/libp2p/go-libp2p-net"
 )
 
 func streamsSame(a, b inet.Stream) bool {
diff --git a/swarm_stream.go b/swarm_stream.go
index 51c846001a5df43c85e7ff7e445459ead056d85b..ef3ab3c8fd98d65a89c8031ec95bc09e28daccae 100644
--- a/swarm_stream.go
+++ b/swarm_stream.go
@@ -1,8 +1,8 @@
 package swarm
 
 import (
+	inet "github.com/libp2p/go-libp2p-net"
 	protocol "github.com/libp2p/go-libp2p-protocol"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
 
 	ps "github.com/jbenet/go-peerstream"
 )
diff --git a/swarm_test.go b/swarm_test.go
index e7099812db22b9e45225e3a5296ee730bedca806..f0ed560cf2377eacb65324e9a131642820e4812d 100644
--- a/swarm_test.go
+++ b/swarm_test.go
@@ -10,12 +10,11 @@ import (
 	"testing"
 	"time"
 
-	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
-
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
+	metrics "github.com/libp2p/go-libp2p-metrics"
+	inet "github.com/libp2p/go-libp2p-net"
 	testutil "github.com/libp2p/go-testutil"
 )