diff --git a/Cargo.toml b/Cargo.toml
index a7921321d..40857dd30 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,59 +1,5 @@
-[package]
-name       = "tendermint"
-version    = "0.10.0" # Also update `html_root_url` in lib.rs when bumping this
-license    = "Apache-2.0"
-homepage   = "https://www.tendermint.com/"
-repository = "https://github.com/tendermint/kms/tree/master/crates/tendermint"
-readme     = "README.md"
-categories = ["cryptography", "database"]
-keywords   = ["blockchain", "bft", "consensus", "cosmos", "tendermint"]
-edition    = "2018"
+[workspace]
 
-description = """
-    Tendermint is a high-performance blockchain consensus engine that powers
-    Byzantine fault tolerant applications written in any programming language.
-    This crate provides core types for representing information about Tendermint
-    blockchain networks, including chain information types, secret connections,
-    and remote procedure calls (JSONRPC).
-    """
-
-authors = [
-    "Ismail Khoffi <Ismail.Khoffi@gmail.com>",
-    "ValarDragon <dojha12@gmail.com>",
-    "Tony Arcieri <tony@iqlusion.io>",
-    "Thane Thomson <thane@interchain.io>"
+members = [
+    "tendermint",
 ]
-
-[badges]
-circle-ci = { repository = "tendermint/kms" }
-
-[dependencies]
-byteorder = { version = "1.2" }
-bytes = "0.4"
-chrono = { version = "0.4", features = ["serde"] }
-digest = "0.8"
-failure = "0.1"
-hkdf = { version = "0.7" }
-hyper = { version = "0.10" }
-prost-amino = { version = "0.4.0" }
-prost-amino-derive = { version = "0.4.0" }
-rand_os = { version = "0.1" }
-ring = { version = "0.14" }
-serde = { version = "1", features = ["derive"] }
-serde_json = { version = "1" }
-signatory = { version = "0.12", features = ["ed25519", "ecdsa"] }
-signatory-dalek = { version = "0.12" }
-sha2 = { version = "0.8", default-features = false }
-subtle = "2"
-subtle-encoding = { version = "0.3", features = ["bech32-preview"] }
-tai64 = { version = "2", features = ["chrono"] }
-toml = { version = "0.5" }
-uuid = { version = "0.7", default-features = false }
-x25519-dalek = { version = "0.5", default-features = false, features = ["u64_backend"] }
-zeroize = { version = "0.9" }
-
-[dev-dependencies]
-serde_json = "1"
-
-[package.metadata.docs.rs]
-all-features = true
diff --git a/tendermint/Cargo.toml b/tendermint/Cargo.toml
new file mode 100644
index 000000000..a7921321d
--- /dev/null
+++ b/tendermint/Cargo.toml
@@ -0,0 +1,59 @@
+[package]
+name       = "tendermint"
+version    = "0.10.0" # Also update `html_root_url` in lib.rs when bumping this
+license    = "Apache-2.0"
+homepage   = "https://www.tendermint.com/"
+repository = "https://github.com/tendermint/kms/tree/master/crates/tendermint"
+readme     = "README.md"
+categories = ["cryptography", "database"]
+keywords   = ["blockchain", "bft", "consensus", "cosmos", "tendermint"]
+edition    = "2018"
+
+description = """
+    Tendermint is a high-performance blockchain consensus engine that powers
+    Byzantine fault tolerant applications written in any programming language.
+    This crate provides core types for representing information about Tendermint
+    blockchain networks, including chain information types, secret connections,
+    and remote procedure calls (JSONRPC).
+    """
+
+authors = [
+    "Ismail Khoffi <Ismail.Khoffi@gmail.com>",
+    "ValarDragon <dojha12@gmail.com>",
+    "Tony Arcieri <tony@iqlusion.io>",
+    "Thane Thomson <thane@interchain.io>"
+]
+
+[badges]
+circle-ci = { repository = "tendermint/kms" }
+
+[dependencies]
+byteorder = { version = "1.2" }
+bytes = "0.4"
+chrono = { version = "0.4", features = ["serde"] }
+digest = "0.8"
+failure = "0.1"
+hkdf = { version = "0.7" }
+hyper = { version = "0.10" }
+prost-amino = { version = "0.4.0" }
+prost-amino-derive = { version = "0.4.0" }
+rand_os = { version = "0.1" }
+ring = { version = "0.14" }
+serde = { version = "1", features = ["derive"] }
+serde_json = { version = "1" }
+signatory = { version = "0.12", features = ["ed25519", "ecdsa"] }
+signatory-dalek = { version = "0.12" }
+sha2 = { version = "0.8", default-features = false }
+subtle = "2"
+subtle-encoding = { version = "0.3", features = ["bech32-preview"] }
+tai64 = { version = "2", features = ["chrono"] }
+toml = { version = "0.5" }
+uuid = { version = "0.7", default-features = false }
+x25519-dalek = { version = "0.5", default-features = false, features = ["u64_backend"] }
+zeroize = { version = "0.9" }
+
+[dev-dependencies]
+serde_json = "1"
+
+[package.metadata.docs.rs]
+all-features = true
diff --git a/src/abci.rs b/tendermint/src/abci.rs
similarity index 100%
rename from src/abci.rs
rename to tendermint/src/abci.rs
diff --git a/src/abci/code.rs b/tendermint/src/abci/code.rs
similarity index 100%
rename from src/abci/code.rs
rename to tendermint/src/abci/code.rs
diff --git a/src/abci/data.rs b/tendermint/src/abci/data.rs
similarity index 100%
rename from src/abci/data.rs
rename to tendermint/src/abci/data.rs
diff --git a/src/abci/gas.rs b/tendermint/src/abci/gas.rs
similarity index 100%
rename from src/abci/gas.rs
rename to tendermint/src/abci/gas.rs
diff --git a/src/abci/info.rs b/tendermint/src/abci/info.rs
similarity index 100%
rename from src/abci/info.rs
rename to tendermint/src/abci/info.rs
diff --git a/src/abci/log.rs b/tendermint/src/abci/log.rs
similarity index 100%
rename from src/abci/log.rs
rename to tendermint/src/abci/log.rs
diff --git a/src/abci/path.rs b/tendermint/src/abci/path.rs
similarity index 100%
rename from src/abci/path.rs
rename to tendermint/src/abci/path.rs
diff --git a/src/abci/proof.rs b/tendermint/src/abci/proof.rs
similarity index 100%
rename from src/abci/proof.rs
rename to tendermint/src/abci/proof.rs
diff --git a/src/abci/responses.rs b/tendermint/src/abci/responses.rs
similarity index 100%
rename from src/abci/responses.rs
rename to tendermint/src/abci/responses.rs
diff --git a/src/abci/tag.rs b/tendermint/src/abci/tag.rs
similarity index 100%
rename from src/abci/tag.rs
rename to tendermint/src/abci/tag.rs
diff --git a/src/abci/transaction.rs b/tendermint/src/abci/transaction.rs
similarity index 100%
rename from src/abci/transaction.rs
rename to tendermint/src/abci/transaction.rs
diff --git a/src/abci/transaction/hash.rs b/tendermint/src/abci/transaction/hash.rs
similarity index 100%
rename from src/abci/transaction/hash.rs
rename to tendermint/src/abci/transaction/hash.rs
diff --git a/src/account.rs b/tendermint/src/account.rs
similarity index 100%
rename from src/account.rs
rename to tendermint/src/account.rs
diff --git a/src/amino_types.rs b/tendermint/src/amino_types.rs
similarity index 100%
rename from src/amino_types.rs
rename to tendermint/src/amino_types.rs
diff --git a/src/amino_types/block_id.rs b/tendermint/src/amino_types/block_id.rs
similarity index 100%
rename from src/amino_types/block_id.rs
rename to tendermint/src/amino_types/block_id.rs
diff --git a/src/amino_types/ed25519.rs b/tendermint/src/amino_types/ed25519.rs
similarity index 100%
rename from src/amino_types/ed25519.rs
rename to tendermint/src/amino_types/ed25519.rs
diff --git a/src/amino_types/ping.rs b/tendermint/src/amino_types/ping.rs
similarity index 100%
rename from src/amino_types/ping.rs
rename to tendermint/src/amino_types/ping.rs
diff --git a/src/amino_types/proposal.rs b/tendermint/src/amino_types/proposal.rs
similarity index 100%
rename from src/amino_types/proposal.rs
rename to tendermint/src/amino_types/proposal.rs
diff --git a/src/amino_types/remote_error.rs b/tendermint/src/amino_types/remote_error.rs
similarity index 100%
rename from src/amino_types/remote_error.rs
rename to tendermint/src/amino_types/remote_error.rs
diff --git a/src/amino_types/secret_connection.rs b/tendermint/src/amino_types/secret_connection.rs
similarity index 100%
rename from src/amino_types/secret_connection.rs
rename to tendermint/src/amino_types/secret_connection.rs
diff --git a/src/amino_types/signature.rs b/tendermint/src/amino_types/signature.rs
similarity index 100%
rename from src/amino_types/signature.rs
rename to tendermint/src/amino_types/signature.rs
diff --git a/src/amino_types/time.rs b/tendermint/src/amino_types/time.rs
similarity index 100%
rename from src/amino_types/time.rs
rename to tendermint/src/amino_types/time.rs
diff --git a/src/amino_types/validate.rs b/tendermint/src/amino_types/validate.rs
similarity index 100%
rename from src/amino_types/validate.rs
rename to tendermint/src/amino_types/validate.rs
diff --git a/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
similarity index 100%
rename from src/amino_types/vote.rs
rename to tendermint/src/amino_types/vote.rs
diff --git a/src/block.rs b/tendermint/src/block.rs
similarity index 100%
rename from src/block.rs
rename to tendermint/src/block.rs
diff --git a/src/block/commit.rs b/tendermint/src/block/commit.rs
similarity index 100%
rename from src/block/commit.rs
rename to tendermint/src/block/commit.rs
diff --git a/src/block/header.rs b/tendermint/src/block/header.rs
similarity index 100%
rename from src/block/header.rs
rename to tendermint/src/block/header.rs
diff --git a/src/block/height.rs b/tendermint/src/block/height.rs
similarity index 100%
rename from src/block/height.rs
rename to tendermint/src/block/height.rs
diff --git a/src/block/id.rs b/tendermint/src/block/id.rs
similarity index 100%
rename from src/block/id.rs
rename to tendermint/src/block/id.rs
diff --git a/src/block/meta.rs b/tendermint/src/block/meta.rs
similarity index 100%
rename from src/block/meta.rs
rename to tendermint/src/block/meta.rs
diff --git a/src/block/parts.rs b/tendermint/src/block/parts.rs
similarity index 100%
rename from src/block/parts.rs
rename to tendermint/src/block/parts.rs
diff --git a/src/block/size.rs b/tendermint/src/block/size.rs
similarity index 100%
rename from src/block/size.rs
rename to tendermint/src/block/size.rs
diff --git a/src/chain.rs b/tendermint/src/chain.rs
similarity index 100%
rename from src/chain.rs
rename to tendermint/src/chain.rs
diff --git a/src/chain/id.rs b/tendermint/src/chain/id.rs
similarity index 100%
rename from src/chain/id.rs
rename to tendermint/src/chain/id.rs
diff --git a/src/chain/info.rs b/tendermint/src/chain/info.rs
similarity index 100%
rename from src/chain/info.rs
rename to tendermint/src/chain/info.rs
diff --git a/src/channel.rs b/tendermint/src/channel.rs
similarity index 100%
rename from src/channel.rs
rename to tendermint/src/channel.rs
diff --git a/src/channel/id.rs b/tendermint/src/channel/id.rs
similarity index 100%
rename from src/channel/id.rs
rename to tendermint/src/channel/id.rs
diff --git a/src/config.rs b/tendermint/src/config.rs
similarity index 100%
rename from src/config.rs
rename to tendermint/src/config.rs
diff --git a/src/config/node_key.rs b/tendermint/src/config/node_key.rs
similarity index 100%
rename from src/config/node_key.rs
rename to tendermint/src/config/node_key.rs
diff --git a/src/config/priv_validator_key.rs b/tendermint/src/config/priv_validator_key.rs
similarity index 100%
rename from src/config/priv_validator_key.rs
rename to tendermint/src/config/priv_validator_key.rs
diff --git a/src/consensus.rs b/tendermint/src/consensus.rs
similarity index 100%
rename from src/consensus.rs
rename to tendermint/src/consensus.rs
diff --git a/src/consensus/params.rs b/tendermint/src/consensus/params.rs
similarity index 100%
rename from src/consensus/params.rs
rename to tendermint/src/consensus/params.rs
diff --git a/src/consensus/state.rs b/tendermint/src/consensus/state.rs
similarity index 100%
rename from src/consensus/state.rs
rename to tendermint/src/consensus/state.rs
diff --git a/src/error.rs b/tendermint/src/error.rs
similarity index 100%
rename from src/error.rs
rename to tendermint/src/error.rs
diff --git a/src/evidence.rs b/tendermint/src/evidence.rs
similarity index 100%
rename from src/evidence.rs
rename to tendermint/src/evidence.rs
diff --git a/src/genesis.rs b/tendermint/src/genesis.rs
similarity index 100%
rename from src/genesis.rs
rename to tendermint/src/genesis.rs
diff --git a/src/hash.rs b/tendermint/src/hash.rs
similarity index 100%
rename from src/hash.rs
rename to tendermint/src/hash.rs
diff --git a/src/lib.rs b/tendermint/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to tendermint/src/lib.rs
diff --git a/src/merkle.rs b/tendermint/src/merkle.rs
similarity index 100%
rename from src/merkle.rs
rename to tendermint/src/merkle.rs
diff --git a/src/moniker.rs b/tendermint/src/moniker.rs
similarity index 100%
rename from src/moniker.rs
rename to tendermint/src/moniker.rs
diff --git a/src/net.rs b/tendermint/src/net.rs
similarity index 100%
rename from src/net.rs
rename to tendermint/src/net.rs
diff --git a/src/node.rs b/tendermint/src/node.rs
similarity index 100%
rename from src/node.rs
rename to tendermint/src/node.rs
diff --git a/src/node/id.rs b/tendermint/src/node/id.rs
similarity index 100%
rename from src/node/id.rs
rename to tendermint/src/node/id.rs
diff --git a/src/node/info.rs b/tendermint/src/node/info.rs
similarity index 100%
rename from src/node/info.rs
rename to tendermint/src/node/info.rs
diff --git a/src/private_key.rs b/tendermint/src/private_key.rs
similarity index 100%
rename from src/private_key.rs
rename to tendermint/src/private_key.rs
diff --git a/src/public_key.rs b/tendermint/src/public_key.rs
similarity index 100%
rename from src/public_key.rs
rename to tendermint/src/public_key.rs
diff --git a/src/rpc.rs b/tendermint/src/rpc.rs
similarity index 100%
rename from src/rpc.rs
rename to tendermint/src/rpc.rs
diff --git a/src/rpc/client.rs b/tendermint/src/rpc/client.rs
similarity index 100%
rename from src/rpc/client.rs
rename to tendermint/src/rpc/client.rs
diff --git a/src/rpc/endpoint.rs b/tendermint/src/rpc/endpoint.rs
similarity index 100%
rename from src/rpc/endpoint.rs
rename to tendermint/src/rpc/endpoint.rs
diff --git a/src/rpc/endpoint/abci_info.rs b/tendermint/src/rpc/endpoint/abci_info.rs
similarity index 100%
rename from src/rpc/endpoint/abci_info.rs
rename to tendermint/src/rpc/endpoint/abci_info.rs
diff --git a/src/rpc/endpoint/abci_query.rs b/tendermint/src/rpc/endpoint/abci_query.rs
similarity index 100%
rename from src/rpc/endpoint/abci_query.rs
rename to tendermint/src/rpc/endpoint/abci_query.rs
diff --git a/src/rpc/endpoint/block.rs b/tendermint/src/rpc/endpoint/block.rs
similarity index 100%
rename from src/rpc/endpoint/block.rs
rename to tendermint/src/rpc/endpoint/block.rs
diff --git a/src/rpc/endpoint/block_results.rs b/tendermint/src/rpc/endpoint/block_results.rs
similarity index 100%
rename from src/rpc/endpoint/block_results.rs
rename to tendermint/src/rpc/endpoint/block_results.rs
diff --git a/src/rpc/endpoint/blockchain.rs b/tendermint/src/rpc/endpoint/blockchain.rs
similarity index 100%
rename from src/rpc/endpoint/blockchain.rs
rename to tendermint/src/rpc/endpoint/blockchain.rs
diff --git a/src/rpc/endpoint/broadcast.rs b/tendermint/src/rpc/endpoint/broadcast.rs
similarity index 100%
rename from src/rpc/endpoint/broadcast.rs
rename to tendermint/src/rpc/endpoint/broadcast.rs
diff --git a/src/rpc/endpoint/broadcast/tx_async.rs b/tendermint/src/rpc/endpoint/broadcast/tx_async.rs
similarity index 100%
rename from src/rpc/endpoint/broadcast/tx_async.rs
rename to tendermint/src/rpc/endpoint/broadcast/tx_async.rs
diff --git a/src/rpc/endpoint/broadcast/tx_commit.rs b/tendermint/src/rpc/endpoint/broadcast/tx_commit.rs
similarity index 100%
rename from src/rpc/endpoint/broadcast/tx_commit.rs
rename to tendermint/src/rpc/endpoint/broadcast/tx_commit.rs
diff --git a/src/rpc/endpoint/broadcast/tx_sync.rs b/tendermint/src/rpc/endpoint/broadcast/tx_sync.rs
similarity index 100%
rename from src/rpc/endpoint/broadcast/tx_sync.rs
rename to tendermint/src/rpc/endpoint/broadcast/tx_sync.rs
diff --git a/src/rpc/endpoint/commit.rs b/tendermint/src/rpc/endpoint/commit.rs
similarity index 100%
rename from src/rpc/endpoint/commit.rs
rename to tendermint/src/rpc/endpoint/commit.rs
diff --git a/src/rpc/endpoint/genesis.rs b/tendermint/src/rpc/endpoint/genesis.rs
similarity index 100%
rename from src/rpc/endpoint/genesis.rs
rename to tendermint/src/rpc/endpoint/genesis.rs
diff --git a/src/rpc/endpoint/health.rs b/tendermint/src/rpc/endpoint/health.rs
similarity index 100%
rename from src/rpc/endpoint/health.rs
rename to tendermint/src/rpc/endpoint/health.rs
diff --git a/src/rpc/endpoint/net_info.rs b/tendermint/src/rpc/endpoint/net_info.rs
similarity index 100%
rename from src/rpc/endpoint/net_info.rs
rename to tendermint/src/rpc/endpoint/net_info.rs
diff --git a/src/rpc/endpoint/status.rs b/tendermint/src/rpc/endpoint/status.rs
similarity index 100%
rename from src/rpc/endpoint/status.rs
rename to tendermint/src/rpc/endpoint/status.rs
diff --git a/src/rpc/endpoint/validators.rs b/tendermint/src/rpc/endpoint/validators.rs
similarity index 100%
rename from src/rpc/endpoint/validators.rs
rename to tendermint/src/rpc/endpoint/validators.rs
diff --git a/src/rpc/error.rs b/tendermint/src/rpc/error.rs
similarity index 100%
rename from src/rpc/error.rs
rename to tendermint/src/rpc/error.rs
diff --git a/src/rpc/id.rs b/tendermint/src/rpc/id.rs
similarity index 100%
rename from src/rpc/id.rs
rename to tendermint/src/rpc/id.rs
diff --git a/src/rpc/method.rs b/tendermint/src/rpc/method.rs
similarity index 100%
rename from src/rpc/method.rs
rename to tendermint/src/rpc/method.rs
diff --git a/src/rpc/request.rs b/tendermint/src/rpc/request.rs
similarity index 100%
rename from src/rpc/request.rs
rename to tendermint/src/rpc/request.rs
diff --git a/src/rpc/response.rs b/tendermint/src/rpc/response.rs
similarity index 100%
rename from src/rpc/response.rs
rename to tendermint/src/rpc/response.rs
diff --git a/src/rpc/version.rs b/tendermint/src/rpc/version.rs
similarity index 100%
rename from src/rpc/version.rs
rename to tendermint/src/rpc/version.rs
diff --git a/src/secret_connection.rs b/tendermint/src/secret_connection.rs
similarity index 100%
rename from src/secret_connection.rs
rename to tendermint/src/secret_connection.rs
diff --git a/src/secret_connection/kdf.rs b/tendermint/src/secret_connection/kdf.rs
similarity index 100%
rename from src/secret_connection/kdf.rs
rename to tendermint/src/secret_connection/kdf.rs
diff --git a/src/secret_connection/nonce.rs b/tendermint/src/secret_connection/nonce.rs
similarity index 100%
rename from src/secret_connection/nonce.rs
rename to tendermint/src/secret_connection/nonce.rs
diff --git a/src/secret_connection/public_key.rs b/tendermint/src/secret_connection/public_key.rs
similarity index 100%
rename from src/secret_connection/public_key.rs
rename to tendermint/src/secret_connection/public_key.rs
diff --git a/src/serializers.rs b/tendermint/src/serializers.rs
similarity index 100%
rename from src/serializers.rs
rename to tendermint/src/serializers.rs
diff --git a/src/signature.rs b/tendermint/src/signature.rs
similarity index 100%
rename from src/signature.rs
rename to tendermint/src/signature.rs
diff --git a/src/time.rs b/tendermint/src/time.rs
similarity index 100%
rename from src/time.rs
rename to tendermint/src/time.rs
diff --git a/src/timeout.rs b/tendermint/src/timeout.rs
similarity index 100%
rename from src/timeout.rs
rename to tendermint/src/timeout.rs
diff --git a/src/validator.rs b/tendermint/src/validator.rs
similarity index 100%
rename from src/validator.rs
rename to tendermint/src/validator.rs
diff --git a/src/version.rs b/tendermint/src/version.rs
similarity index 100%
rename from src/version.rs
rename to tendermint/src/version.rs
diff --git a/src/vote.rs b/tendermint/src/vote.rs
similarity index 100%
rename from src/vote.rs
rename to tendermint/src/vote.rs
diff --git a/src/vote/power.rs b/tendermint/src/vote/power.rs
similarity index 100%
rename from src/vote/power.rs
rename to tendermint/src/vote/power.rs