diff --git a/addr/addr.go b/addr/addr.go
index d9ba87216a7276cf6d2e34a3687b09f4c00a474c..7759625f11a6bb334491573b0d18545143fed61e 100644
--- a/addr/addr.go
+++ b/addr/addr.go
@@ -9,7 +9,7 @@ import (
 	context "golang.org/x/net/context"
 )
 
-var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/net/swarm/addr")
+var log = logging.Logger("github.com/libp2p/go-libp2p/p2p/net/swarm/addr")
 
 // SupportedTransportStrings is the list of supported transports for the swarm.
 // These are strings of encapsulated multiaddr protocols. E.g.:
diff --git a/dial_test.go b/dial_test.go
index 031f3b3a5e0ca9dc8b5b4a9fb40033a96166f7d2..cfdb996c286ccb672321fd20f8ca8c05a5bd4dd4 100644
--- a/dial_test.go
+++ b/dial_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
-	testutil "github.com/ipfs/go-libp2p/testutil"
-	ci "github.com/ipfs/go-libp2p/testutil/ci"
+	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
+	testutil "github.com/libp2p/go-libp2p/testutil"
+	ci "github.com/libp2p/go-libp2p/testutil/ci"
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
diff --git a/limiter.go b/limiter.go
index 94ce05bb861400e345f019a5ac04ae6d43767383..19fc84c3299c96810b86aa7532d76178c1c429aa 100644
--- a/limiter.go
+++ b/limiter.go
@@ -7,8 +7,8 @@ import (
 	ma "github.com/jbenet/go-multiaddr"
 	context "golang.org/x/net/context"
 
-	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
-	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
+	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
 )
 
 type dialResult struct {
diff --git a/limiter_test.go b/limiter_test.go
index 28733c5ab5eb85b730322443843b9cd115ca4c23..6ee6349a7b52afb20fd58a917d6c36c54b9169f8 100644
--- a/limiter_test.go
+++ b/limiter_test.go
@@ -12,7 +12,7 @@ import (
 	mafmt "github.com/whyrusleeping/mafmt"
 	context "golang.org/x/net/context"
 
-	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
 )
 
 func mustAddr(t *testing.T, s string) ma.Multiaddr {
diff --git a/simul_test.go b/simul_test.go
index e0165262e39235cdb7e700a22ea788f65f501d43..c6ee6cf985e35939389b78ed1c49f01d337e0e30 100644
--- a/simul_test.go
+++ b/simul_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	ci "github.com/ipfs/go-libp2p/testutil/ci"
+	ci "github.com/libp2p/go-libp2p/testutil/ci"
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
diff --git a/swarm.go b/swarm.go
index 1fcf0f1c14acc09a4de5f502de677149a15507c8..a86edb372faa7997a4c3b592aace24426ce10f1f 100644
--- a/swarm.go
+++ b/swarm.go
@@ -13,18 +13,18 @@ import (
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	transport "github.com/ipfs/go-libp2p-transport"
-	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
-	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"
-	filter "github.com/ipfs/go-libp2p/p2p/net/filter"
-	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
 	logging "github.com/ipfs/go-log"
 	ma "github.com/jbenet/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
 	pst "github.com/jbenet/go-stream-muxer"
 	"github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
+	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"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
+	filter "github.com/libp2p/go-libp2p/p2p/net/filter"
+	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
 	psmss "github.com/whyrusleeping/go-smux-multistream"
 	spdy "github.com/whyrusleeping/go-smux-spdystream"
 	yamux "github.com/whyrusleeping/go-smux-yamux"
diff --git a/swarm_addr.go b/swarm_addr.go
index 039683bfb9cb77000dc3295778446c1218fd836a..85d4aafe8589c8b3224cf4564a8ac61aef02761a 100644
--- a/swarm_addr.go
+++ b/swarm_addr.go
@@ -1,8 +1,8 @@
 package swarm
 
 import (
-	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
-	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
+	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
 
 	ma "github.com/jbenet/go-multiaddr"
 )
diff --git a/swarm_addr_test.go b/swarm_addr_test.go
index 0f9419bf342c5ee945af45f6bb9a502e67950cce..37eacbfd71d97606fd8121293914eb00044a9373 100644
--- a/swarm_addr_test.go
+++ b/swarm_addr_test.go
@@ -3,9 +3,9 @@ package swarm
 import (
 	"testing"
 
-	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
-	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
-	testutil "github.com/ipfs/go-libp2p/testutil"
+	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
+	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
+	testutil "github.com/libp2p/go-libp2p/testutil"
 
 	pstore "github.com/ipfs/go-libp2p-peerstore"
 	ma "github.com/jbenet/go-multiaddr"
diff --git a/swarm_conn.go b/swarm_conn.go
index 96700ba835fbfe66b6dfe2bdb85e3c320c2da07d..36932784c9612cba01e2115a5e7e16e3a393e875 100644
--- a/swarm_conn.go
+++ b/swarm_conn.go
@@ -3,8 +3,8 @@ package swarm
 import (
 	"fmt"
 
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
 
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
diff --git a/swarm_dial.go b/swarm_dial.go
index 1100ca544d1ff24601c5a913d695beedca6a1391..2f4d29fa51e483a8506d9c94fa32a8ea665aaebc 100644
--- a/swarm_dial.go
+++ b/swarm_dial.go
@@ -8,9 +8,9 @@ import (
 
 	lgbl "github.com/ipfs/go-libp2p-loggables"
 	peer "github.com/ipfs/go-libp2p-peer"
-	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"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
+	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
 	context "golang.org/x/net/context"
 )
 
diff --git a/swarm_listen.go b/swarm_listen.go
index 38457f16feb082d853045c20acfb01b26519d760..64fdb83bd094ff904d9938ad08b854dd8c372103 100644
--- a/swarm_listen.go
+++ b/swarm_listen.go
@@ -5,11 +5,11 @@ import (
 
 	lgbl "github.com/ipfs/go-libp2p-loggables"
 	transport "github.com/ipfs/go-libp2p-transport"
-	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"
 	ma "github.com/jbenet/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
+	mconn "github.com/libp2p/go-libp2p/p2p/metrics/conn"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
 	context "golang.org/x/net/context"
 )
 
diff --git a/swarm_net.go b/swarm_net.go
index 92d2a801ebd26dbac9c3930ddbb4971e7e066242..8624dedba1c61dcb91fae14c98b05b9047060fc4 100644
--- a/swarm_net.go
+++ b/swarm_net.go
@@ -5,8 +5,8 @@ import (
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
-	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
+	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 
 	ma "github.com/jbenet/go-multiaddr"
 	"github.com/jbenet/goprocess"
diff --git a/swarm_net_test.go b/swarm_net_test.go
index 14c590b9d17dc2fa29e423dce28e77ef568b7779..fddc8523fa00afdb6b2e424934dc20843c508a02 100644
--- a/swarm_net_test.go
+++ b/swarm_net_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
 	context "golang.org/x/net/context"
 )
 
diff --git a/swarm_notif_test.go b/swarm_notif_test.go
index baced67e61ee17e9f5445503d4d14d2634755c4e..06777469f5956f4f9347e812f7d0d693a2343179 100644
--- a/swarm_notif_test.go
+++ b/swarm_notif_test.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	peer "github.com/ipfs/go-libp2p-peer"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
 	ma "github.com/jbenet/go-multiaddr"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 	context "golang.org/x/net/context"
 )
 
diff --git a/swarm_stream.go b/swarm_stream.go
index 16aa6e07c9ec8864db6ab637df8658a3b7949d26..b305bf917e95a455c6b135f6d24c96ca5921094f 100644
--- a/swarm_stream.go
+++ b/swarm_stream.go
@@ -1,7 +1,7 @@
 package swarm
 
 import (
-	inet "github.com/ipfs/go-libp2p/p2p/net"
+	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 a19688d90b1d80f14785a7891b35ebd6f5cc421e..c11377ed5e5ee28c2bdeb9bd666c3120155f80bf 100644
--- a/swarm_test.go
+++ b/swarm_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	testutil "github.com/ipfs/go-libp2p/testutil"
+	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	testutil "github.com/libp2p/go-libp2p/testutil"
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"