diff --git a/.gx/lastpubver b/.gx/lastpubver
index e41d60d9c9eb816cfc1abca0846c88b9873d4c4b..fe8f121643b02743dfc15c959b002dccef43027a 100644
--- a/.gx/lastpubver
+++ b/.gx/lastpubver
@@ -1 +1 @@
-1.6.8: QmULAo6HNy44a42EFu4XAYGijM8LXoKu44FKxWvCgTJvhG
+1.6.9: QmaFqAnaS7FrvKL6XVyRAcRdagP5PS3t2F9uXjxoMUSzxt
diff --git a/dial_sync.go b/dial_sync.go
index d22acb69f840587bf0ddc00c6b662dc55e56d022..69739e54ec9e281f8f2c48005f9d9f072497ea11 100644
--- a/dial_sync.go
+++ b/dial_sync.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 type DialFunc func(context.Context, peer.ID) (*Conn, error)
diff --git a/dial_sync_test.go b/dial_sync_test.go
index bb189d2f2f0da00416676524e4bd909a07da2b12..0d70e226afcbe1c6cdacd92f6fea4cb5ad0362e0 100644
--- a/dial_sync_test.go
+++ b/dial_sync_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 func getMockDialFunc() (DialFunc, func(), context.Context, <-chan struct{}) {
diff --git a/dial_test.go b/dial_test.go
index 84df14026311071d18a0a8875e6fd07efdb326c2..dabb0bdb00e0cc623f96bda7f5724abaf51e2fcf 100644
--- a/dial_test.go
+++ b/dial_test.go
@@ -7,13 +7,13 @@ import (
 	"testing"
 	"time"
 
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	manet "gx/ipfs/QmVCNGTyD4EkvNYaAp253uMQ9Rjsjy2oGMvcdJJUoVRfja/go-multiaddr-net"
-	addrutil "gx/ipfs/Qmb86KiitngVm5AGQ18viwCBwwcTvULAtz3X74YWKAevnc/go-addr-util"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
-	testutil "gx/ipfs/QmbN6CcaGuVSWwhYq5nDQs98hWHgu5PTBgVjnGV28YeGRk/go-testutil"
-	ci "gx/ipfs/QmbN6CcaGuVSWwhYq5nDQs98hWHgu5PTBgVjnGV28YeGRk/go-testutil/ci"
-	pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore"
+	addrutil "github.com/libp2p/go-addr-util"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	testutil "github.com/libp2p/go-testutil"
+	ci "github.com/libp2p/go-testutil/ci"
+	ma "github.com/multiformats/go-multiaddr"
+	manet "github.com/multiformats/go-multiaddr-net"
 )
 
 func closeSwarms(swarms []*Swarm) {
diff --git a/limiter.go b/limiter.go
index db29b874d3814c1177802ebfd4724c8c3aed1c3a..67c6af4ddfc4f37df0d8e6fea23c39f879707f24 100644
--- a/limiter.go
+++ b/limiter.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"sync"
 
-	iconn "gx/ipfs/QmNmKcQiJB5cUTXXXS1o44s4PdeYevmH8aHhQJCGYjwBj3/go-libp2p-interface-conn"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	addrutil "gx/ipfs/Qmb86KiitngVm5AGQ18viwCBwwcTvULAtz3X74YWKAevnc/go-addr-util"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	addrutil "github.com/libp2p/go-addr-util"
+	iconn "github.com/libp2p/go-libp2p-interface-conn"
+	peer "github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 type dialResult struct {
diff --git a/limiter_test.go b/limiter_test.go
index 948e7f1513734179366db333ae361a96f0ff792f..cbb6afdbc6c40bf990773224a9ac480e2415138c 100644
--- a/limiter_test.go
+++ b/limiter_test.go
@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
-	iconn "gx/ipfs/QmNmKcQiJB5cUTXXXS1o44s4PdeYevmH8aHhQJCGYjwBj3/go-libp2p-interface-conn"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	mafmt "gx/ipfs/QmYjJnSTfXWhYL2cV1xFphPqjqowJqH7ZKLA1As8QrPHbn/mafmt"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	iconn "github.com/libp2p/go-libp2p-interface-conn"
+	peer "github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
+	mafmt "github.com/whyrusleeping/mafmt"
 )
 
 func mustAddr(t *testing.T, s string) ma.Multiaddr {
diff --git a/package.json b/package.json
index c23a5607334f90d9a1b19f48a696b8b502ea35e5..5485ecfe9f4d78fd50c2674a5aa48433c02e3970 100644
--- a/package.json
+++ b/package.json
@@ -9,19 +9,19 @@
   "gxDependencies": [
     {
       "author": "whyrusleeping",
-      "hash": "QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR",
+      "hash": "Qmcu7ebuPAPnCqJy29WJrpEFQaFWpW2krmrPtYqbQ2BPti",
       "name": "go-libp2p-net",
       "version": "1.6.1"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmTuX6VtWTbWgPwd5PMXHyp411RKsW5nBqLKVVRfJMNneb",
+      "hash": "QmNiCwBNA8MWDADTFVq1BonUEJbS2SvjAoNkZZrhEwcuUi",
       "name": "go-libp2p-crypto",
       "version": "1.3.1"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf",
+      "hash": "QmQMQ2RUjnaEEX8ybmrhuFFGhAwPjyL1Eo6ZoJGD7aAccM",
       "name": "go-libp2p-peerstore",
       "version": "1.4.0"
     },
@@ -75,19 +75,19 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm",
+      "hash": "QmS8W8Jyk63qtvqhdZzSi7GvaTZ2SnZ31gkKyGYU6kRa6Z",
       "name": "go-libp2p-metrics",
       "version": "1.6.1"
     },
     {
       "author": "whyrusleeping",
-      "hash": "Qmf8Br5gq5XgMrSA6Y6dzY3kaBWwJu6aqXJxxuxCCKsbyD",
+      "hash": "QmX11nfjBjzgHSWPxeyzbRzbhxKpvrtsfRWPGtjCR6toJb",
       "name": "go-libp2p-conn",
       "version": "1.5.6"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmXJfmGL3GycHcuqft7vvhf6Xhzad6nuTiEnoEWwAv3zcd",
+      "hash": "QmUE7L9KeQswGjZi1vgyFMEyXWgZeo6HWiyNzMxzeNM4o1",
       "name": "go-tcp-transport",
       "version": "1.1.0"
     }
@@ -97,6 +97,6 @@
   "license": "",
   "name": "go-libp2p-swarm",
   "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
-  "version": "1.6.8"
+  "version": "1.6.9"
 }
 
diff --git a/peers_test.go b/peers_test.go
index 28d6d14cdf11b9cbbb8680ad3381cda80710707c..3259264ae82fce2584bf41a135f1b360be626376 100644
--- a/peers_test.go
+++ b/peers_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"context"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
-	pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func TestPeers(t *testing.T) {
diff --git a/simul_test.go b/simul_test.go
index c6d1195b5d661168050d3a45c8627df0da7c14d2..8935773296a26518af8230f8c33386b4366d3bf9 100644
--- a/simul_test.go
+++ b/simul_test.go
@@ -7,10 +7,10 @@ import (
 	"testing"
 	"time"
 
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
-	ci "gx/ipfs/QmbN6CcaGuVSWwhYq5nDQs98hWHgu5PTBgVjnGV28YeGRk/go-testutil/ci"
-	pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	ci "github.com/libp2p/go-testutil/ci"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func TestSimultOpen(t *testing.T) {
diff --git a/swarm.go b/swarm.go
index 90ec06737218f7cdccf67f7f83ec4d9145b11241..6eba8f819bc5f3157e163d141314b3e67801eeff 100644
--- a/swarm.go
+++ b/swarm.go
@@ -11,29 +11,29 @@ import (
 	"sync"
 	"time"
 
-	metrics "gx/ipfs/QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm/go-libp2p-metrics"
-	mconn "gx/ipfs/QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm/go-libp2p-metrics/conn"
-	transport "gx/ipfs/QmR4YrM1DdvYmox249o8aday8oiotkcsT1Qzv42ujPEQDb/go-libp2p-transport"
-	psmss "gx/ipfs/QmRVYfZ7tWNHPBzWiG6KWGzvT2hcGems8srihsQE29x1U5/go-smux-multistream"
-	"gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
-	goprocessctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
-	mafilter "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
-	ps "gx/ipfs/QmSxPTJ2Jb3nekq3AGMgDyXZR3dhPrSPVSggT3FqJWw4Sa/go-peerstream"
-	inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net"
-	ci "gx/ipfs/QmTuX6VtWTbWgPwd5PMXHyp411RKsW5nBqLKVVRfJMNneb/go-libp2p-crypto"
-	filter "gx/ipfs/QmUuCcuet4eneEzto6PxvoC1MrHcxszy7MALrWSKH9inLy/go-maddr-filter"
-	ipnet "gx/ipfs/QmWNwP8oYzPUK6LqYEH1hoTMuVmQUUbhKQgHeT1AENGkEm/go-libp2p-interface-pnet"
-	spdy "gx/ipfs/QmWUNsat6Jb19nC5CiJCDXepTkxjdxi3eZqeoB6mrmmaGu/go-smux-spdystream"
-	tcpt "gx/ipfs/QmXJfmGL3GycHcuqft7vvhf6Xhzad6nuTiEnoEWwAv3zcd/go-tcp-transport"
-	addrutil "gx/ipfs/Qmb86KiitngVm5AGQ18viwCBwwcTvULAtz3X74YWKAevnc/go-addr-util"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
-	yamux "gx/ipfs/Qmbn7RYyWzBVXiUp9jZ1dA4VADHy9DtS7iZLwfhEUQvm3U/go-smux-yamux"
-	ws "gx/ipfs/QmeHbitozRtLYuPrtpcAoJFJixZzTctPtkSsBQGSQuz8pG/ws-transport"
-	pst "gx/ipfs/QmeZBgYBHvxMukGK5ojg28BCNLB9SeXqT7XXg6o7r2GbJy/go-stream-muxer"
-	pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore"
-	conn "gx/ipfs/Qmf8Br5gq5XgMrSA6Y6dzY3kaBWwJu6aqXJxxuxCCKsbyD/go-libp2p-conn"
+	logging "github.com/ipfs/go-log"
+	pst "github.com/jbenet/go-stream-muxer"
+	"github.com/jbenet/goprocess"
+	goprocessctx "github.com/jbenet/goprocess/context"
+	addrutil "github.com/libp2p/go-addr-util"
+	conn "github.com/libp2p/go-libp2p-conn"
+	ci "github.com/libp2p/go-libp2p-crypto"
+	ipnet "github.com/libp2p/go-libp2p-interface-pnet"
+	metrics "github.com/libp2p/go-libp2p-metrics"
+	mconn "github.com/libp2p/go-libp2p-metrics/conn"
+	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	transport "github.com/libp2p/go-libp2p-transport"
+	filter "github.com/libp2p/go-maddr-filter"
+	ps "github.com/libp2p/go-peerstream"
+	tcpt "github.com/libp2p/go-tcp-transport"
+	ma "github.com/multiformats/go-multiaddr"
+	psmss "github.com/whyrusleeping/go-smux-multistream"
+	spdy "github.com/whyrusleeping/go-smux-spdystream"
+	yamux "github.com/whyrusleeping/go-smux-yamux"
+	mafilter "github.com/whyrusleeping/multiaddr-filter"
+	ws "github.com/whyrusleeping/ws-transport"
 )
 
 var log = logging.Logger("swarm2")
diff --git a/swarm_addr.go b/swarm_addr.go
index 518138f874a162dc5a337716c8ef05e1aa43c39f..78a3f5351a10697ea241f0f498bf05d3d1d17aa5 100644
--- a/swarm_addr.go
+++ b/swarm_addr.go
@@ -1,9 +1,9 @@
 package swarm
 
 import (
-	iconn "gx/ipfs/QmNmKcQiJB5cUTXXXS1o44s4PdeYevmH8aHhQJCGYjwBj3/go-libp2p-interface-conn"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	addrutil "gx/ipfs/Qmb86KiitngVm5AGQ18viwCBwwcTvULAtz3X74YWKAevnc/go-addr-util"
+	addrutil "github.com/libp2p/go-addr-util"
+	iconn "github.com/libp2p/go-libp2p-interface-conn"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // ListenAddresses returns a list of addresses at which this swarm listens.
diff --git a/swarm_addr_test.go b/swarm_addr_test.go
index e9db3697dfe9c3f00d6ad370970ca913df9c1dfe..011b706d813c804922d7cd0775dba8195e7caa0b 100644
--- a/swarm_addr_test.go
+++ b/swarm_addr_test.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"testing"
 
-	metrics "gx/ipfs/QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm/go-libp2p-metrics"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	addrutil "gx/ipfs/Qmb86KiitngVm5AGQ18viwCBwwcTvULAtz3X74YWKAevnc/go-addr-util"
-	testutil "gx/ipfs/QmbN6CcaGuVSWwhYq5nDQs98hWHgu5PTBgVjnGV28YeGRk/go-testutil"
-	pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore"
+	addrutil "github.com/libp2p/go-addr-util"
+	metrics "github.com/libp2p/go-libp2p-metrics"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	testutil "github.com/libp2p/go-testutil"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func TestFilterAddrs(t *testing.T) {
diff --git a/swarm_conn.go b/swarm_conn.go
index f40dbdb5be7e98d3101a2383466275a14fd386d1..0b0c626cea5817f4e0051e9260b0bd0d54dd36ab 100644
--- a/swarm_conn.go
+++ b/swarm_conn.go
@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	iconn "gx/ipfs/QmNmKcQiJB5cUTXXXS1o44s4PdeYevmH8aHhQJCGYjwBj3/go-libp2p-interface-conn"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	ps "gx/ipfs/QmSxPTJ2Jb3nekq3AGMgDyXZR3dhPrSPVSggT3FqJWw4Sa/go-peerstream"
-	inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net"
-	ic "gx/ipfs/QmTuX6VtWTbWgPwd5PMXHyp411RKsW5nBqLKVVRfJMNneb/go-libp2p-crypto"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	ic "github.com/libp2p/go-libp2p-crypto"
+	iconn "github.com/libp2p/go-libp2p-interface-conn"
+	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	ps "github.com/libp2p/go-peerstream"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // Conn is a simple wrapper around a ps.Conn that also exposes
diff --git a/swarm_dial.go b/swarm_dial.go
index 84da324a43ff77552a074e1da65794b8ee78115d..c7cfe911102cfd0399196f953ea3869c7ef36e8a 100644
--- a/swarm_dial.go
+++ b/swarm_dial.go
@@ -7,11 +7,11 @@ import (
 	"sync"
 	"time"
 
-	iconn "gx/ipfs/QmNmKcQiJB5cUTXXXS1o44s4PdeYevmH8aHhQJCGYjwBj3/go-libp2p-interface-conn"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	lgbl "gx/ipfs/Qma1v2AjS7d2ceYgye4wUVBFFSdB6UPp7jgL8kNtxvFzWu/go-libp2p-loggables"
-	addrutil "gx/ipfs/Qmb86KiitngVm5AGQ18viwCBwwcTvULAtz3X74YWKAevnc/go-addr-util"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	addrutil "github.com/libp2p/go-addr-util"
+	iconn "github.com/libp2p/go-libp2p-interface-conn"
+	lgbl "github.com/libp2p/go-libp2p-loggables"
+	peer "github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // Diagram of dial sync:
diff --git a/swarm_listen.go b/swarm_listen.go
index 128668bf54e88e3d6a2d695c387909e2fb168d54..b04c47f11a2558445bcd51d07efbdbdc4494145a 100644
--- a/swarm_listen.go
+++ b/swarm_listen.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"fmt"
 
-	iconn "gx/ipfs/QmNmKcQiJB5cUTXXXS1o44s4PdeYevmH8aHhQJCGYjwBj3/go-libp2p-interface-conn"
-	mconn "gx/ipfs/QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm/go-libp2p-metrics/conn"
-	transport "gx/ipfs/QmR4YrM1DdvYmox249o8aday8oiotkcsT1Qzv42ujPEQDb/go-libp2p-transport"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	ps "gx/ipfs/QmSxPTJ2Jb3nekq3AGMgDyXZR3dhPrSPVSggT3FqJWw4Sa/go-peerstream"
-	inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net"
-	lgbl "gx/ipfs/Qma1v2AjS7d2ceYgye4wUVBFFSdB6UPp7jgL8kNtxvFzWu/go-libp2p-loggables"
-	conn "gx/ipfs/Qmf8Br5gq5XgMrSA6Y6dzY3kaBWwJu6aqXJxxuxCCKsbyD/go-libp2p-conn"
+	conn "github.com/libp2p/go-libp2p-conn"
+	iconn "github.com/libp2p/go-libp2p-interface-conn"
+	lgbl "github.com/libp2p/go-libp2p-loggables"
+	mconn "github.com/libp2p/go-libp2p-metrics/conn"
+	inet "github.com/libp2p/go-libp2p-net"
+	transport "github.com/libp2p/go-libp2p-transport"
+	ps "github.com/libp2p/go-peerstream"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func (s *Swarm) AddListenAddr(a ma.Multiaddr) error {
diff --git a/swarm_net.go b/swarm_net.go
index 2b3ba020f6f6b41fe1164928a5716a54537c50f1..eb11ecb7dacffd5ccc972ff4aae26e8356276fa1 100644
--- a/swarm_net.go
+++ b/swarm_net.go
@@ -4,13 +4,13 @@ import (
 	"context"
 	"fmt"
 
-	metrics "gx/ipfs/QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm/go-libp2p-metrics"
-	"gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net"
-	ipnet "gx/ipfs/QmWNwP8oYzPUK6LqYEH1hoTMuVmQUUbhKQgHeT1AENGkEm/go-libp2p-interface-pnet"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
-	pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore"
+	"github.com/jbenet/goprocess"
+	ipnet "github.com/libp2p/go-libp2p-interface-pnet"
+	metrics "github.com/libp2p/go-libp2p-metrics"
+	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // Network implements the inet.Network interface.
diff --git a/swarm_net_test.go b/swarm_net_test.go
index 9130c8a08209ad23294180abff1e9d8c1e15c6dc..95bc268307943f7d494f692d248ff960b98339b7 100644
--- a/swarm_net_test.go
+++ b/swarm_net_test.go
@@ -6,10 +6,10 @@ import (
 	"testing"
 	"time"
 
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net"
-	tu "gx/ipfs/QmbN6CcaGuVSWwhYq5nDQs98hWHgu5PTBgVjnGV28YeGRk/go-testutil"
-	pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore"
+	inet "github.com/libp2p/go-libp2p-net"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	tu "github.com/libp2p/go-testutil"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func GenSwarmNetwork(t *testing.T, ctx context.Context) *Network {
diff --git a/swarm_notif_test.go b/swarm_notif_test.go
index 18eef7cd6116db30b8389f65e76b3a0a9ddee115..d9e9df62a59ba47b9445812814b378813c9e9054 100644
--- a/swarm_notif_test.go
+++ b/swarm_notif_test.go
@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"context"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
+	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func streamsSame(a, b inet.Stream) bool {
diff --git a/swarm_stream.go b/swarm_stream.go
index cf59b169cd517a2dbad2e2664c380ba697bcbc03..adadca78ec4af493af729ae8c7f4ba8488be9cb8 100644
--- a/swarm_stream.go
+++ b/swarm_stream.go
@@ -3,9 +3,9 @@ package swarm
 import (
 	"time"
 
-	ps "gx/ipfs/QmSxPTJ2Jb3nekq3AGMgDyXZR3dhPrSPVSggT3FqJWw4Sa/go-peerstream"
-	inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net"
-	protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
+	inet "github.com/libp2p/go-libp2p-net"
+	protocol "github.com/libp2p/go-libp2p-protocol"
+	ps "github.com/libp2p/go-peerstream"
 )
 
 // Stream is a wrapper around a ps.Stream that exposes a way to get
diff --git a/swarm_test.go b/swarm_test.go
index 0b5ab4bdbaa8beb11677181aff0324f7ff647bdf..9deb918f3cb2a329e990095cfced00674c12eb31 100644
--- a/swarm_test.go
+++ b/swarm_test.go
@@ -10,12 +10,12 @@ import (
 	"testing"
 	"time"
 
-	metrics "gx/ipfs/QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm/go-libp2p-metrics"
-	ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr"
-	inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net"
-	peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer"
-	testutil "gx/ipfs/QmbN6CcaGuVSWwhYq5nDQs98hWHgu5PTBgVjnGV28YeGRk/go-testutil"
-	pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore"
+	metrics "github.com/libp2p/go-libp2p-metrics"
+	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	testutil "github.com/libp2p/go-testutil"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func EchoStreamHandler(stream inet.Stream) {