diff --git a/crypto/internal/pb/crypto.pb.go b/crypto/internal/pb/crypto.pb.go
index 0bd3bc26f..be4be2051 100644
--- a/crypto/internal/pb/crypto.pb.go
+++ b/crypto/internal/pb/crypto.pb.go
@@ -14,7 +14,7 @@ It has these top-level messages:
 */
 package crypto_pb
 
-import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/crypto/key.go b/crypto/key.go
index 78c50dce1..7f0a13aba 100644
--- a/crypto/key.go
+++ b/crypto/key.go
@@ -19,10 +19,10 @@ import (
 	"crypto/sha512"
 	"hash"
 
-	proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+	proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 
-	pb "github.com/jbenet/go-ipfs/p2p/crypto/internal/pb"
-	u "github.com/jbenet/go-ipfs/util"
+	pb "github.com/ipfs/go-ipfs/p2p/crypto/internal/pb"
+	u "github.com/ipfs/go-ipfs/util"
 )
 
 var log = u.Logger("crypto")
diff --git a/crypto/key_test.go b/crypto/key_test.go
index f4a9599f8..fb83f77f6 100644
--- a/crypto/key_test.go
+++ b/crypto/key_test.go
@@ -1,10 +1,10 @@
 package crypto_test
 
 import (
-	. "github.com/jbenet/go-ipfs/p2p/crypto"
+	. "github.com/ipfs/go-ipfs/p2p/crypto"
 
 	"bytes"
-	tu "github.com/jbenet/go-ipfs/util/testutil"
+	tu "github.com/ipfs/go-ipfs/util/testutil"
 	"testing"
 )
 
diff --git a/crypto/rsa.go b/crypto/rsa.go
index b308f6856..988e63941 100644
--- a/crypto/rsa.go
+++ b/crypto/rsa.go
@@ -8,9 +8,9 @@ import (
 	"crypto/x509"
 	"errors"
 
-	proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+	proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 
-	pb "github.com/jbenet/go-ipfs/p2p/crypto/internal/pb"
+	pb "github.com/ipfs/go-ipfs/p2p/crypto/internal/pb"
 )
 
 type RsaPrivateKey struct {
diff --git a/crypto/secio/al.go b/crypto/secio/al.go
index affb8ac8c..9a0cadf65 100644
--- a/crypto/secio/al.go
+++ b/crypto/secio/al.go
@@ -13,8 +13,8 @@ import (
 	"crypto/sha512"
 	"hash"
 
-	bfish "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/crypto/blowfish"
-	ci "github.com/jbenet/go-ipfs/p2p/crypto"
+	bfish "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/crypto/blowfish"
+	ci "github.com/ipfs/go-ipfs/p2p/crypto"
 )
 
 // List of supported ECDH curves
diff --git a/crypto/secio/interface.go b/crypto/secio/interface.go
index 612a32fc9..0167e612a 100644
--- a/crypto/secio/interface.go
+++ b/crypto/secio/interface.go
@@ -4,11 +4,11 @@ package secio
 import (
 	"io"
 
-	ci "github.com/jbenet/go-ipfs/p2p/crypto"
+	ci "github.com/ipfs/go-ipfs/p2p/crypto"
 
-	msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 )
 
 // SessionGenerator constructs secure communication sessions for a peer.
diff --git a/crypto/secio/internal/pb/spipe.pb.go b/crypto/secio/internal/pb/spipe.pb.go
index 68fb83f11..1e92e9d99 100644
--- a/crypto/secio/internal/pb/spipe.pb.go
+++ b/crypto/secio/internal/pb/spipe.pb.go
@@ -14,7 +14,7 @@ It has these top-level messages:
 */
 package spipe_pb
 
-import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 import json "encoding/json"
 import math "math"
 
diff --git a/crypto/secio/protocol.go b/crypto/secio/protocol.go
index f06e2c239..a8d9a9203 100644
--- a/crypto/secio/protocol.go
+++ b/crypto/secio/protocol.go
@@ -7,13 +7,13 @@ import (
 	"fmt"
 	"io"
 
-	msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	ci "github.com/jbenet/go-ipfs/p2p/crypto"
-	pb "github.com/jbenet/go-ipfs/p2p/crypto/secio/internal/pb"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-	u "github.com/jbenet/go-ipfs/util"
+	msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ci "github.com/ipfs/go-ipfs/p2p/crypto"
+	pb "github.com/ipfs/go-ipfs/p2p/crypto/secio/internal/pb"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+	u "github.com/ipfs/go-ipfs/util"
 )
 
 var log = eventlog.Logger("secio")
diff --git a/crypto/secio/rw.go b/crypto/secio/rw.go
index b9a271983..e003c2278 100644
--- a/crypto/secio/rw.go
+++ b/crypto/secio/rw.go
@@ -9,10 +9,10 @@ import (
 
 	"crypto/hmac"
 
-	proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
-	msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
-	mpool "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio/mpool"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+	msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
+	mpool "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio/mpool"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 // ErrMACInvalid signals that a MAC verification failed
diff --git a/host/basic/basic_host.go b/host/basic/basic_host.go
index 3a1453101..90c8ea091 100644
--- a/host/basic/basic_host.go
+++ b/host/basic/basic_host.go
@@ -1,16 +1,16 @@
 package basichost
 
 import (
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	goprocess "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	identify "github.com/jbenet/go-ipfs/p2p/protocol/identify"
-	relay "github.com/jbenet/go-ipfs/p2p/protocol/relay"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	goprocess "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	identify "github.com/ipfs/go-ipfs/p2p/protocol/identify"
+	relay "github.com/ipfs/go-ipfs/p2p/protocol/relay"
 )
 
 var log = eventlog.Logger("p2p/host/basic")
diff --git a/host/basic/basic_host_test.go b/host/basic/basic_host_test.go
index cf24ece51..bb4408d6f 100644
--- a/host/basic/basic_host_test.go
+++ b/host/basic/basic_host_test.go
@@ -5,11 +5,11 @@ import (
 	"io"
 	"testing"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	testutil "github.com/jbenet/go-ipfs/p2p/test/util"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func TestHostSimple(t *testing.T) {
diff --git a/host/basic/natmgr.go b/host/basic/natmgr.go
index 35cc162fa..334d8b5c4 100644
--- a/host/basic/natmgr.go
+++ b/host/basic/natmgr.go
@@ -3,13 +3,13 @@ package basichost
 import (
 	"sync"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	goprocess "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	goprocess "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 
-	inat "github.com/jbenet/go-ipfs/p2p/nat"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
+	inat "github.com/ipfs/go-ipfs/p2p/nat"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
 )
 
 // natManager takes care of adding + removing port mappings to the nat.
diff --git a/host/host.go b/host/host.go
index caa45f54f..4abee89d1 100644
--- a/host/host.go
+++ b/host/host.go
@@ -1,12 +1,12 @@
 package host
 
 import (
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 )
 
 var log = eventlog.Logger("p2p/host")
diff --git a/host/routed/routed.go b/host/routed/routed.go
index 4ceec6bcd..7f18f742c 100644
--- a/host/routed/routed.go
+++ b/host/routed/routed.go
@@ -4,16 +4,16 @@ import (
 	"fmt"
 	"time"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
-
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	routing "github.com/jbenet/go-ipfs/routing"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+	lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
+
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	routing "github.com/ipfs/go-ipfs/routing"
 )
 
 var log = eventlog.Logger("p2p/host/routed")
diff --git a/nat/nat.go b/nat/nat.go
index 4ef9802c1..47a23f712 100644
--- a/nat/nat.go
+++ b/nat/nat.go
@@ -8,14 +8,14 @@ import (
 	"sync"
 	"time"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
-
-	nat "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/fd/go-nat"
-	goprocess "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
-	periodic "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/periodic"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-	notifier "github.com/jbenet/go-ipfs/thirdparty/notifier"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
+
+	nat "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/fd/go-nat"
+	goprocess "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
+	periodic "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/periodic"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+	notifier "github.com/ipfs/go-ipfs/thirdparty/notifier"
 )
 
 var (
@@ -80,7 +80,7 @@ func (nat *NAT) Process() goprocess.Process {
 }
 
 // Notifier is an object that assists NAT in notifying listeners.
-// It is implemented using github.com/jbenet/go-ipfs/thirdparty/notifier
+// It is implemented using github.com/ipfs/go-ipfs/thirdparty/notifier
 type Notifier struct {
 	n notifier.Notifier
 }
diff --git a/net/conn/conn.go b/net/conn/conn.go
index 81c4c7350..9a5696df7 100644
--- a/net/conn/conn.go
+++ b/net/conn/conn.go
@@ -6,16 +6,16 @@ import (
 	"net"
 	"time"
 
-	msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
-	mpool "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio/mpool"
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-	u "github.com/jbenet/go-ipfs/util"
-	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
+	msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
+	mpool "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio/mpool"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+	u "github.com/ipfs/go-ipfs/util"
+	lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
 )
 
 var log = eventlog.Logger("conn")
diff --git a/net/conn/conn_test.go b/net/conn/conn_test.go
index 145654da3..03e09d869 100644
--- a/net/conn/conn_test.go
+++ b/net/conn/conn_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	travis "github.com/ipfs/go-ipfs/util/testutil/ci/travis"
 )
 
 func testOneSendRecv(t *testing.T, c1, c2 Conn) {
diff --git a/net/conn/dial.go b/net/conn/dial.go
index 03fe15383..d4a1ca02a 100644
--- a/net/conn/dial.go
+++ b/net/conn/dial.go
@@ -7,15 +7,15 @@ import (
 	"strings"
 	"syscall"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
-	reuseport "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
-
-	addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	debugerror "github.com/jbenet/go-ipfs/util/debugerror"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
+	reuseport "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
+
+	addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	debugerror "github.com/ipfs/go-ipfs/util/debugerror"
 )
 
 // String returns the string rep of d.
diff --git a/net/conn/dial_test.go b/net/conn/dial_test.go
index 37c3689b6..585e51780 100644
--- a/net/conn/dial_test.go
+++ b/net/conn/dial_test.go
@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
-	tu "github.com/jbenet/go-ipfs/util/testutil"
+	tu "github.com/ipfs/go-ipfs/util/testutil"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func echoListen(ctx context.Context, listener Listener) {
diff --git a/net/conn/interface.go b/net/conn/interface.go
index 749d7d38b..175505329 100644
--- a/net/conn/interface.go
+++ b/net/conn/interface.go
@@ -5,13 +5,13 @@ import (
 	"net"
 	"time"
 
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	u "github.com/jbenet/go-ipfs/util"
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	u "github.com/ipfs/go-ipfs/util"
 
-	msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
+	msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
 )
 
 // Map maps Keys (Peer.IDs) to Connections.
diff --git a/net/conn/listen.go b/net/conn/listen.go
index f11287fed..c32e77763 100644
--- a/net/conn/listen.go
+++ b/net/conn/listen.go
@@ -5,15 +5,15 @@ import (
 	"io"
 	"net"
 
-	ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
-	reuseport "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport"
-	tec "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-temp-err-catcher"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	ctxgroup "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
+	reuseport "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport"
+	tec "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-temp-err-catcher"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 )
 
 // listener is an object that can accept connections. It implements Listener
diff --git a/net/conn/secure_conn.go b/net/conn/secure_conn.go
index 76b6eb5e8..b79c3e054 100644
--- a/net/conn/secure_conn.go
+++ b/net/conn/secure_conn.go
@@ -4,14 +4,14 @@ import (
 	"net"
 	"time"
 
-	msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	secio "github.com/jbenet/go-ipfs/p2p/crypto/secio"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	errors "github.com/jbenet/go-ipfs/util/debugerror"
+	msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	secio "github.com/ipfs/go-ipfs/p2p/crypto/secio"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	errors "github.com/ipfs/go-ipfs/util/debugerror"
 )
 
 // secureConn wraps another Conn object with an encrypted channel.
diff --git a/net/conn/secure_conn_test.go b/net/conn/secure_conn_test.go
index 83374ec1f..79b7da572 100644
--- a/net/conn/secure_conn_test.go
+++ b/net/conn/secure_conn_test.go
@@ -7,10 +7,10 @@ import (
 	"testing"
 	"time"
 
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis"
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	travis "github.com/ipfs/go-ipfs/util/testutil/ci/travis"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func upgradeToSecureConn(t *testing.T, ctx context.Context, sk ic.PrivKey, c Conn) (Conn, error) {
diff --git a/net/interface.go b/net/interface.go
index 8dda7fbb7..752293f91 100644
--- a/net/interface.go
+++ b/net/interface.go
@@ -3,12 +3,12 @@ package net
 import (
 	"io"
 
-	conn "github.com/jbenet/go-ipfs/p2p/net/conn"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	conn "github.com/ipfs/go-ipfs/p2p/net/conn"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 
-	ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ctxgroup "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 // MessageSizeMax is a soft (recommended) maximum for network messages.
diff --git a/net/mock/interface.go b/net/mock/interface.go
index fac6dd747..9887269b6 100644
--- a/net/mock/interface.go
+++ b/net/mock/interface.go
@@ -10,12 +10,12 @@ import (
 	"io"
 	"time"
 
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 type Mocknet interface {
diff --git a/net/mock/mock.go b/net/mock/mock.go
index c6c161ff0..89447d3f3 100644
--- a/net/mock/mock.go
+++ b/net/mock/mock.go
@@ -1,9 +1,9 @@
 package mocknet
 
 import (
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 var log = eventlog.Logger("mocknet")
diff --git a/net/mock/mock_conn.go b/net/mock/mock_conn.go
index 23a4ead62..e61a8b4e1 100644
--- a/net/mock/mock_conn.go
+++ b/net/mock/mock_conn.go
@@ -4,11 +4,11 @@ import (
 	"container/list"
 	"sync"
 
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 // conn represents one side's perspective of a
diff --git a/net/mock/mock_link.go b/net/mock/mock_link.go
index 3881e62c2..618b90706 100644
--- a/net/mock/mock_link.go
+++ b/net/mock/mock_link.go
@@ -4,8 +4,8 @@ import (
 	"io"
 	"sync"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 )
 
 // link implements mocknet.Link
diff --git a/net/mock/mock_net.go b/net/mock/mock_net.go
index 6a4f47825..d3e6f675d 100644
--- a/net/mock/mock_net.go
+++ b/net/mock/mock_net.go
@@ -5,17 +5,17 @@ import (
 	"sort"
 	"sync"
 
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	bhost "github.com/jbenet/go-ipfs/p2p/host/basic"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	p2putil "github.com/jbenet/go-ipfs/p2p/test/util"
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
-
-	ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	bhost "github.com/ipfs/go-ipfs/p2p/host/basic"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	p2putil "github.com/ipfs/go-ipfs/p2p/test/util"
+	testutil "github.com/ipfs/go-ipfs/util/testutil"
+
+	ctxgroup "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 // mocknet implements mocknet.Mocknet
diff --git a/net/mock/mock_notif_test.go b/net/mock/mock_notif_test.go
index cc92a6677..a75175d18 100644
--- a/net/mock/mock_notif_test.go
+++ b/net/mock/mock_notif_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 	"time"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
 )
 
 func TestNotifications(t *testing.T) {
diff --git a/net/mock/mock_peernet.go b/net/mock/mock_peernet.go
index e850d5c69..b3b65dc86 100644
--- a/net/mock/mock_peernet.go
+++ b/net/mock/mock_peernet.go
@@ -5,13 +5,13 @@ import (
 	"math/rand"
 	"sync"
 
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 
-	ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ctxgroup "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 // peernet implements inet.Network
diff --git a/net/mock/mock_printer.go b/net/mock/mock_printer.go
index 47b6e8178..4a683a886 100644
--- a/net/mock/mock_printer.go
+++ b/net/mock/mock_printer.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"io"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 )
 
 // separate object so our interfaces are separate :)
diff --git a/net/mock/mock_stream.go b/net/mock/mock_stream.go
index e116bb117..1820553c1 100644
--- a/net/mock/mock_stream.go
+++ b/net/mock/mock_stream.go
@@ -3,7 +3,7 @@ package mocknet
 import (
 	"io"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
 )
 
 // stream implements inet.Stream
diff --git a/net/mock/mock_test.go b/net/mock/mock_test.go
index 023bb8966..76e92811b 100644
--- a/net/mock/mock_test.go
+++ b/net/mock/mock_test.go
@@ -7,12 +7,12 @@ import (
 	"sync"
 	"testing"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	testutil "github.com/ipfs/go-ipfs/util/testutil"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func randPeer(t *testing.T) peer.ID {
diff --git a/net/swarm/addr/addr.go b/net/swarm/addr/addr.go
index e611ccd51..3a3d547d5 100644
--- a/net/swarm/addr/addr.go
+++ b/net/swarm/addr/addr.go
@@ -3,11 +3,11 @@ package addrutil
 import (
 	"fmt"
 
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 var log = eventlog.Logger("p2p/net/swarm/addr")
diff --git a/net/swarm/addr/addr_test.go b/net/swarm/addr/addr_test.go
index 13e2028cf..eb843ffc0 100644
--- a/net/swarm/addr/addr_test.go
+++ b/net/swarm/addr/addr_test.go
@@ -3,8 +3,8 @@ package addrutil
 import (
 	"testing"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
 )
 
 func newMultiaddr(t *testing.T, s string) ma.Multiaddr {
diff --git a/net/swarm/dial_test.go b/net/swarm/dial_test.go
index 497c63b6e..e9c9aa155 100644
--- a/net/swarm/dial_test.go
+++ b/net/swarm/dial_test.go
@@ -6,17 +6,17 @@ import (
 	"testing"
 	"time"
 
-	addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
-	ci "github.com/jbenet/go-ipfs/util/testutil/ci"
-	jenkins "github.com/jbenet/go-ipfs/util/testutil/ci/jenkins"
-	travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis"
+	testutil "github.com/ipfs/go-ipfs/util/testutil"
+	ci "github.com/ipfs/go-ipfs/util/testutil/ci"
+	jenkins "github.com/ipfs/go-ipfs/util/testutil/ci/jenkins"
+	travis "github.com/ipfs/go-ipfs/util/testutil/ci/travis"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func acceptAndHang(l net.Listener) {
diff --git a/net/swarm/peers_test.go b/net/swarm/peers_test.go
index 1ade532ad..2f8b07ef0 100644
--- a/net/swarm/peers_test.go
+++ b/net/swarm/peers_test.go
@@ -3,10 +3,10 @@ package swarm
 import (
 	"testing"
 
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func TestPeers(t *testing.T) {
diff --git a/net/swarm/simul_test.go b/net/swarm/simul_test.go
index 37fcf3e69..dfb775c97 100644
--- a/net/swarm/simul_test.go
+++ b/net/swarm/simul_test.go
@@ -5,11 +5,11 @@ import (
 	"testing"
 	"time"
 
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	ci "github.com/jbenet/go-ipfs/util/testutil/ci"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	ci "github.com/ipfs/go-ipfs/util/testutil/ci"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func TestSimultOpen(t *testing.T) {
diff --git a/net/swarm/swarm.go b/net/swarm/swarm.go
index 4e2282a1d..4da1db8a7 100644
--- a/net/swarm/swarm.go
+++ b/net/swarm/swarm.go
@@ -7,16 +7,16 @@ import (
 	"sync"
 	"time"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-
-	ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
-	psy "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream/transport/yamux"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+
+	ctxgroup "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
+	psy "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream/transport/yamux"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 var log = eventlog.Logger("swarm2")
diff --git a/net/swarm/swarm_addr.go b/net/swarm/swarm_addr.go
index ea7290104..8f9360d9d 100644
--- a/net/swarm/swarm_addr.go
+++ b/net/swarm/swarm_addr.go
@@ -1,10 +1,10 @@
 package swarm
 
 import (
-	conn "github.com/jbenet/go-ipfs/p2p/net/conn"
-	addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr"
+	conn "github.com/ipfs/go-ipfs/p2p/net/conn"
+	addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 // ListenAddresses returns a list of addresses at which this swarm listens.
diff --git a/net/swarm/swarm_addr_test.go b/net/swarm/swarm_addr_test.go
index b86898d4d..985ceadb7 100644
--- a/net/swarm/swarm_addr_test.go
+++ b/net/swarm/swarm_addr_test.go
@@ -3,12 +3,12 @@ package swarm
 import (
 	"testing"
 
-	addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
+	addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	testutil "github.com/ipfs/go-ipfs/util/testutil"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func TestFilterAddrs(t *testing.T) {
diff --git a/net/swarm/swarm_conn.go b/net/swarm/swarm_conn.go
index 9da3ace74..126ace627 100644
--- a/net/swarm/swarm_conn.go
+++ b/net/swarm/swarm_conn.go
@@ -3,14 +3,14 @@ package swarm
 import (
 	"fmt"
 
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	conn "github.com/jbenet/go-ipfs/p2p/net/conn"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	conn "github.com/ipfs/go-ipfs/p2p/net/conn"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 // a Conn is a simple wrapper around a ps.Conn that also exposes
diff --git a/net/swarm/swarm_dial.go b/net/swarm/swarm_dial.go
index 8506eafca..ce6656c4d 100644
--- a/net/swarm/swarm_dial.go
+++ b/net/swarm/swarm_dial.go
@@ -8,16 +8,16 @@ import (
 	"sync"
 	"time"
 
-	conn "github.com/jbenet/go-ipfs/p2p/net/conn"
-	addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
-
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
-	process "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
-	ratelimit "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/ratelimit"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	conn "github.com/ipfs/go-ipfs/p2p/net/conn"
+	addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
+
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
+	process "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
+	ratelimit "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/ratelimit"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 // Diagram of dial sync:
diff --git a/net/swarm/swarm_listen.go b/net/swarm/swarm_listen.go
index 8aac86957..deab5a34d 100644
--- a/net/swarm/swarm_listen.go
+++ b/net/swarm/swarm_listen.go
@@ -3,15 +3,15 @@ package swarm
 import (
 	"fmt"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	conn "github.com/jbenet/go-ipfs/p2p/net/conn"
-	addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr"
-	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
-
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	multierr "github.com/jbenet/go-ipfs/thirdparty/multierr"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	conn "github.com/ipfs/go-ipfs/p2p/net/conn"
+	addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
+	lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
+
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	multierr "github.com/ipfs/go-ipfs/thirdparty/multierr"
 )
 
 // Open listeners for each network the swarm should listen on
diff --git a/net/swarm/swarm_net.go b/net/swarm/swarm_net.go
index 78343fa86..ab663eed1 100644
--- a/net/swarm/swarm_net.go
+++ b/net/swarm/swarm_net.go
@@ -3,13 +3,13 @@ package swarm
 import (
 	"fmt"
 
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
 
-	ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ctxgroup "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 // Network implements the inet.Network interface.
diff --git a/net/swarm/swarm_net_test.go b/net/swarm/swarm_net_test.go
index 28ef96cb8..b5f5c5699 100644
--- a/net/swarm/swarm_net_test.go
+++ b/net/swarm/swarm_net_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	testutil "github.com/jbenet/go-ipfs/p2p/test/util"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
 )
 
 // TestConnectednessCorrect starts a few networks, connects a few
diff --git a/net/swarm/swarm_notif_test.go b/net/swarm/swarm_notif_test.go
index 766bfb423..d8b9bc2d2 100644
--- a/net/swarm/swarm_notif_test.go
+++ b/net/swarm/swarm_notif_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 	"time"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
 )
 
 func TestNotifications(t *testing.T) {
diff --git a/net/swarm/swarm_stream.go b/net/swarm/swarm_stream.go
index abd641ff0..66dd6353b 100644
--- a/net/swarm/swarm_stream.go
+++ b/net/swarm/swarm_stream.go
@@ -1,9 +1,9 @@
 package swarm
 
 import (
-	inet "github.com/jbenet/go-ipfs/p2p/net"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
 
-	ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
+	ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
 )
 
 // a Stream is a wrapper around a ps.Stream that exposes a way to get
diff --git a/net/swarm/swarm_test.go b/net/swarm/swarm_test.go
index 4ef7c36c9..586251168 100644
--- a/net/swarm/swarm_test.go
+++ b/net/swarm/swarm_test.go
@@ -7,13 +7,13 @@ import (
 	"testing"
 	"time"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	errors "github.com/jbenet/go-ipfs/util/debugerror"
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	errors "github.com/ipfs/go-ipfs/util/debugerror"
+	testutil "github.com/ipfs/go-ipfs/util/testutil"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func EchoStreamHandler(stream inet.Stream) {
diff --git a/peer/addr/addrsrcs.go b/peer/addr/addrsrcs.go
index 67f0ff2ed..d8b942bef 100644
--- a/peer/addr/addrsrcs.go
+++ b/peer/addr/addrsrcs.go
@@ -2,7 +2,7 @@
 package addr
 
 import (
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 // AddrSource is a source of addresses. It allows clients to retrieve
diff --git a/peer/addr/addrsrcs_test.go b/peer/addr/addrsrcs_test.go
index fbd99d247..ea75a2bd6 100644
--- a/peer/addr/addrsrcs_test.go
+++ b/peer/addr/addrsrcs_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 func newAddrOrFatal(t *testing.T, s string) ma.Multiaddr {
diff --git a/peer/addr_manager.go b/peer/addr_manager.go
index 81a308390..02b0fd118 100644
--- a/peer/addr_manager.go
+++ b/peer/addr_manager.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 const (
diff --git a/peer/addr_manager_test.go b/peer/addr_manager_test.go
index 1c488abda..2bd480fdd 100644
--- a/peer/addr_manager_test.go
+++ b/peer/addr_manager_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 func IDS(t *testing.T, ids string) ID {
diff --git a/peer/metrics_test.go b/peer/metrics_test.go
index 7b07cb139..db5f3a94d 100644
--- a/peer/metrics_test.go
+++ b/peer/metrics_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	testutil "github.com/ipfs/go-ipfs/util/testutil"
 )
 
 func TestLatencyEWMAFun(t *testing.T) {
diff --git a/peer/peer.go b/peer/peer.go
index 26ef93373..8c1d57429 100644
--- a/peer/peer.go
+++ b/peer/peer.go
@@ -7,12 +7,12 @@ import (
 	"fmt"
 	"strings"
 
-	b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
+	b58 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
 
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	u "github.com/jbenet/go-ipfs/util"
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	u "github.com/ipfs/go-ipfs/util"
 )
 
 var log = u.Logger("peer")
diff --git a/peer/peer_test.go b/peer/peer_test.go
index d5bd793fd..80d6d9f07 100644
--- a/peer/peer_test.go
+++ b/peer/peer_test.go
@@ -6,12 +6,12 @@ import (
 	"strings"
 	"testing"
 
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	. "github.com/jbenet/go-ipfs/p2p/peer"
-	u "github.com/jbenet/go-ipfs/util"
-	tu "github.com/jbenet/go-ipfs/util/testutil"
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	. "github.com/ipfs/go-ipfs/p2p/peer"
+	u "github.com/ipfs/go-ipfs/util"
+	tu "github.com/ipfs/go-ipfs/util/testutil"
 
-	b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
+	b58 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
 )
 
 var gen1 keyset // generated
diff --git a/peer/peerstore.go b/peer/peerstore.go
index f1281e86e..30a12ebbc 100644
--- a/peer/peerstore.go
+++ b/peer/peerstore.go
@@ -5,11 +5,11 @@ import (
 	"sync"
 	"time"
 
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
 
-	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
-	dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
+	dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 const (
diff --git a/peer/queue/distance.go b/peer/queue/distance.go
index a0e376fab..bc99e0ab7 100644
--- a/peer/queue/distance.go
+++ b/peer/queue/distance.go
@@ -5,9 +5,9 @@ import (
 	"math/big"
 	"sync"
 
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	ks "github.com/jbenet/go-ipfs/routing/keyspace"
-	u "github.com/jbenet/go-ipfs/util"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	ks "github.com/ipfs/go-ipfs/routing/keyspace"
+	u "github.com/ipfs/go-ipfs/util"
 )
 
 // peerMetric tracks a peer and its distance to something else.
diff --git a/peer/queue/interface.go b/peer/queue/interface.go
index b611422c4..6b0f8c5c9 100644
--- a/peer/queue/interface.go
+++ b/peer/queue/interface.go
@@ -1,6 +1,6 @@
 package queue
 
-import peer "github.com/jbenet/go-ipfs/p2p/peer"
+import peer "github.com/ipfs/go-ipfs/p2p/peer"
 
 // PeerQueue maintains a set of peers ordered according to a metric.
 // Implementations of PeerQueue could order peers based on distances along
diff --git a/peer/queue/queue_test.go b/peer/queue/queue_test.go
index 5ca0b09d0..092858a5b 100644
--- a/peer/queue/queue_test.go
+++ b/peer/queue/queue_test.go
@@ -6,10 +6,10 @@ import (
 	"testing"
 	"time"
 
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	u "github.com/jbenet/go-ipfs/util"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	u "github.com/ipfs/go-ipfs/util"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func TestQueue(t *testing.T) {
diff --git a/peer/queue/sync.go b/peer/queue/sync.go
index b937c09a0..6114c3158 100644
--- a/peer/queue/sync.go
+++ b/peer/queue/sync.go
@@ -1,9 +1,9 @@
 package queue
 
 import (
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 )
 
 var log = eventlog.Logger("peerqueue")
diff --git a/protocol/identify/id.go b/protocol/identify/id.go
index 7d59c6125..c3f959897 100644
--- a/protocol/identify/id.go
+++ b/protocol/identify/id.go
@@ -4,19 +4,19 @@ import (
 	"strings"
 	"sync"
 
-	ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
-	semver "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	pb "github.com/jbenet/go-ipfs/p2p/protocol/identify/pb"
-	config "github.com/jbenet/go-ipfs/repo/config"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
+	ggio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
+	semver "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	pb "github.com/ipfs/go-ipfs/p2p/protocol/identify/pb"
+	config "github.com/ipfs/go-ipfs/repo/config"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+	lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
 )
 
 var log = eventlog.Logger("net/identify")
diff --git a/protocol/identify/id_test.go b/protocol/identify/id_test.go
index 906809fe0..5669a5e6c 100644
--- a/protocol/identify/id_test.go
+++ b/protocol/identify/id_test.go
@@ -4,13 +4,13 @@ import (
 	"testing"
 	"time"
 
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	identify "github.com/jbenet/go-ipfs/p2p/protocol/identify"
-	testutil "github.com/jbenet/go-ipfs/p2p/test/util"
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	identify "github.com/ipfs/go-ipfs/p2p/protocol/identify"
+	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func subtestIDService(t *testing.T, postDialWait time.Duration) {
diff --git a/protocol/identify/obsaddr.go b/protocol/identify/obsaddr.go
index 3ef19ee54..b2169057a 100644
--- a/protocol/identify/obsaddr.go
+++ b/protocol/identify/obsaddr.go
@@ -4,9 +4,9 @@ import (
 	"sync"
 	"time"
 
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 // ObservedAddr is an entry for an address reported by our peers.
diff --git a/protocol/identify/obsaddr_test.go b/protocol/identify/obsaddr_test.go
index 075ba7956..8a5ef80fe 100644
--- a/protocol/identify/obsaddr_test.go
+++ b/protocol/identify/obsaddr_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 // TestObsAddrSet
diff --git a/protocol/identify/pb/identify.pb.go b/protocol/identify/pb/identify.pb.go
index e656514c4..f3dcd88b0 100644
--- a/protocol/identify/pb/identify.pb.go
+++ b/protocol/identify/pb/identify.pb.go
@@ -13,7 +13,7 @@ It has these top-level messages:
 */
 package identify_pb
 
-import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 import json "encoding/json"
 import math "math"
 
diff --git a/protocol/mux.go b/protocol/mux.go
index 9f4ae7310..a5048c957 100644
--- a/protocol/mux.go
+++ b/protocol/mux.go
@@ -5,10 +5,10 @@ import (
 	"io"
 	"sync"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+	lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
 )
 
 var log = eventlog.Logger("net/mux")
diff --git a/protocol/mux_test.go b/protocol/mux_test.go
index d9abc2a85..68cdb1175 100644
--- a/protocol/mux_test.go
+++ b/protocol/mux_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
 )
 
 var testCases = map[string]string{
diff --git a/protocol/protocol.go b/protocol/protocol.go
index e192fb6a3..e67bb3e56 100644
--- a/protocol/protocol.go
+++ b/protocol/protocol.go
@@ -3,7 +3,7 @@ package protocol
 import (
 	"io"
 
-	msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
+	msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
 )
 
 // ID is an identifier used to write protocol headers in streams.
diff --git a/protocol/relay/relay.go b/protocol/relay/relay.go
index ec6610daa..a2177c56c 100644
--- a/protocol/relay/relay.go
+++ b/protocol/relay/relay.go
@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"io"
 
-	mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
+	mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
 
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 )
 
 var log = eventlog.Logger("p2p/protocol/relay")
diff --git a/protocol/relay/relay_test.go b/protocol/relay/relay_test.go
index 2022285bc..9c6b652af 100644
--- a/protocol/relay/relay_test.go
+++ b/protocol/relay/relay_test.go
@@ -4,13 +4,13 @@ import (
 	"io"
 	"testing"
 
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	relay "github.com/jbenet/go-ipfs/p2p/protocol/relay"
-	testutil "github.com/jbenet/go-ipfs/p2p/test/util"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	relay "github.com/ipfs/go-ipfs/p2p/protocol/relay"
+	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 var log = eventlog.Logger("relay_test")
diff --git a/test/backpressure/backpressure_test.go b/test/backpressure/backpressure_test.go
index 347810856..1fe5506ee 100644
--- a/test/backpressure/backpressure_test.go
+++ b/test/backpressure/backpressure_test.go
@@ -7,14 +7,14 @@ import (
 	"testing"
 	"time"
 
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	testutil "github.com/jbenet/go-ipfs/p2p/test/util"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 var log = eventlog.Logger("backpressure")
diff --git a/test/reconnects/reconnect_test.go b/test/reconnects/reconnect_test.go
index 39bb18cf9..700921cc9 100644
--- a/test/reconnects/reconnect_test.go
+++ b/test/reconnects/reconnect_test.go
@@ -8,15 +8,15 @@ import (
 	"testing"
 	"time"
 
-	host "github.com/jbenet/go-ipfs/p2p/host"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	swarm "github.com/jbenet/go-ipfs/p2p/net/swarm"
-	protocol "github.com/jbenet/go-ipfs/p2p/protocol"
-	testutil "github.com/jbenet/go-ipfs/p2p/test/util"
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-
-	ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	host "github.com/ipfs/go-ipfs/p2p/host"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	swarm "github.com/ipfs/go-ipfs/p2p/net/swarm"
+	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
+	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+
+	ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func init() {
diff --git a/test/util/key.go b/test/util/key.go
index ec17430a4..b3fc5dd6d 100644
--- a/test/util/key.go
+++ b/test/util/key.go
@@ -5,14 +5,14 @@ import (
 	"io"
 	"testing"
 
-	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
-	u "github.com/jbenet/go-ipfs/util"
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
+	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
+	u "github.com/ipfs/go-ipfs/util"
+	testutil "github.com/ipfs/go-ipfs/util/testutil"
 
-	ic "github.com/jbenet/go-ipfs/p2p/crypto"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	ic "github.com/ipfs/go-ipfs/p2p/crypto"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 var log = eventlog.Logger("boguskey")
diff --git a/test/util/util.go b/test/util/util.go
index b60dbaa1f..2b7c12a22 100644
--- a/test/util/util.go
+++ b/test/util/util.go
@@ -3,14 +3,14 @@ package testutil
 import (
 	"testing"
 
-	bhost "github.com/jbenet/go-ipfs/p2p/host/basic"
-	inet "github.com/jbenet/go-ipfs/p2p/net"
-	swarm "github.com/jbenet/go-ipfs/p2p/net/swarm"
-	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	tu "github.com/jbenet/go-ipfs/util/testutil"
+	bhost "github.com/ipfs/go-ipfs/p2p/host/basic"
+	inet "github.com/ipfs/go-ipfs/p2p/net"
+	swarm "github.com/ipfs/go-ipfs/p2p/net/swarm"
+	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	tu "github.com/ipfs/go-ipfs/util/testutil"
 
-	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
 func GenSwarmNetwork(t *testing.T, ctx context.Context) *swarm.Network {