diff --git a/glide.lock b/glide.lock
index b83a05146..c96f014ff 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 7fc53c3edfe508d56a5f2241ab73cef88652cbc40036ca2598730619edac7740
-updated: 2017-04-21T16:57:57.932584858-04:00
+hash: a79d5a28c894511eb8acfc59c1bd9b91ab15d7a6dae49701fbf037675852c50c
+updated: 2017-04-21T18:21:33.986691926-04:00
 imports:
 - name: github.com/btcsuite/btcd
   version: 583684b21bfbde9b5fc4403916fd7c807feb0289
@@ -78,42 +78,18 @@ imports:
   subpackages:
   - edwards25519
   - extra25519
-- name: github.com/tendermint/tmlibs/autofile
-  version: 48b17de82914e1ec2f134ce823ba426337d2c518
-- name: github.com/tendermint/tmlibs/clist
-  version: 3baa390bbaf7634251c42ad69a8682e7e3990552
-- name: github.com/tendermint/tmlibs/common
+- name: github.com/tendermint/go-common
   version: f9e3db037330c8a8d61d3966de8473eaf01154fa
-  subpackages:
-  - test
 - name: github.com/tendermint/go-config
   version: 620dcbbd7d587cf3599dedbf329b64311b0c307a
 - name: github.com/tendermint/go-crypto
   version: 9b95da8fa4187f6799558d89b271dc8ab6485615
-- name: github.com/tendermint/go-wire/data
-  version: e7fcc6d081ec8518912fcdc103188275f83a3ee5
-- name: github.com/tendermint/tmlibs/db
+- name: github.com/tendermint/go-db
   version: 9643f60bc2578693844aacf380a7c32e4c029fee
-- name: github.com/tendermint/tmlibs/events
-  version: f8ffbfb2be3483e9e7927495590a727f51c0c11f
-- name: github.com/tendermint/go-flowrate
-  version: a20c98e61957faa93b4014fbd902f20ab9317a6a
-  subpackages:
-  - flowrate
-- name: github.com/tendermint/tmlibs/logger
+- name: github.com/tendermint/go-logger
   version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2
 - name: github.com/tendermint/go-merkle
   version: 714d4d04557fd068a7c2a1748241ce8428015a96
-- name: github.com/tendermint/tendermint/p2p
-  version: b5f314ffed65c81bd019ba1dd2bae0e95f3937f3
-  subpackages:
-  - upnp
-- name: github.com/tendermint/tendermint/rpc
-  version: 2c8df0ee6b60d8ac33662df13a4e358c679e02bf
-  subpackages:
-  - client
-  - server
-  - types
 - name: github.com/tendermint/go-wire
   version: 334005c236d19c632fb5f073f9de3b0fab6a522b
   subpackages:
@@ -122,19 +98,18 @@ imports:
   version: ae0f3d6450da9eac7074b439c8e1c3cabf0d5ce6
   subpackages:
   - term
-- name: github.com/tendermint/merkleeyes
-  version: 742c791e1b412ef0f2016a2d53647b58e40c8964
-  subpackages:
-  - app
-  - client
-  - iavl
-  - testutil
 - name: github.com/tendermint/tmlibs
   version: df250b69416a35a943a6e2a92118667e9ef031d4
   subpackages:
+  - autofile
+  - clist
   - common
   - db
+  - events
+  - flowrate
   - logger
+  - merkle
+  - test
 - name: golang.org/x/crypto
   version: 7c6cc321c680f03b9ef0764448e780704f486b51
   subpackages:
@@ -173,4 +148,11 @@ imports:
   - stats
   - tap
   - transport
-testImports: []
+testImports:
+- name: github.com/tendermint/merkleeyes
+  version: 742c791e1b412ef0f2016a2d53647b58e40c8964
+  subpackages:
+  - app
+  - client
+  - iavl
+  - testutil
diff --git a/glide.yaml b/glide.yaml
index b7e24b545..1f4226d13 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -1,56 +1,56 @@
 package: github.com/tendermint/tendermint
 import:
-- package: github.com/tendermint/tmlibs/autofile
-  version: develop
-- package: github.com/tendermint/tmlibs/clist
-  version: develop
-- package: github.com/tendermint/tmlibs/common
-  version: develop
+- package: github.com/ebuchman/fail-test
+- package: github.com/gogo/protobuf
+  subpackages:
+  - proto
+- package: github.com/golang/protobuf
+  subpackages:
+  - proto
+- package: github.com/gorilla/websocket
+- package: github.com/pkg/errors
+- package: github.com/spf13/cobra
+- package: github.com/stretchr/testify
+  subpackages:
+  - require
+- package: github.com/tendermint/abci
+  subpackages:
+  - client
+  - example/dummy
+  - types
 - package: github.com/tendermint/go-config
   version: develop
 - package: github.com/tendermint/go-crypto
   version: develop
-- package: github.com/tendermint/go-wire/data
-  version: develop
-- package: github.com/tendermint/tmlibs/db
-  version: develop
-- package: github.com/tendermint/tmlibs/events
-  version: develop
-- package: github.com/tendermint/tmlibs/logger
-  version: develop
-- package: github.com/tendermint/go-merkle
-  version: develop
-- package: github.com/tendermint/tendermint/p2p
-  version: unstable
-- package: github.com/tendermint/tendermint/rpc
-  version: develop
 - package: github.com/tendermint/go-wire
   version: develop
-- package: github.com/tendermint/abci
-  version: develop
-- package: github.com/tendermint/go-flowrate
+  subpackages:
+  - data
 - package: github.com/tendermint/log15
-- package: github.com/tendermint/ed25519
-- package: github.com/tendermint/merkleeyes
+- package: github.com/tendermint/tmlibs
   version: develop
   subpackages:
-  - app
-- package: github.com/gogo/protobuf
-  version: ^0.3
-  subpackages:
-  - proto
-- package: github.com/gorilla/websocket
-  version: ^1.1.0
-- package: github.com/spf13/cobra
-- package: github.com/spf13/pflag
-- package: github.com/pkg/errors
-  version: ^0.8.0
+  - autofile
+  - clist
+  - common
+  - db
+  - events
+  - flowrate
+  - logger
+  - merkle
 - package: golang.org/x/crypto
   subpackages:
+  - nacl/box
+  - nacl/secretbox
   - ripemd160
+- package: golang.org/x/net
+  subpackages:
+  - context
+- package: google.golang.org/grpc
 testImport:
-- package: github.com/stretchr/testify
-  version: ^1.1.4
+- package: github.com/tendermint/merkleeyes
+  version: develop
   subpackages:
-  - assert
-  - require
+  - app
+  - iavl
+  - testutil