diff --git a/addrbook.go b/addrbook.go
index 8a1698f41..e68cc7b3a 100644
--- a/addrbook.go
+++ b/addrbook.go
@@ -14,7 +14,7 @@ import (
 	"sync"
 	"time"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 	crypto "github.com/tendermint/go-crypto"
 )
 
diff --git a/connection.go b/connection.go
index a14fa5ee4..629ab7b0d 100644
--- a/connection.go
+++ b/connection.go
@@ -10,9 +10,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	cmn "github.com/tendermint/go-common"
-	flow "github.com/tendermint/go-flowrate/flowrate"
 	wire "github.com/tendermint/go-wire"
+	cmn "github.com/tendermint/tmlibs/common"
+	flow "github.com/tendermint/tmlibs/flowrate"
 )
 
 const (
diff --git a/glide.lock b/glide.lock
index 71505ea05..5da4e6230 100644
--- a/glide.lock
+++ b/glide.lock
@@ -22,19 +22,19 @@ imports:
   subpackages:
   - edwards25519
   - extra25519
-- name: github.com/tendermint/go-common
+- name: github.com/tendermint/tmlibs/common
   version: f9e3db037330c8a8d61d3966de8473eaf01154fa
 - name: github.com/tendermint/go-config
   version: 620dcbbd7d587cf3599dedbf329b64311b0c307a
 - name: github.com/tendermint/go-crypto
   version: 0ca2c6fdb0706001ca4c4b9b80c9f428e8cf39da
-- name: github.com/tendermint/go-data
+- name: github.com/tendermint/go-wire/data
   version: e7fcc6d081ec8518912fcdc103188275f83a3ee5
-- name: github.com/tendermint/go-flowrate
+- name: github.com/tendermint/tmlibs/flowrate
   version: a20c98e61957faa93b4014fbd902f20ab9317a6a
   subpackages:
   - flowrate
-- name: github.com/tendermint/go-logger
+- name: github.com/tendermint/tmlibs/logger
   version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2
 - name: github.com/tendermint/go-wire
   version: c1c9a57ab8038448ddea1714c0698f8051e5748c
diff --git a/glide.yaml b/glide.yaml
index e7edc80ae..5bf7a015e 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -1,17 +1,17 @@
 package: github.com/tendermint/go-p2p
 import:
-- package: github.com/tendermint/go-common
+- package: github.com/tendermint/tmlibs/common
   version: develop
 - package: github.com/tendermint/go-config
   version: develop
 - package: github.com/tendermint/go-crypto
   version: develop
-- package: github.com/tendermint/go-data
+- package: github.com/tendermint/go-wire/data
   version: develop
-- package: github.com/tendermint/go-flowrate
+- package: github.com/tendermint/tmlibs/flowrate
   subpackages:
   - flowrate
-- package: github.com/tendermint/go-logger
+- package: github.com/tendermint/tmlibs/logger
   version: develop
 - package: github.com/tendermint/go-wire
   version: develop
diff --git a/listener.go b/listener.go
index 962c2b14c..51beb5e27 100644
--- a/listener.go
+++ b/listener.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/go-p2p/upnp"
 )
 
diff --git a/log.go b/log.go
index ac1ff22a5..af3203409 100644
--- a/log.go
+++ b/log.go
@@ -1,7 +1,7 @@
 package p2p
 
 import (
-	"github.com/tendermint/go-logger"
+	"github.com/tendermint/tmlibs/logger"
 )
 
 var log = logger.New("module", "p2p")
diff --git a/netaddress.go b/netaddress.go
index 263ec9037..09787481c 100644
--- a/netaddress.go
+++ b/netaddress.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"time"
 
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 // NetAddress defines information about a peer on the network
diff --git a/peer.go b/peer.go
index 5461d7e8a..355f4731e 100644
--- a/peer.go
+++ b/peer.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	crypto "github.com/tendermint/go-crypto"
 	wire "github.com/tendermint/go-wire"
 )
diff --git a/peer_set_test.go b/peer_set_test.go
index ceb10eeee..a17f9d658 100644
--- a/peer_set_test.go
+++ b/peer_set_test.go
@@ -4,7 +4,7 @@ import (
 	"math/rand"
 	"testing"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 )
 
 // Returns an empty dummy peer
diff --git a/pex_reactor.go b/pex_reactor.go
index 4b6129762..03a383c85 100644
--- a/pex_reactor.go
+++ b/pex_reactor.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"time"
 
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	wire "github.com/tendermint/go-wire"
 )
 
diff --git a/pex_reactor_test.go b/pex_reactor_test.go
index 13f2fa208..aed6c758d 100644
--- a/pex_reactor_test.go
+++ b/pex_reactor_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	wire "github.com/tendermint/go-wire"
 )
 
diff --git a/secret_connection.go b/secret_connection.go
index be3e62a9d..49535a40a 100644
--- a/secret_connection.go
+++ b/secret_connection.go
@@ -20,7 +20,7 @@ import (
 	"golang.org/x/crypto/nacl/secretbox"
 	"golang.org/x/crypto/ripemd160"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/go-crypto"
 	"github.com/tendermint/go-wire"
 )
diff --git a/secret_connection_test.go b/secret_connection_test.go
index 9bf1a7b1d..58459e62a 100644
--- a/secret_connection_test.go
+++ b/secret_connection_test.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"testing"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/go-crypto"
 )
 
diff --git a/switch.go b/switch.go
index 6835e0a4b..3e3ab4f87 100644
--- a/switch.go
+++ b/switch.go
@@ -7,7 +7,7 @@ import (
 	"net"
 	"time"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 	cfg "github.com/tendermint/go-config"
 	crypto "github.com/tendermint/go-crypto"
 	"github.com/tendermint/log15"
diff --git a/switch_test.go b/switch_test.go
index a81bb4ac0..1f1fe69f0 100644
--- a/switch_test.go
+++ b/switch_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 	cfg "github.com/tendermint/go-config"
 	crypto "github.com/tendermint/go-crypto"
 	wire "github.com/tendermint/go-wire"
diff --git a/upnp/log.go b/upnp/log.go
index edc5b4980..45e44439c 100644
--- a/upnp/log.go
+++ b/upnp/log.go
@@ -1,7 +1,7 @@
 package upnp
 
 import (
-	"github.com/tendermint/go-logger"
+	"github.com/tendermint/tmlibs/logger"
 )
 
 var log = logger.New("module", "upnp")
diff --git a/upnp/probe.go b/upnp/probe.go
index 5ba9b2370..5488de587 100644
--- a/upnp/probe.go
+++ b/upnp/probe.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"time"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 )
 
 type UPNPCapabilities struct {