diff --git a/examples/hosts/main.go b/examples/hosts/main.go
index f92be28b3a446bc3a0b931f83bf26c2fb029aac0..256fdbff8f8d6336caffe3d074aee16e90725977 100644
--- a/examples/hosts/main.go
+++ b/examples/hosts/main.go
@@ -5,16 +5,15 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
-	"time"
 
 	pstore "github.com/ipfs/go-libp2p-peerstore"
-	host "github.com/ipfs/go-libp2p/p2p/host"
-	bhost "github.com/ipfs/go-libp2p/p2p/host/basic"
-	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
-	net "github.com/ipfs/go-libp2p/p2p/net"
-	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
-	swarm "github.com/ipfs/go-libp2p/p2p/net/swarm"
-	testutil "github.com/ipfs/go-libp2p/testutil"
+	host "github.com/libp2p/go-libp2p/p2p/host"
+	bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
+	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
+	net "github.com/libp2p/go-libp2p/p2p/net"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
+	swarm "github.com/libp2p/go-libp2p/p2p/net/swarm"
+	testutil "github.com/libp2p/go-libp2p/testutil"
 
 	ipfsaddr "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
 	ma "github.com/jbenet/go-multiaddr"
diff --git a/p2p/discovery/mdns.go b/p2p/discovery/mdns.go
index 71eb0a5d9ee87c5e35960cc6fb75b74a1272e396..bc9c1f66ce46d23ad4d03f0944ea552c755ebbaf 100644
--- a/p2p/discovery/mdns.go
+++ b/p2p/discovery/mdns.go
@@ -12,10 +12,10 @@ import (
 	"github.com/cryptix/mdns"
 	"github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
-	"github.com/ipfs/go-libp2p/p2p/host"
 	logging "github.com/ipfs/go-log"
 	ma "github.com/jbenet/go-multiaddr"
 	manet "github.com/jbenet/go-multiaddr-net"
+	"github.com/libp2p/go-libp2p/p2p/host"
 )
 
 var log = logging.Logger("mdns")
diff --git a/p2p/host/basic/basic_host.go b/p2p/host/basic/basic_host.go
index b7e94632e75e9e42472d3adcd74d20a904c85fae..2a697556a2320486324dd4f55d8d4d2caf465027 100644
--- a/p2p/host/basic/basic_host.go
+++ b/p2p/host/basic/basic_host.go
@@ -5,21 +5,21 @@ import (
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
-	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
-	mstream "github.com/ipfs/go-libp2p/p2p/metrics/stream"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
-	identify "github.com/ipfs/go-libp2p/p2p/protocol/identify"
-	relay "github.com/ipfs/go-libp2p/p2p/protocol/relay"
 	logging "github.com/ipfs/go-log"
 	ma "github.com/jbenet/go-multiaddr"
 	goprocess "github.com/jbenet/goprocess"
+	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
+	mstream "github.com/libp2p/go-libp2p/p2p/metrics/stream"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
+	identify "github.com/libp2p/go-libp2p/p2p/protocol/identify"
+	relay "github.com/libp2p/go-libp2p/p2p/protocol/relay"
 	context "golang.org/x/net/context"
 
 	msmux "github.com/whyrusleeping/go-multistream"
 )
 
-var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host/basic")
+var log = logging.Logger("github.com/libp2p/go-libp2p/p2p/host/basic")
 
 // Option is a type used to pass in options to the host.
 type Option int
@@ -114,7 +114,8 @@ func (h *BasicHost) newStreamHandler(s inet.Stream) {
 
 	logStream := mstream.WrapStream(s, protocol.ID(protoID), h.bwc)
 
-	go handle(logStream)
+	s.SetProtocol(protoID)
+	go handle(protoID, logStream)
 }
 
 // ID returns the (local) peer.ID associated with this Host
@@ -147,8 +148,10 @@ func (h *BasicHost) IDService() *identify.IDService {
 //   host.Mux().SetHandler(proto, handler)
 // (Threadsafe)
 func (h *BasicHost) SetStreamHandler(pid protocol.ID, handler inet.StreamHandler) {
-	h.Mux().AddHandler(string(pid), func(rwc io.ReadWriteCloser) error {
-		handler(rwc.(inet.Stream))
+	h.Mux().AddHandler(string(pid), func(p string, rwc io.ReadWriteCloser) error {
+		is := rwc.(inet.Stream)
+		is.SetProtocol(p)
+		handler(is)
 		return nil
 	})
 }
diff --git a/p2p/host/basic/basic_host_test.go b/p2p/host/basic/basic_host_test.go
index 3de87797eb7f5ebf770c23ca99ea805c30dcdd76..f1f2e248a3fa4629e7369461c3777f94614d39d6 100644
--- a/p2p/host/basic/basic_host_test.go
+++ b/p2p/host/basic/basic_host_test.go
@@ -5,9 +5,9 @@ import (
 	"io"
 	"testing"
 
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
-	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
+	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
 
 	context "golang.org/x/net/context"
 )
diff --git a/p2p/host/basic/natmgr.go b/p2p/host/basic/natmgr.go
index 7581a2e2213e58eed220ab261763855d23d39dcf..035134707739ef5c376d8dd27c0be1f2037cc8dd 100644
--- a/p2p/host/basic/natmgr.go
+++ b/p2p/host/basic/natmgr.go
@@ -4,10 +4,10 @@ import (
 	"sync"
 
 	lgbl "github.com/ipfs/go-libp2p-loggables"
-	inat "github.com/ipfs/go-libp2p/p2p/nat"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
 	ma "github.com/jbenet/go-multiaddr"
 	goprocess "github.com/jbenet/goprocess"
+	inat "github.com/libp2p/go-libp2p/p2p/nat"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 	context "golang.org/x/net/context"
 )
 
diff --git a/p2p/host/host.go b/p2p/host/host.go
index 1db42a8f838f92cce3131131c248fe44441dd702..40bb6881cbc6e3732d4efb2e3e675a8fd665e7e0 100644
--- a/p2p/host/host.go
+++ b/p2p/host/host.go
@@ -3,16 +3,16 @@ package host
 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"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
 	logging "github.com/ipfs/go-log"
 	ma "github.com/jbenet/go-multiaddr"
+	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 	msmux "github.com/whyrusleeping/go-multistream"
 	context "golang.org/x/net/context"
 )
 
-var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host")
+var log = logging.Logger("github.com/libp2p/go-libp2p/p2p/host")
 
 // Host is an object participating in a p2p network, which
 // implements protocols or provides services. It handles
diff --git a/p2p/host/routed/routed.go b/p2p/host/routed/routed.go
index 532910c64742a7ce6d0b82d70b2e03ee938db2ea..3f04a0724f663c567f9374a7e6f8e02028d71b1d 100644
--- a/p2p/host/routed/routed.go
+++ b/p2p/host/routed/routed.go
@@ -7,18 +7,18 @@ import (
 	lgbl "github.com/ipfs/go-libp2p-loggables"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
-	host "github.com/ipfs/go-libp2p/p2p/host"
-	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
 	logging "github.com/ipfs/go-log"
 	ma "github.com/jbenet/go-multiaddr"
+	host "github.com/libp2p/go-libp2p/p2p/host"
+	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 	context "golang.org/x/net/context"
 
 	msmux "github.com/whyrusleeping/go-multistream"
 )
 
-var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host/routed")
+var log = logging.Logger("github.com/libp2p/go-libp2p/p2p/host/routed")
 
 // AddressTTL is the expiry time for our addresses.
 // We expire them quickly.
diff --git a/p2p/metrics/bw_stats.go b/p2p/metrics/bw_stats.go
index 0f222b76ddf8aaa37dbc16ce0e6eab5875fd1469..3b5fedd59960ff307581cee79654245dab4ffefd 100644
--- a/p2p/metrics/bw_stats.go
+++ b/p2p/metrics/bw_stats.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	peer "github.com/ipfs/go-libp2p-peer"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 )
 
 type Stats struct {
diff --git a/p2p/metrics/conn/conn.go b/p2p/metrics/conn/conn.go
index 8cc0f62a21aad20f96d1cca6d86ba9d6a241d5a8..077ba8fa7ceb596ab0a653b3dcd9bacaf280c55f 100644
--- a/p2p/metrics/conn/conn.go
+++ b/p2p/metrics/conn/conn.go
@@ -2,7 +2,7 @@ package meterconn
 
 import (
 	transport "github.com/ipfs/go-libp2p-transport"
-	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
+	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
 )
 
 type MeteredConn struct {
diff --git a/p2p/metrics/interface.go b/p2p/metrics/interface.go
index 876523c5fd09fe8d452adad11fde7ae66face5c3..1ceb1e95c51694ebd61a66980d529297ff668eb4 100644
--- a/p2p/metrics/interface.go
+++ b/p2p/metrics/interface.go
@@ -2,7 +2,7 @@ package metrics
 
 import (
 	peer "github.com/ipfs/go-libp2p-peer"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 )
 
 type StreamMeterCallback func(int64, protocol.ID, peer.ID)
diff --git a/p2p/metrics/stream/metered.go b/p2p/metrics/stream/metered.go
index 2531dfbe5cf9819b561ec311e41879947e044d70..2c7a4c6b947c06ad8c0d99f042d45b35ce727718 100644
--- a/p2p/metrics/stream/metered.go
+++ b/p2p/metrics/stream/metered.go
@@ -2,9 +2,9 @@ package meterstream
 
 import (
 	peer "github.com/ipfs/go-libp2p-peer"
-	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
+	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 )
 
 type meteredStream struct {
diff --git a/p2p/metrics/stream/metered_test.go b/p2p/metrics/stream/metered_test.go
index 97d4374f96034d2dfb57c0f1413317f04ff0a722..5af586ee20999558434bb4cf7846b70ee638457c 100644
--- a/p2p/metrics/stream/metered_test.go
+++ b/p2p/metrics/stream/metered_test.go
@@ -7,8 +7,8 @@ import (
 
 	randbo "github.com/dustin/randbo"
 	peer "github.com/ipfs/go-libp2p-peer"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 )
 
 type FakeStream struct {
diff --git a/p2p/net/conn/conn_test.go b/p2p/net/conn/conn_test.go
index 461a1314c46959d3dc494e12346087747143ebd7..fb1d9afbb355689ee65fa7ce27d79d82b7f3c1ff 100644
--- a/p2p/net/conn/conn_test.go
+++ b/p2p/net/conn/conn_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	travis "github.com/ipfs/go-libp2p/testutil/ci/travis"
 	msgio "github.com/jbenet/go-msgio"
+	travis "github.com/libp2p/go-libp2p/testutil/ci/travis"
 	context "golang.org/x/net/context"
 )
 
diff --git a/p2p/net/conn/dial.go b/p2p/net/conn/dial.go
index 9d0e6a7c17041f2130cc3cc52f23e0cb084cf69d..6b29492bcf8a234d028dc2ee78c5a18c03d5af3f 100644
--- a/p2p/net/conn/dial.go
+++ b/p2p/net/conn/dial.go
@@ -10,9 +10,9 @@ import (
 	lgbl "github.com/ipfs/go-libp2p-loggables"
 	peer "github.com/ipfs/go-libp2p-peer"
 	transport "github.com/ipfs/go-libp2p-transport"
-	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
 	ma "github.com/jbenet/go-multiaddr"
 	manet "github.com/jbenet/go-multiaddr-net"
+	addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
 	msmux "github.com/whyrusleeping/go-multistream"
 	context "golang.org/x/net/context"
 )
diff --git a/p2p/net/conn/dial_test.go b/p2p/net/conn/dial_test.go
index f26f76f3bb3b94452f8ac0f1a23e1a39a52b2ce9..762113e83394c0fdcadc48f7e39f865f14d9daf5 100644
--- a/p2p/net/conn/dial_test.go
+++ b/p2p/net/conn/dial_test.go
@@ -14,7 +14,7 @@ import (
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
 	transport "github.com/ipfs/go-libp2p-transport"
-	tu "github.com/ipfs/go-libp2p/testutil"
+	tu "github.com/libp2p/go-libp2p/testutil"
 
 	ma "github.com/jbenet/go-multiaddr"
 	msmux "github.com/whyrusleeping/go-multistream"
@@ -23,7 +23,7 @@ import (
 )
 
 func goroFilter(r *grc.Goroutine) bool {
-	return strings.Contains(r.Function, "go-log.")
+	return strings.Contains(r.Function, "go-log.") || strings.Contains(r.Stack[0], "testing.(*T).Run")
 }
 
 func echoListen(ctx context.Context, listener Listener) {
diff --git a/p2p/net/conn/interface.go b/p2p/net/conn/interface.go
index 816284f35bef96357672b33f5603056747208d58..e5d2b1925e5ae54cdb00a0049cb0ac39f05bf001 100644
--- a/p2p/net/conn/interface.go
+++ b/p2p/net/conn/interface.go
@@ -8,8 +8,8 @@ import (
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
 	transport "github.com/ipfs/go-libp2p-transport"
-	filter "github.com/ipfs/go-libp2p/p2p/net/filter"
 	ma "github.com/jbenet/go-multiaddr"
+	filter "github.com/libp2p/go-libp2p/p2p/net/filter"
 )
 
 type PeerConn interface {
diff --git a/p2p/net/conn/listen.go b/p2p/net/conn/listen.go
index ee6443cc086b7a48145f913d23874593ca45ca42..1a7805b6dcd4649e60ea2ca1701d89f4a97c55d8 100644
--- a/p2p/net/conn/listen.go
+++ b/p2p/net/conn/listen.go
@@ -10,11 +10,11 @@ import (
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
 	transport "github.com/ipfs/go-libp2p-transport"
-	filter "github.com/ipfs/go-libp2p/p2p/net/filter"
 	ma "github.com/jbenet/go-multiaddr"
 	tec "github.com/jbenet/go-temp-err-catcher"
 	"github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
+	filter "github.com/libp2p/go-libp2p/p2p/net/filter"
 	msmux "github.com/whyrusleeping/go-multistream"
 	context "golang.org/x/net/context"
 )
diff --git a/p2p/net/conn/secure_conn_test.go b/p2p/net/conn/secure_conn_test.go
index 834f727db69b2057d76c6b6167048af00b890c59..0b74bc54ea5ad391caeb8d02eb552c8412e56426 100644
--- a/p2p/net/conn/secure_conn_test.go
+++ b/p2p/net/conn/secure_conn_test.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	ic "github.com/ipfs/go-libp2p-crypto"
-	travis "github.com/ipfs/go-libp2p/testutil/ci/travis"
+	travis "github.com/libp2p/go-libp2p/testutil/ci/travis"
 
 	context "golang.org/x/net/context"
 )
diff --git a/p2p/net/interface.go b/p2p/net/interface.go
index 81d292eab3781d9f6fac4ebf0914f8e7e0b1d342..12826ed8ba79651c0df680d629df75dc337a09a1 100644
--- a/p2p/net/interface.go
+++ b/p2p/net/interface.go
@@ -5,9 +5,9 @@ import (
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
-	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	ma "github.com/jbenet/go-multiaddr"
 	"github.com/jbenet/goprocess"
+	conn "github.com/libp2p/go-libp2p/p2p/net/conn"
 	context "golang.org/x/net/context"
 )
 
@@ -26,6 +26,9 @@ type Stream interface {
 	io.Writer
 	io.Closer
 
+	Protocol() string
+	SetProtocol(string)
+
 	// Conn returns the connection this stream is part of.
 	Conn() Conn
 }
diff --git a/p2p/net/mock/interface.go b/p2p/net/mock/interface.go
index 0c83affe6df7877ea0cbfe0c6153f5619019acd4..d6384c4e2b9d58fb89720aae99535359b5551aa4 100644
--- a/p2p/net/mock/interface.go
+++ b/p2p/net/mock/interface.go
@@ -10,8 +10,8 @@ import (
 	"io"
 	"time"
 
-	host "github.com/ipfs/go-libp2p/p2p/host"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
+	host "github.com/libp2p/go-libp2p/p2p/host"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
diff --git a/p2p/net/mock/mock_conn.go b/p2p/net/mock/mock_conn.go
index f0fe6c1cebb49262a4950c2ee12e90f80a8d5546..e9b723190cb2404651671648fae73d429588069b 100644
--- a/p2p/net/mock/mock_conn.go
+++ b/p2p/net/mock/mock_conn.go
@@ -6,9 +6,9 @@ import (
 
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
 	ma "github.com/jbenet/go-multiaddr"
 	process "github.com/jbenet/goprocess"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 )
 
 // conn represents one side's perspective of a
diff --git a/p2p/net/mock/mock_link.go b/p2p/net/mock/mock_link.go
index eb25dd4147bacdba993065e099fcdf8ef37aab07..30379dac6f5ea2199f91cb9854fb46b8ee81aea2 100644
--- a/p2p/net/mock/mock_link.go
+++ b/p2p/net/mock/mock_link.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	peer "github.com/ipfs/go-libp2p-peer"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 )
 
 // link implements mocknet.Link
diff --git a/p2p/net/mock/mock_net.go b/p2p/net/mock/mock_net.go
index 832e0fa47622daca7647618ee05c1bb413fc6471..c8acdf82f066e1157394b147f51a027f3ee6df2e 100644
--- a/p2p/net/mock/mock_net.go
+++ b/p2p/net/mock/mock_net.go
@@ -5,11 +5,11 @@ import (
 	"sort"
 	"sync"
 
-	host "github.com/ipfs/go-libp2p/p2p/host"
-	bhost "github.com/ipfs/go-libp2p/p2p/host/basic"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	p2putil "github.com/ipfs/go-libp2p/p2p/test/util"
-	testutil "github.com/ipfs/go-libp2p/testutil"
+	host "github.com/libp2p/go-libp2p/p2p/host"
+	bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	p2putil "github.com/libp2p/go-libp2p/p2p/test/util"
+	testutil "github.com/libp2p/go-libp2p/testutil"
 
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
diff --git a/p2p/net/mock/mock_notif_test.go b/p2p/net/mock/mock_notif_test.go
index bf871da3daeeb8f7d3dbf732ef7ce728a4c38798..4c88ef9aebd04bec899b5a0df51172ef5651f2e4 100644
--- a/p2p/net/mock/mock_notif_test.go
+++ b/p2p/net/mock/mock_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/p2p/net/mock/mock_peernet.go b/p2p/net/mock/mock_peernet.go
index f4db87cb197ea0b7a76e27fcc08d8652adf1f56c..048985b9e2b2e01bfe3fa371b937711df02dcec4 100644
--- a/p2p/net/mock/mock_peernet.go
+++ b/p2p/net/mock/mock_peernet.go
@@ -5,7 +5,7 @@ import (
 	"math/rand"
 	"sync"
 
-	inet "github.com/ipfs/go-libp2p/p2p/net"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
diff --git a/p2p/net/mock/mock_printer.go b/p2p/net/mock/mock_printer.go
index 7afb1213fe83f82a2b82e12f0812a23489e7955f..97732838561d440233e939d2d3b7cf696b2d08c3 100644
--- a/p2p/net/mock/mock_printer.go
+++ b/p2p/net/mock/mock_printer.go
@@ -5,7 +5,7 @@ import (
 	"io"
 
 	peer "github.com/ipfs/go-libp2p-peer"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 )
 
 // separate object so our interfaces are separate :)
diff --git a/p2p/net/mock/mock_stream.go b/p2p/net/mock/mock_stream.go
index 78b4d750ec3bda3d0f3f4df3a2c6bb35b75268a8..2de6df2f3c62a571cf3cf8853ac89cfad94833ff 100644
--- a/p2p/net/mock/mock_stream.go
+++ b/p2p/net/mock/mock_stream.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"time"
 
-	inet "github.com/ipfs/go-libp2p/p2p/net"
 	process "github.com/jbenet/goprocess"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 )
 
 // stream implements inet.Stream
@@ -16,6 +16,8 @@ type stream struct {
 	conn      *conn
 	toDeliver chan *transportObject
 	proc      process.Process
+
+	protocol string
 }
 
 type transportObject struct {
@@ -48,6 +50,14 @@ func (s *stream) Write(p []byte) (n int, err error) {
 	return len(p), nil
 }
 
+func (s *stream) Protocol() string {
+	return s.protocol
+}
+
+func (s *stream) SetProtocol(proto string) {
+	s.protocol = proto
+}
+
 func (s *stream) Close() error {
 	return s.proc.Close()
 }
diff --git a/p2p/net/mock/mock_test.go b/p2p/net/mock/mock_test.go
index a4964a6a9cb8137dca2c20cacba2144fee1c4b17..9c33b3bb6a1c3045e7321bb3e4c57468866cb14d 100644
--- a/p2p/net/mock/mock_test.go
+++ b/p2p/net/mock/mock_test.go
@@ -10,9 +10,9 @@ import (
 	"time"
 
 	peer "github.com/ipfs/go-libp2p-peer"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
-	testutil "github.com/ipfs/go-libp2p/testutil"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
+	testutil "github.com/libp2p/go-libp2p/testutil"
 
 	detectrace "github.com/jbenet/go-detect-race"
 	context "golang.org/x/net/context"
diff --git a/p2p/net/swarm/addr/addr.go b/p2p/net/swarm/addr/addr.go
index d9ba87216a7276cf6d2e34a3687b09f4c00a474c..7759625f11a6bb334491573b0d18545143fed61e 100644
--- a/p2p/net/swarm/addr/addr.go
+++ b/p2p/net/swarm/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/p2p/net/swarm/dial_test.go b/p2p/net/swarm/dial_test.go
index 031f3b3a5e0ca9dc8b5b4a9fb40033a96166f7d2..cfdb996c286ccb672321fd20f8ca8c05a5bd4dd4 100644
--- a/p2p/net/swarm/dial_test.go
+++ b/p2p/net/swarm/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/p2p/net/swarm/limiter.go b/p2p/net/swarm/limiter.go
index 94ce05bb861400e345f019a5ac04ae6d43767383..19fc84c3299c96810b86aa7532d76178c1c429aa 100644
--- a/p2p/net/swarm/limiter.go
+++ b/p2p/net/swarm/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/p2p/net/swarm/limiter_test.go b/p2p/net/swarm/limiter_test.go
index 28733c5ab5eb85b730322443843b9cd115ca4c23..6ee6349a7b52afb20fd58a917d6c36c54b9169f8 100644
--- a/p2p/net/swarm/limiter_test.go
+++ b/p2p/net/swarm/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/p2p/net/swarm/simul_test.go b/p2p/net/swarm/simul_test.go
index e0165262e39235cdb7e700a22ea788f65f501d43..c6ee6cf985e35939389b78ed1c49f01d337e0e30 100644
--- a/p2p/net/swarm/simul_test.go
+++ b/p2p/net/swarm/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/p2p/net/swarm/swarm.go b/p2p/net/swarm/swarm.go
index 15e1ec5e1b868a1a84df00a5c4d0231566273f59..a86edb372faa7997a4c3b592aace24426ce10f1f 100644
--- a/p2p/net/swarm/swarm.go
+++ b/p2p/net/swarm/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"
@@ -340,9 +340,9 @@ func (n *ps2netNotifee) Disconnected(c *ps.Conn) {
 }
 
 func (n *ps2netNotifee) OpenedStream(s *ps.Stream) {
-	n.not.OpenedStream(n.net, inet.Stream((*Stream)(s)))
+	n.not.OpenedStream(n.net, &Stream{stream: s})
 }
 
 func (n *ps2netNotifee) ClosedStream(s *ps.Stream) {
-	n.not.ClosedStream(n.net, inet.Stream((*Stream)(s)))
+	n.not.ClosedStream(n.net, &Stream{stream: s})
 }
diff --git a/p2p/net/swarm/swarm_addr.go b/p2p/net/swarm/swarm_addr.go
index 039683bfb9cb77000dc3295778446c1218fd836a..85d4aafe8589c8b3224cf4564a8ac61aef02761a 100644
--- a/p2p/net/swarm/swarm_addr.go
+++ b/p2p/net/swarm/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/p2p/net/swarm/swarm_addr_test.go b/p2p/net/swarm/swarm_addr_test.go
index 0f9419bf342c5ee945af45f6bb9a502e67950cce..37eacbfd71d97606fd8121293914eb00044a9373 100644
--- a/p2p/net/swarm/swarm_addr_test.go
+++ b/p2p/net/swarm/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/p2p/net/swarm/swarm_conn.go b/p2p/net/swarm/swarm_conn.go
index 96700ba835fbfe66b6dfe2bdb85e3c320c2da07d..36932784c9612cba01e2115a5e7e16e3a393e875 100644
--- a/p2p/net/swarm/swarm_conn.go
+++ b/p2p/net/swarm/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/p2p/net/swarm/swarm_dial.go b/p2p/net/swarm/swarm_dial.go
index 1100ca544d1ff24601c5a913d695beedca6a1391..2f4d29fa51e483a8506d9c94fa32a8ea665aaebc 100644
--- a/p2p/net/swarm/swarm_dial.go
+++ b/p2p/net/swarm/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/p2p/net/swarm/swarm_listen.go b/p2p/net/swarm/swarm_listen.go
index 38457f16feb082d853045c20acfb01b26519d760..64fdb83bd094ff904d9938ad08b854dd8c372103 100644
--- a/p2p/net/swarm/swarm_listen.go
+++ b/p2p/net/swarm/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/p2p/net/swarm/swarm_net.go b/p2p/net/swarm/swarm_net.go
index 92d2a801ebd26dbac9c3930ddbb4971e7e066242..8624dedba1c61dcb91fae14c98b05b9047060fc4 100644
--- a/p2p/net/swarm/swarm_net.go
+++ b/p2p/net/swarm/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/p2p/net/swarm/swarm_net_test.go b/p2p/net/swarm/swarm_net_test.go
index 14c590b9d17dc2fa29e423dce28e77ef568b7779..fddc8523fa00afdb6b2e424934dc20843c508a02 100644
--- a/p2p/net/swarm/swarm_net_test.go
+++ b/p2p/net/swarm/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/p2p/net/swarm/swarm_notif_test.go b/p2p/net/swarm/swarm_notif_test.go
index aa4fca2448885783fa9cd01b565983facd33e37d..06777469f5956f4f9347e812f7d0d693a2343179 100644
--- a/p2p/net/swarm/swarm_notif_test.go
+++ b/p2p/net/swarm/swarm_notif_test.go
@@ -5,11 +5,17 @@ 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"
 )
 
+func streamsSame(a, b inet.Stream) bool {
+	sa := a.(*Stream)
+	sb := b.(*Stream)
+	return sa.Stream() == sb.Stream()
+}
+
 func TestNotifications(t *testing.T) {
 	ctx := context.Background()
 	swarms := makeSwarms(ctx, t, 5)
@@ -98,7 +104,7 @@ func TestNotifications(t *testing.T) {
 		case <-time.After(timeout):
 			t.Fatal("timeout")
 		}
-		if s != s2 {
+		if !streamsSame(s, s2) {
 			t.Fatal("got incorrect stream", s.Conn(), s2.Conn())
 		}
 
@@ -108,7 +114,7 @@ func TestNotifications(t *testing.T) {
 		case <-time.After(timeout):
 			t.Fatal("timeout")
 		}
-		if s != s2 {
+		if !streamsSame(s, s2) {
 			t.Fatal("got incorrect stream", s.Conn(), s2.Conn())
 		}
 	}
diff --git a/p2p/net/swarm/swarm_stream.go b/p2p/net/swarm/swarm_stream.go
index 7965d2743984d85d34e2e8c3ae61dcf897529d41..b305bf917e95a455c6b135f6d24c96ca5921094f 100644
--- a/p2p/net/swarm/swarm_stream.go
+++ b/p2p/net/swarm/swarm_stream.go
@@ -1,18 +1,21 @@
 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"
 )
 
 // a Stream is a wrapper around a ps.Stream that exposes a way to get
 // our Conn and Swarm (instead of just the ps.Conn and ps.Swarm)
-type Stream ps.Stream
+type Stream struct {
+	stream   *ps.Stream
+	protocol string
+}
 
 // Stream returns the underlying peerstream.Stream
 func (s *Stream) Stream() *ps.Stream {
-	return (*ps.Stream)(s)
+	return s.stream
 }
 
 // Conn returns the Conn associated with this Stream, as an inet.Conn
@@ -22,27 +25,37 @@ func (s *Stream) Conn() inet.Conn {
 
 // SwarmConn returns the Conn associated with this Stream, as a *Conn
 func (s *Stream) SwarmConn() *Conn {
-	return (*Conn)(s.Stream().Conn())
+	return (*Conn)(s.stream.Conn())
 }
 
 // Read reads bytes from a stream.
 func (s *Stream) Read(p []byte) (n int, err error) {
-	return s.Stream().Read(p)
+	return s.stream.Read(p)
 }
 
 // Write writes bytes to a stream, flushing for each call.
 func (s *Stream) Write(p []byte) (n int, err error) {
-	return s.Stream().Write(p)
+	return s.stream.Write(p)
 }
 
 // Close closes the stream, indicating this side is finished
 // with the stream.
 func (s *Stream) Close() error {
-	return s.Stream().Close()
+	return s.stream.Close()
+}
+
+func (s *Stream) Protocol() string {
+	return s.protocol
+}
+
+func (s *Stream) SetProtocol(p string) {
+	s.protocol = p
 }
 
 func wrapStream(pss *ps.Stream) *Stream {
-	return (*Stream)(pss)
+	return &Stream{
+		stream: pss,
+	}
 }
 
 func wrapStreams(st []*ps.Stream) []*Stream {
diff --git a/p2p/net/swarm/swarm_test.go b/p2p/net/swarm/swarm_test.go
index a19688d90b1d80f14785a7891b35ebd6f5cc421e..c11377ed5e5ee28c2bdeb9bd666c3120155f80bf 100644
--- a/p2p/net/swarm/swarm_test.go
+++ b/p2p/net/swarm/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"
diff --git a/p2p/protocol/identify/id.go b/p2p/protocol/identify/id.go
index a8d59b48129bf30ff67581cb2cb2b0fd1b92627a..3c44f24a7ee81a8c6379e39e04df80b03459fa56 100644
--- a/p2p/protocol/identify/id.go
+++ b/p2p/protocol/identify/id.go
@@ -7,11 +7,11 @@ import (
 	semver "github.com/coreos/go-semver/semver"
 	ggio "github.com/gogo/protobuf/io"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
-	host "github.com/ipfs/go-libp2p/p2p/host"
-	mstream "github.com/ipfs/go-libp2p/p2p/metrics/stream"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	pb "github.com/ipfs/go-libp2p/p2p/protocol/identify/pb"
 	ma "github.com/jbenet/go-multiaddr"
+	host "github.com/libp2p/go-libp2p/p2p/host"
+	mstream "github.com/libp2p/go-libp2p/p2p/metrics/stream"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	pb "github.com/libp2p/go-libp2p/p2p/protocol/identify/pb"
 	msmux "github.com/whyrusleeping/go-multistream"
 	context "golang.org/x/net/context"
 
diff --git a/p2p/protocol/identify/id_test.go b/p2p/protocol/identify/id_test.go
index cd53a206d90ea3768a3c465d1ba11ab0f830e600..d0c147c496b5a43b780a13a1c56e1b327d614b01 100644
--- a/p2p/protocol/identify/id_test.go
+++ b/p2p/protocol/identify/id_test.go
@@ -5,9 +5,9 @@ import (
 	"time"
 
 	peer "github.com/ipfs/go-libp2p-peer"
-	host "github.com/ipfs/go-libp2p/p2p/host"
-	identify "github.com/ipfs/go-libp2p/p2p/protocol/identify"
-	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
+	host "github.com/libp2p/go-libp2p/p2p/host"
+	identify "github.com/libp2p/go-libp2p/p2p/protocol/identify"
+	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
 
 	ma "github.com/jbenet/go-multiaddr"
 	context "golang.org/x/net/context"
diff --git a/p2p/protocol/ping/ping.go b/p2p/protocol/ping/ping.go
index f1d1758c5cb757f010c958742e9677027cac567e..e16ff6686e7de78c5403d2873fec359673b9b6e5 100644
--- a/p2p/protocol/ping/ping.go
+++ b/p2p/protocol/ping/ping.go
@@ -8,9 +8,9 @@ import (
 
 	u "github.com/ipfs/go-ipfs-util"
 	peer "github.com/ipfs/go-libp2p-peer"
-	host "github.com/ipfs/go-libp2p/p2p/host"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
 	logging "github.com/ipfs/go-log"
+	host "github.com/libp2p/go-libp2p/p2p/host"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
 	context "golang.org/x/net/context"
 )
 
diff --git a/p2p/protocol/ping/ping_test.go b/p2p/protocol/ping/ping_test.go
index eae81337892438e880812a649753bc081a8cfa76..f0952d44f0f1cd7fc2433429b09a0d73340a3497 100644
--- a/p2p/protocol/ping/ping_test.go
+++ b/p2p/protocol/ping/ping_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	netutil "github.com/ipfs/go-libp2p/p2p/test/util"
+	netutil "github.com/libp2p/go-libp2p/p2p/test/util"
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
diff --git a/p2p/protocol/relay/relay.go b/p2p/protocol/relay/relay.go
index e2ad262bbca7073026597ba61e2c0f232fc3e21c..6fa3c52a552b3b1cd734c3de46c9d8269c1a3d75 100644
--- a/p2p/protocol/relay/relay.go
+++ b/p2p/protocol/relay/relay.go
@@ -6,15 +6,15 @@ import (
 	"time"
 
 	peer "github.com/ipfs/go-libp2p-peer"
-	host "github.com/ipfs/go-libp2p/p2p/host"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
 	logging "github.com/ipfs/go-log"
 	mh "github.com/jbenet/go-multihash"
+	host "github.com/libp2p/go-libp2p/p2p/host"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
 	context "golang.org/x/net/context"
 )
 
-var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/protocol/relay")
+var log = logging.Logger("github.com/libp2p/go-libp2p/p2p/protocol/relay")
 
 // ID is the protocol.ID of the Relay Service.
 const ID protocol.ID = "/ipfs/relay/line/0.1.0"
diff --git a/p2p/protocol/relay/relay_test.go b/p2p/protocol/relay/relay_test.go
index 57e69a661c7cb34000beb6abd439be0e235337c2..858b525776e6c671e0725cf413e08d64edd647a8 100644
--- a/p2p/protocol/relay/relay_test.go
+++ b/p2p/protocol/relay/relay_test.go
@@ -4,11 +4,11 @@ import (
 	"io"
 	"testing"
 
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
-	relay "github.com/ipfs/go-libp2p/p2p/protocol/relay"
-	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
 	logging "github.com/ipfs/go-log"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
+	relay "github.com/libp2p/go-libp2p/p2p/protocol/relay"
+	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
 	msmux "github.com/whyrusleeping/go-multistream"
 	context "golang.org/x/net/context"
 )
diff --git a/p2p/test/backpressure/backpressure_test.go b/p2p/test/backpressure/backpressure_test.go
index 1e32e30a01c93dc775b31024a00b48e3e6c7551f..859692753c2696920d3fa3ed3e5fa05708d0fddc 100644
--- a/p2p/test/backpressure/backpressure_test.go
+++ b/p2p/test/backpressure/backpressure_test.go
@@ -8,11 +8,11 @@ import (
 
 	u "github.com/ipfs/go-ipfs-util"
 	peer "github.com/ipfs/go-libp2p-peer"
-	host "github.com/ipfs/go-libp2p/p2p/host"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
-	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
 	logging "github.com/ipfs/go-log"
+	host "github.com/libp2p/go-libp2p/p2p/host"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
+	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
 	context "golang.org/x/net/context"
 )
 
diff --git a/p2p/test/reconnects/reconnect_test.go b/p2p/test/reconnects/reconnect_test.go
index 81c0d59702e0af1fc51b5d87a7edaec95608b135..49125a39740cf5d16669ed4f0470f662fbd6d243 100644
--- a/p2p/test/reconnects/reconnect_test.go
+++ b/p2p/test/reconnects/reconnect_test.go
@@ -8,13 +8,13 @@ import (
 	"time"
 
 	u "github.com/ipfs/go-ipfs-util"
-	host "github.com/ipfs/go-libp2p/p2p/host"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	swarm "github.com/ipfs/go-libp2p/p2p/net/swarm"
-	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
-	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
 	logging "github.com/ipfs/go-log"
 	ps "github.com/jbenet/go-peerstream"
+	host "github.com/libp2p/go-libp2p/p2p/host"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	swarm "github.com/libp2p/go-libp2p/p2p/net/swarm"
+	protocol "github.com/libp2p/go-libp2p/p2p/protocol"
+	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
 	context "golang.org/x/net/context"
 )
 
diff --git a/p2p/test/util/key.go b/p2p/test/util/key.go
index 2cbc436c2a95637f7023b7d3609fa8e466f2e882..71054f2317fe9ca5a56a0addcbed2c6c89f63207 100644
--- a/p2p/test/util/key.go
+++ b/p2p/test/util/key.go
@@ -8,8 +8,8 @@ import (
 	u "github.com/ipfs/go-ipfs-util"
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
-	testutil "github.com/ipfs/go-libp2p/testutil"
 	logging "github.com/ipfs/go-log"
+	testutil "github.com/libp2p/go-libp2p/testutil"
 
 	ma "github.com/jbenet/go-multiaddr"
 )
diff --git a/p2p/test/util/util.go b/p2p/test/util/util.go
index 52f028bda91a3135969101454ee1a4f095700398..d8f2aa74c94e9d6192f40671e31658bde71a3cc1 100644
--- a/p2p/test/util/util.go
+++ b/p2p/test/util/util.go
@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	pstore "github.com/ipfs/go-libp2p-peerstore"
-	bhost "github.com/ipfs/go-libp2p/p2p/host/basic"
-	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
-	inet "github.com/ipfs/go-libp2p/p2p/net"
-	swarm "github.com/ipfs/go-libp2p/p2p/net/swarm"
-	tu "github.com/ipfs/go-libp2p/testutil"
+	bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
+	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
+	inet "github.com/libp2p/go-libp2p/p2p/net"
+	swarm "github.com/libp2p/go-libp2p/p2p/net/swarm"
+	tu "github.com/libp2p/go-libp2p/testutil"
 
 	ma "github.com/jbenet/go-multiaddr"
 	context "golang.org/x/net/context"
diff --git a/package.json b/package.json
index e2ce569b5a76d1c6286e5017ccd1d1d86ea1b20b..ecc6a23daac66a1028764637f8c5ba97778cd49a 100644
--- a/package.json
+++ b/package.json
@@ -34,9 +34,9 @@
       "version": "1.0.0"
     },
     {
-      "hash": "Qmf91yhgRLo2dhhbc5zZ7TxjMaR1oxaWaoc9zRZdi1kU4a",
+      "hash": "QmXAWgboitGTKjCqHjVNKMAU13hV5LjYMui8n3UAGPBDLp",
       "name": "go-multistream",
-      "version": "0.0.0"
+      "version": "0.2.0"
     },
     {
       "hash": "QmNLvkCDV6ZjUJsEwGNporYBuZdhWT6q7TBVYQwwRv12HT",
@@ -171,9 +171,9 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmVcmcQE9eX4HQ8QwhVXpoHt3ennG7d299NDYFq9D1Uqa1",
+      "hash": "QmcK5em8AHkQf72b4JPyDdyuKkCc7xADTEN7w26CJh4uQN",
       "name": "go-smux-multistream",
-      "version": "1.0.0"
+      "version": "1.2.0"
     },
     {
       "author": "whyrusleeping",
diff --git a/testutil/ci/ci.go b/testutil/ci/ci.go
index d3f69d0f4782939e540e7b700f308d01b404661c..6539c0300542399fe843fdc569b2167b1c20e13b 100644
--- a/testutil/ci/ci.go
+++ b/testutil/ci/ci.go
@@ -6,8 +6,8 @@ package ci
 import (
 	"os"
 
-	jenkins "github.com/ipfs/go-libp2p/testutil/ci/jenkins"
-	travis "github.com/ipfs/go-libp2p/testutil/ci/travis"
+	jenkins "github.com/libp2p/go-libp2p/testutil/ci/jenkins"
+	travis "github.com/libp2p/go-libp2p/testutil/ci/travis"
 )
 
 // EnvVar is a type to use travis-only env var names with