diff --git a/examples/justtcp/main.go b/examples/justtcp/main.go
index 89e1d69b28fc15756610231cb8fa9a4607f631bd..571c0db57f78f331baa8a84a6577c24930620e59 100644
--- a/examples/justtcp/main.go
+++ b/examples/justtcp/main.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"os"
 
-	transport "github.com/ipfs/go-libp2p-transport"
 	ma "github.com/jbenet/go-multiaddr"
 	"github.com/libp2p/go-libp2p/p2p/net/swarm"
+	tcpt "github.com/libp2p/go-tcp-transport"
 )
 
 func fatal(i interface{}) {
@@ -25,7 +25,7 @@ func main() {
 	s := swarm.NewBlankSwarm(context.Background(), "bob", nil, nil)
 
 	// Add a TCP transport to it
-	s.AddTransport(transport.NewTCPTransport())
+	s.AddTransport(tcpt.NewTCPTransport())
 
 	// Add an address to start listening on
 	err = s.AddListenAddr(laddr)
diff --git a/p2p/metrics/conn/conn.go b/p2p/metrics/conn/conn.go
index 077ba8fa7ceb596ab0a653b3dcd9bacaf280c55f..f7e6ae293abcbd56c8367d997dcb955e5aa1b3d6 100644
--- a/p2p/metrics/conn/conn.go
+++ b/p2p/metrics/conn/conn.go
@@ -1,7 +1,7 @@
 package meterconn
 
 import (
-	transport "github.com/ipfs/go-libp2p-transport"
+	transport "github.com/libp2p/go-libp2p-transport"
 	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
 )
 
diff --git a/p2p/net/conn/dial.go b/p2p/net/conn/dial.go
index 60c38499068e2ee3248f953843fa70b0623fe4f0..b5fccecf7b0677c59036c8f3fa04296f442c4e48 100644
--- a/p2p/net/conn/dial.go
+++ b/p2p/net/conn/dial.go
@@ -9,9 +9,9 @@ import (
 	ci "github.com/ipfs/go-libp2p-crypto"
 	lgbl "github.com/ipfs/go-libp2p-loggables"
 	peer "github.com/ipfs/go-libp2p-peer"
-	transport "github.com/ipfs/go-libp2p-transport"
 	ma "github.com/jbenet/go-multiaddr"
 	manet "github.com/jbenet/go-multiaddr-net"
+	transport "github.com/libp2p/go-libp2p-transport"
 	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 2d73c6f24a584fde0d2dcbe4e17f8856f22f8579..4e6187b9d27ea9db2b752eb886ac9fea0851dc06 100644
--- a/p2p/net/conn/dial_test.go
+++ b/p2p/net/conn/dial_test.go
@@ -13,8 +13,9 @@ import (
 
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
-	transport "github.com/ipfs/go-libp2p-transport"
+	transport "github.com/libp2p/go-libp2p-transport"
 	tu "github.com/libp2p/go-libp2p/testutil"
+	tcpt "github.com/libp2p/go-tcp-transport"
 
 	ma "github.com/jbenet/go-multiaddr"
 	msmux "github.com/whyrusleeping/go-multistream"
@@ -63,7 +64,7 @@ func setupSingleConn(t *testing.T, ctx context.Context) (a, b Conn, p1, p2 tu.Pe
 }
 
 func Listen(ctx context.Context, addr ma.Multiaddr, local peer.ID, sk ic.PrivKey) (Listener, error) {
-	list, err := transport.NewTCPTransport().Listen(addr)
+	list, err := tcpt.NewTCPTransport().Listen(addr)
 	if err != nil {
 		return nil, err
 	}
@@ -72,7 +73,7 @@ func Listen(ctx context.Context, addr ma.Multiaddr, local peer.ID, sk ic.PrivKey
 }
 
 func dialer(t *testing.T, a ma.Multiaddr) transport.Dialer {
-	tpt := transport.NewTCPTransport()
+	tpt := tcpt.NewTCPTransport()
 	tptd, err := tpt.Dialer(a)
 	if err != nil {
 		t.Fatal(err)
diff --git a/p2p/net/conn/interface.go b/p2p/net/conn/interface.go
index e5d2b1925e5ae54cdb00a0049cb0ac39f05bf001..61cf623ed7c8ecfda078791fc84c7e71cf523c85 100644
--- a/p2p/net/conn/interface.go
+++ b/p2p/net/conn/interface.go
@@ -7,8 +7,8 @@ import (
 
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
-	transport "github.com/ipfs/go-libp2p-transport"
 	ma "github.com/jbenet/go-multiaddr"
+	transport "github.com/libp2p/go-libp2p-transport"
 	filter "github.com/libp2p/go-libp2p/p2p/net/filter"
 )
 
diff --git a/p2p/net/conn/listen.go b/p2p/net/conn/listen.go
index ffb883bb063ec51b993e0ace30c8ca9fccca37a2..8b940c76ea0c7e6fc9a7e22512f5f742faff391a 100644
--- a/p2p/net/conn/listen.go
+++ b/p2p/net/conn/listen.go
@@ -9,11 +9,11 @@ import (
 
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
-	transport "github.com/ipfs/go-libp2p-transport"
 	ma "github.com/jbenet/go-multiaddr"
 	tec "github.com/jbenet/go-temp-err-catcher"
 	"github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
+	transport "github.com/libp2p/go-libp2p-transport"
 	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/swarm/swarm.go b/p2p/net/swarm/swarm.go
index e36f763fb9ad66783bef2a0792312b61ec5524bf..4eebf626bea5f62145938900b1cca00036568fba 100644
--- a/p2p/net/swarm/swarm.go
+++ b/p2p/net/swarm/swarm.go
@@ -21,13 +21,14 @@ import (
 	ci "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
-	transport "github.com/ipfs/go-libp2p-transport"
 	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"
+	transport "github.com/libp2p/go-libp2p-transport"
+	tcpt "github.com/libp2p/go-tcp-transport"
 	psmss "github.com/whyrusleeping/go-smux-multistream"
 	spdy "github.com/whyrusleeping/go-smux-spdystream"
 	yamux "github.com/whyrusleeping/go-smux-yamux"
@@ -124,8 +125,7 @@ func NewSwarm(ctx context.Context, listenAddrs []ma.Multiaddr,
 		dialT:  DialTimeout,
 		notifs: make(map[inet.Notifiee]ps.Notifiee),
 		transports: []transport.Transport{
-			transport.NewTCPTransport(),
-			transport.NewUtpTransport(),
+			tcpt.NewTCPTransport(),
 			new(ws.WebsocketTransport),
 		},
 		bwc:         bwc,
diff --git a/p2p/net/swarm/swarm_listen.go b/p2p/net/swarm/swarm_listen.go
index 4eb61d5a415c5cbd036f3660f8469fc47b64476e..92ccd833af1b26cc1b24974b93f578df407d3496 100644
--- a/p2p/net/swarm/swarm_listen.go
+++ b/p2p/net/swarm/swarm_listen.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	lgbl "github.com/ipfs/go-libp2p-loggables"
-	transport "github.com/ipfs/go-libp2p-transport"
 	ma "github.com/jbenet/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
+	transport "github.com/libp2p/go-libp2p-transport"
 	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"
diff --git a/package.json b/package.json
index 40571d32f16d3513a3192efbc139f158cc2dafe4..8f751045a2500c7a09f96c64979fd5b583cae882 100644
--- a/package.json
+++ b/package.json
@@ -59,9 +59,9 @@
       "version": "1.2.0"
     },
     {
-      "hash": "QmPpRcbNUXauP3zWZ1NJMLWpe4QnmEHrd2ba2D3yqWznw7",
+      "hash": "QmY83KqqnQ286ZWbV2x7ixpeemH3cBpk8R54egS619WYff",
       "name": "go-multiaddr-net",
-      "version": "1.2.0"
+      "version": "1.3.0"
     },
     {
       "hash": "QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku",
@@ -152,12 +152,6 @@
       "name": "go-libp2p-secio",
       "version": "1.0.12"
     },
-    {
-      "author": "whyrusleeping",
-      "hash": "Qmazcq5ZXnyP5smvUquM8dAro6ZAppExxyV7Z3URq3dzin",
-      "name": "go-libp2p-transport",
-      "version": "1.6.1"
-    },
     {
       "author": "whyrusleeping",
       "hash": "QmSHTSkxXGQgaHWz91oZV3CDy3hmKmDgpjbYRT6niACG4E",
@@ -178,15 +172,27 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmdMfSLMDBDYhtc4oF3NYGCZr5dy4wQb6Ji26N4D4mdxa2",
+      "hash": "QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD",
       "name": "go-libp2p-peerstore",
-      "version": "1.2.4"
+      "version": "1.2.5"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmWEQk3Ak32B2nAVjAnXzAsfXGHCyjvrHB9vroooWhEr8j",
+      "hash": "QmTLFDe35H4xtdgq4CG5d8eScDPY1geC2DuFrNvD6yecKS",
       "name": "ws-transport",
-      "version": "1.2.2"
+      "version": "1.2.4"
+    },
+    {
+      "author": "whyrusleeping",
+      "hash": "QmekekLwe4KGWtaeVHr8AfRht25RgdGzLunnQF2gHVi62E",
+      "name": "go-libp2p-transport",
+      "version": "2.1.1"
+    },
+    {
+      "author": "whyrusleeping",
+      "hash": "QmYfn7ogbWiLRsLrUTZ4VXjQmenknmbR9ZFDUZqBVsyaf2",
+      "name": "go-tcp-transport",
+      "version": "1.0.0"
     }
   ],
   "gxVersion": "0.4.0",