diff --git a/blocks/blockstore/blockstore.go b/blocks/blockstore/blockstore.go
index e4a9f7745..3c98b0735 100644
--- a/blocks/blockstore/blockstore.go
+++ b/blocks/blockstore/blockstore.go
@@ -12,8 +12,8 @@ import (
 	mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
 
 	blocks "github.com/jbenet/go-ipfs/blocks"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 	u "github.com/jbenet/go-ipfs/util"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
 )
 
 var log = eventlog.Logger("blockstore")
diff --git a/blockservice/mock.go b/blockservice/mock.go
index 73fcdf2fc..541efe696 100644
--- a/blockservice/mock.go
+++ b/blockservice/mock.go
@@ -6,7 +6,7 @@ import (
 	bitswap "github.com/jbenet/go-ipfs/exchange/bitswap"
 	tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet"
 	mockrouting "github.com/jbenet/go-ipfs/routing/mock"
-	delay "github.com/jbenet/go-ipfs/util/delay"
+	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
 )
 
 // Mocks returns |n| connected mock Blockservices
diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go
index 550d9b605..f2cdf9e00 100644
--- a/cmd/ipfs/main.go
+++ b/cmd/ipfs/main.go
@@ -23,10 +23,10 @@ import (
 	repo "github.com/jbenet/go-ipfs/repo"
 	config "github.com/jbenet/go-ipfs/repo/config"
 	fsrepo "github.com/jbenet/go-ipfs/repo/fsrepo"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 	updates "github.com/jbenet/go-ipfs/updates"
 	u "github.com/jbenet/go-ipfs/util"
 	"github.com/jbenet/go-ipfs/util/debugerror"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
 )
 
 // log is the command logger
diff --git a/cmd/seccat/util.go b/cmd/seccat/util.go
index e80a14e04..194afb493 100644
--- a/cmd/seccat/util.go
+++ b/cmd/seccat/util.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"os"
 
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 )
 
 var log = eventlog.Logger("seccat")
diff --git a/core/bootstrap.go b/core/bootstrap.go
index 3144baa29..72a8be525 100644
--- a/core/bootstrap.go
+++ b/core/bootstrap.go
@@ -11,8 +11,8 @@ import (
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
 	config "github.com/jbenet/go-ipfs/repo/config"
 	dht "github.com/jbenet/go-ipfs/routing/dht"
+	math2 "github.com/jbenet/go-ipfs/thirdparty/math2"
 	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
-	math2 "github.com/jbenet/go-ipfs/util/math2"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
diff --git a/core/core.go b/core/core.go
index 60dfaeae0..f643890d4 100644
--- a/core/core.go
+++ b/core/core.go
@@ -35,7 +35,7 @@ import (
 	util "github.com/jbenet/go-ipfs/util"
 	ds2 "github.com/jbenet/go-ipfs/util/datastore2"
 	debugerror "github.com/jbenet/go-ipfs/util/debugerror"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
 )
 
diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go
index 25025bb8e..770f4fd7f 100644
--- a/exchange/bitswap/bitswap.go
+++ b/exchange/bitswap/bitswap.go
@@ -18,10 +18,10 @@ import (
 	notifications "github.com/jbenet/go-ipfs/exchange/bitswap/notifications"
 	wantlist "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	"github.com/jbenet/go-ipfs/thirdparty/delay"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 	u "github.com/jbenet/go-ipfs/util"
 	errors "github.com/jbenet/go-ipfs/util/debugerror"
-	"github.com/jbenet/go-ipfs/util/delay"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
 	pset "github.com/jbenet/go-ipfs/util/peerset" // TODO move this to peerstore
 )
 
diff --git a/exchange/bitswap/bitswap_test.go b/exchange/bitswap/bitswap_test.go
index 64d5ead52..13bb3304f 100644
--- a/exchange/bitswap/bitswap_test.go
+++ b/exchange/bitswap/bitswap_test.go
@@ -13,8 +13,8 @@ import (
 	tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet"
 	p2ptestutil "github.com/jbenet/go-ipfs/p2p/test/util"
 	mockrouting "github.com/jbenet/go-ipfs/routing/mock"
+	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
 	u "github.com/jbenet/go-ipfs/util"
-	delay "github.com/jbenet/go-ipfs/util/delay"
 )
 
 // FIXME the tests are really sensitive to the network delay. fix them to work
diff --git a/exchange/bitswap/decision/engine.go b/exchange/bitswap/decision/engine.go
index e4b2ab832..f766f5ddf 100644
--- a/exchange/bitswap/decision/engine.go
+++ b/exchange/bitswap/decision/engine.go
@@ -8,7 +8,7 @@ import (
 	bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
 	wl "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 )
 
 // TODO consider taking responsibility for other types of requests. For
diff --git a/exchange/bitswap/network/ipfs_impl.go b/exchange/bitswap/network/ipfs_impl.go
index 4415cf8cf..1bc47603a 100644
--- a/exchange/bitswap/network/ipfs_impl.go
+++ b/exchange/bitswap/network/ipfs_impl.go
@@ -8,8 +8,8 @@ import (
 	inet "github.com/jbenet/go-ipfs/p2p/net"
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
 	routing "github.com/jbenet/go-ipfs/routing"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 	util "github.com/jbenet/go-ipfs/util"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
 )
 
 var log = eventlog.Logger("bitswap_network")
diff --git a/exchange/bitswap/testnet/network_test.go b/exchange/bitswap/testnet/network_test.go
index bbf84995c..e80fccba5 100644
--- a/exchange/bitswap/testnet/network_test.go
+++ b/exchange/bitswap/testnet/network_test.go
@@ -10,7 +10,7 @@ import (
 	bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
 	mockrouting "github.com/jbenet/go-ipfs/routing/mock"
-	delay "github.com/jbenet/go-ipfs/util/delay"
+	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
 	testutil "github.com/jbenet/go-ipfs/util/testutil"
 )
 
diff --git a/exchange/bitswap/testnet/virtual.go b/exchange/bitswap/testnet/virtual.go
index 639bb00d3..7ee082cfd 100644
--- a/exchange/bitswap/testnet/virtual.go
+++ b/exchange/bitswap/testnet/virtual.go
@@ -9,8 +9,8 @@ import (
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
 	routing "github.com/jbenet/go-ipfs/routing"
 	mockrouting "github.com/jbenet/go-ipfs/routing/mock"
+	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
 	util "github.com/jbenet/go-ipfs/util"
-	delay "github.com/jbenet/go-ipfs/util/delay"
 	testutil "github.com/jbenet/go-ipfs/util/testutil"
 )
 
diff --git a/exchange/bitswap/testutils.go b/exchange/bitswap/testutils.go
index 95019f297..5a6b59b3a 100644
--- a/exchange/bitswap/testutils.go
+++ b/exchange/bitswap/testutils.go
@@ -11,8 +11,8 @@ import (
 	tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet"
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
 	p2ptestutil "github.com/jbenet/go-ipfs/p2p/test/util"
+	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
 	datastore2 "github.com/jbenet/go-ipfs/util/datastore2"
-	delay "github.com/jbenet/go-ipfs/util/delay"
 	testutil "github.com/jbenet/go-ipfs/util/testutil"
 )
 
diff --git a/exchange/reprovide/reprovide.go b/exchange/reprovide/reprovide.go
index d0ac69470..4895e8ccb 100644
--- a/exchange/reprovide/reprovide.go
+++ b/exchange/reprovide/reprovide.go
@@ -8,8 +8,8 @@ import (
 
 	blocks "github.com/jbenet/go-ipfs/blocks/blockstore"
 	routing "github.com/jbenet/go-ipfs/routing"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 	debugerror "github.com/jbenet/go-ipfs/util/debugerror"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
 )
 
 var log = eventlog.Logger("reprovider")
diff --git a/p2p/crypto/secio/protocol.go b/p2p/crypto/secio/protocol.go
index 998e55913..5cbdc9d68 100644
--- a/p2p/crypto/secio/protocol.go
+++ b/p2p/crypto/secio/protocol.go
@@ -13,8 +13,8 @@ import (
 	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"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
 )
 
 var log = eventlog.Logger("secio")
diff --git a/p2p/host/basic/basic_host.go b/p2p/host/basic/basic_host.go
index 6256ea2bd..944e9d6e1 100644
--- a/p2p/host/basic/basic_host.go
+++ b/p2p/host/basic/basic_host.go
@@ -3,7 +3,7 @@ package basichost
 import (
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 
 	inet "github.com/jbenet/go-ipfs/p2p/net"
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
diff --git a/p2p/host/host.go b/p2p/host/host.go
index 020322116..b98ada53c 100644
--- a/p2p/host/host.go
+++ b/p2p/host/host.go
@@ -3,11 +3,10 @@ package host
 import (
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 
-	eventlog "github.com/jbenet/go-ipfs/util/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"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 )
 
 var log = eventlog.Logger("p2p/host")
diff --git a/p2p/net/conn/conn.go b/p2p/net/conn/conn.go
index 65b12f23e..4692b1309 100644
--- a/p2p/net/conn/conn.go
+++ b/p2p/net/conn/conn.go
@@ -13,8 +13,8 @@ import (
 
 	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"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
 )
 
 var log = eventlog.Logger("conn")
diff --git a/p2p/net/mock/mock.go b/p2p/net/mock/mock.go
index 5403358cb..eaeb16281 100644
--- a/p2p/net/mock/mock.go
+++ b/p2p/net/mock/mock.go
@@ -1,7 +1,7 @@
 package mocknet
 
 import (
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 )
diff --git a/p2p/net/swarm/addr/addr.go b/p2p/net/swarm/addr/addr.go
index bae6e8605..c1d3f22e0 100644
--- a/p2p/net/swarm/addr/addr.go
+++ b/p2p/net/swarm/addr/addr.go
@@ -3,7 +3,7 @@ package addrutil
 import (
 	"fmt"
 
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
diff --git a/p2p/net/swarm/swarm.go b/p2p/net/swarm/swarm.go
index 5e3c667eb..f167dec4c 100644
--- a/p2p/net/swarm/swarm.go
+++ b/p2p/net/swarm/swarm.go
@@ -9,7 +9,7 @@ import (
 	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/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
diff --git a/p2p/net/swarm/swarm_listen.go b/p2p/net/swarm/swarm_listen.go
index 56c889a92..0e1e6b4ef 100644
--- a/p2p/net/swarm/swarm_listen.go
+++ b/p2p/net/swarm/swarm_listen.go
@@ -10,7 +10,7 @@ import (
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	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"
-	multierr "github.com/jbenet/go-ipfs/util/multierr"
+	multierr "github.com/jbenet/go-ipfs/thirdparty/multierr"
 )
 
 // Open listeners for each network the swarm should listen on
diff --git a/p2p/peer/queue/sync.go b/p2p/peer/queue/sync.go
index 3d7aa68ad..cdbc4e415 100644
--- a/p2p/peer/queue/sync.go
+++ b/p2p/peer/queue/sync.go
@@ -4,7 +4,7 @@ import (
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 )
 
 var log = eventlog.Logger("peerqueue")
diff --git a/p2p/protocol/identify/id.go b/p2p/protocol/identify/id.go
index 15c7f1c5c..6065f0eec 100644
--- a/p2p/protocol/identify/id.go
+++ b/p2p/protocol/identify/id.go
@@ -9,14 +9,12 @@ import (
 	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"
 
-	config "github.com/jbenet/go-ipfs/repo/config"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
-
 	host "github.com/jbenet/go-ipfs/p2p/host"
 	inet "github.com/jbenet/go-ipfs/p2p/net"
 	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"
 )
 
 var log = eventlog.Logger("net/identify")
diff --git a/p2p/protocol/mux.go b/p2p/protocol/mux.go
index a4c0f302a..6ba99e4f2 100644
--- a/p2p/protocol/mux.go
+++ b/p2p/protocol/mux.go
@@ -8,7 +8,7 @@ import (
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 
 	inet "github.com/jbenet/go-ipfs/p2p/net"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 	lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
 )
 
diff --git a/p2p/protocol/relay/relay.go b/p2p/protocol/relay/relay.go
index 4e4f0ba22..2cd1af3c6 100644
--- a/p2p/protocol/relay/relay.go
+++ b/p2p/protocol/relay/relay.go
@@ -10,7 +10,7 @@ import (
 	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/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 )
 
 var log = eventlog.Logger("p2p/protocol/relay")
diff --git a/p2p/protocol/relay/relay_test.go b/p2p/protocol/relay/relay_test.go
index 14145044e..91d05d97a 100644
--- a/p2p/protocol/relay/relay_test.go
+++ b/p2p/protocol/relay/relay_test.go
@@ -8,7 +8,7 @@ import (
 	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/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 )
diff --git a/p2p/test/backpressure/backpressure_test.go b/p2p/test/backpressure/backpressure_test.go
index 946b87b3a..3d6dfd29c 100644
--- a/p2p/test/backpressure/backpressure_test.go
+++ b/p2p/test/backpressure/backpressure_test.go
@@ -12,7 +12,7 @@ import (
 	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/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 )
diff --git a/p2p/test/reconnects/reconnect_test.go b/p2p/test/reconnects/reconnect_test.go
index fee269bbd..9dcd0ed1b 100644
--- a/p2p/test/reconnects/reconnect_test.go
+++ b/p2p/test/reconnects/reconnect_test.go
@@ -13,7 +13,7 @@ import (
 	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/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
diff --git a/p2p/test/util/key.go b/p2p/test/util/key.go
index fc4f3af4e..ec17430a4 100644
--- a/p2p/test/util/key.go
+++ b/p2p/test/util/key.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 	u "github.com/jbenet/go-ipfs/util"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
 	testutil "github.com/jbenet/go-ipfs/util/testutil"
 
 	ic "github.com/jbenet/go-ipfs/p2p/crypto"
diff --git a/repo/fsrepo/component/datastore_test.go b/repo/fsrepo/component/datastore_test.go
index 5338d1001..ad89bef5b 100644
--- a/repo/fsrepo/component/datastore_test.go
+++ b/repo/fsrepo/component/datastore_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/jbenet/go-ipfs/repo/fsrepo/assert"
+	"github.com/jbenet/go-ipfs/thirdparty/assert"
 )
 
 // swap arg order
diff --git a/repo/fsrepo/fsrepo_test.go b/repo/fsrepo/fsrepo_test.go
index 9b181d41a..072e4c6d1 100644
--- a/repo/fsrepo/fsrepo_test.go
+++ b/repo/fsrepo/fsrepo_test.go
@@ -7,7 +7,7 @@ import (
 
 	datastore "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
 	"github.com/jbenet/go-ipfs/repo/config"
-	"github.com/jbenet/go-ipfs/repo/fsrepo/assert"
+	"github.com/jbenet/go-ipfs/thirdparty/assert"
 )
 
 // swap arg order
diff --git a/repo/logs.go b/repo/logs.go
index 3cebf8ec6..12381932f 100644
--- a/repo/logs.go
+++ b/repo/logs.go
@@ -2,8 +2,8 @@ package repo
 
 import (
 	config "github.com/jbenet/go-ipfs/repo/config"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 	util "github.com/jbenet/go-ipfs/util"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
 )
 
 func ConfigureEventLogger(config config.Logs) error {
diff --git a/routing/dht/dht.go b/routing/dht/dht.go
index 7befb6597..9f4860880 100644
--- a/routing/dht/dht.go
+++ b/routing/dht/dht.go
@@ -16,8 +16,8 @@ import (
 	routing "github.com/jbenet/go-ipfs/routing"
 	pb "github.com/jbenet/go-ipfs/routing/dht/pb"
 	kb "github.com/jbenet/go-ipfs/routing/kbucket"
+	"github.com/jbenet/go-ipfs/thirdparty/eventlog"
 	u "github.com/jbenet/go-ipfs/util"
-	"github.com/jbenet/go-ipfs/util/eventlog"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
diff --git a/routing/dht/pb/message.go b/routing/dht/pb/message.go
index 61bf41ebb..680234102 100644
--- a/routing/dht/pb/message.go
+++ b/routing/dht/pb/message.go
@@ -5,7 +5,7 @@ import (
 
 	inet "github.com/jbenet/go-ipfs/p2p/net"
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 )
 
 var log = eventlog.Logger("dht.pb")
diff --git a/routing/dht/query.go b/routing/dht/query.go
index 6ac8fefe8..53c232323 100644
--- a/routing/dht/query.go
+++ b/routing/dht/query.go
@@ -6,8 +6,8 @@ import (
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
 	queue "github.com/jbenet/go-ipfs/p2p/peer/queue"
 	"github.com/jbenet/go-ipfs/routing"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 	u "github.com/jbenet/go-ipfs/util"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
 	pset "github.com/jbenet/go-ipfs/util/peerset"
 	todoctr "github.com/jbenet/go-ipfs/util/todocounter"
 
diff --git a/routing/mock/centralized_test.go b/routing/mock/centralized_test.go
index 526d63c68..56f61c076 100644
--- a/routing/mock/centralized_test.go
+++ b/routing/mock/centralized_test.go
@@ -6,8 +6,8 @@ import (
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
+	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
 	u "github.com/jbenet/go-ipfs/util"
-	delay "github.com/jbenet/go-ipfs/util/delay"
 	"github.com/jbenet/go-ipfs/util/testutil"
 )
 
diff --git a/routing/mock/interface.go b/routing/mock/interface.go
index d7dca8348..f8b034098 100644
--- a/routing/mock/interface.go
+++ b/routing/mock/interface.go
@@ -9,8 +9,8 @@ import (
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
 	routing "github.com/jbenet/go-ipfs/routing"
+	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
 	u "github.com/jbenet/go-ipfs/util"
-	delay "github.com/jbenet/go-ipfs/util/delay"
 	"github.com/jbenet/go-ipfs/util/testutil"
 )
 
diff --git a/test/epictest/core.go b/test/epictest/core.go
index d5aef22f4..2208a8f60 100644
--- a/test/epictest/core.go
+++ b/test/epictest/core.go
@@ -12,9 +12,9 @@ import (
 	host "github.com/jbenet/go-ipfs/p2p/host"
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
 	dht "github.com/jbenet/go-ipfs/routing/dht"
+	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
+	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 	"github.com/jbenet/go-ipfs/util/datastore2"
-	delay "github.com/jbenet/go-ipfs/util/delay"
-	eventlog "github.com/jbenet/go-ipfs/util/eventlog"
 	testutil "github.com/jbenet/go-ipfs/util/testutil"
 )
 
diff --git a/thirdparty/README.md b/thirdparty/README.md
new file mode 100644
index 000000000..a6f665383
--- /dev/null
+++ b/thirdparty/README.md
@@ -0,0 +1,5 @@
+thirdparty consists of Golang packages that contain no go-ipfs dependencies and
+may be vendored jbenet/go-ipfs at a later date.
+
+packages in under this directory _must not_ import packages under
+`jbenet/go-ipfs` that are not also under `thirdparty`.
diff --git a/repo/fsrepo/assert/assert.go b/thirdparty/assert/assert.go
similarity index 100%
rename from repo/fsrepo/assert/assert.go
rename to thirdparty/assert/assert.go
diff --git a/util/delay/delay.go b/thirdparty/delay/delay.go
similarity index 100%
rename from util/delay/delay.go
rename to thirdparty/delay/delay.go
diff --git a/util/eventlog/context.go b/thirdparty/eventlog/context.go
similarity index 100%
rename from util/eventlog/context.go
rename to thirdparty/eventlog/context.go
diff --git a/util/eventlog/context_test.go b/thirdparty/eventlog/context_test.go
similarity index 100%
rename from util/eventlog/context_test.go
rename to thirdparty/eventlog/context_test.go
diff --git a/util/eventlog/entry.go b/thirdparty/eventlog/entry.go
similarity index 100%
rename from util/eventlog/entry.go
rename to thirdparty/eventlog/entry.go
diff --git a/util/eventlog/example_test.go b/thirdparty/eventlog/example_test.go
similarity index 100%
rename from util/eventlog/example_test.go
rename to thirdparty/eventlog/example_test.go
diff --git a/util/eventlog/log.go b/thirdparty/eventlog/log.go
similarity index 100%
rename from util/eventlog/log.go
rename to thirdparty/eventlog/log.go
diff --git a/util/eventlog/loggable.go b/thirdparty/eventlog/loggable.go
similarity index 100%
rename from util/eventlog/loggable.go
rename to thirdparty/eventlog/loggable.go
diff --git a/util/eventlog/metadata.go b/thirdparty/eventlog/metadata.go
similarity index 100%
rename from util/eventlog/metadata.go
rename to thirdparty/eventlog/metadata.go
diff --git a/util/eventlog/metadata_test.go b/thirdparty/eventlog/metadata_test.go
similarity index 100%
rename from util/eventlog/metadata_test.go
rename to thirdparty/eventlog/metadata_test.go
diff --git a/util/eventlog/option.go b/thirdparty/eventlog/option.go
similarity index 100%
rename from util/eventlog/option.go
rename to thirdparty/eventlog/option.go
diff --git a/util/eventlog/polite_json_formatter.go b/thirdparty/eventlog/polite_json_formatter.go
similarity index 100%
rename from util/eventlog/polite_json_formatter.go
rename to thirdparty/eventlog/polite_json_formatter.go
diff --git a/util/math2/math2.go b/thirdparty/math2/math2.go
similarity index 100%
rename from util/math2/math2.go
rename to thirdparty/math2/math2.go
diff --git a/util/multierr/multierr.go b/thirdparty/multierr/multierr.go
similarity index 100%
rename from util/multierr/multierr.go
rename to thirdparty/multierr/multierr.go
diff --git a/util/datastore2/delayed.go b/util/datastore2/delayed.go
index ca2541913..8d4957c6c 100644
--- a/util/datastore2/delayed.go
+++ b/util/datastore2/delayed.go
@@ -4,7 +4,7 @@ import (
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
 	dsq "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/query"
 
-	delay "github.com/jbenet/go-ipfs/util/delay"
+	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
 )
 
 func WithDelay(ds ds.Datastore, delay delay.D) ds.Datastore {
diff --git a/util/eventlog/loggables/loggables.go b/util/eventlog/loggables/loggables.go
index 289de954d..b653c7892 100644
--- a/util/eventlog/loggables/loggables.go
+++ b/util/eventlog/loggables/loggables.go
@@ -9,7 +9,7 @@ package loggables
 import (
 	"net"
 
-	log "github.com/jbenet/go-ipfs/util/eventlog"
+	log "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 )
 
 // NetConn returns an eventlog.Metadata with the conn addresses