diff --git a/docs/spec/README.md b/docs/spec/README.md
index 12f5525c9..e13e65c1f 100644
--- a/docs/spec/README.md
+++ b/docs/spec/README.md
@@ -10,12 +10,17 @@ please submit them to our [bug bounty](https://tendermint.com/security)!
 
 ## Contents
 
+- [Overview](#overview)
+
 ### Data Structures
 
-- [Overview](#overview)
-- [Encoding and Digests](encoding.md)
-- [Blockchain](blockchain.md)
-- [State](state.md)
+- [Encoding and Digests](./blockchain/encoding.md)
+- [Blockchain](./blockchain/blockchain.md)
+- [State](./blockchain/state.md)
+
+### Consensus Protocol
+
+- TODO
 
 ### P2P and Network Protocols
 
diff --git a/docs/spec/blockchain.md b/docs/spec/blockchain/blockchain.md
similarity index 100%
rename from docs/spec/blockchain.md
rename to docs/spec/blockchain/blockchain.md
diff --git a/docs/spec/encoding.md b/docs/spec/blockchain/encoding.md
similarity index 100%
rename from docs/spec/encoding.md
rename to docs/spec/blockchain/encoding.md
diff --git a/docs/spec/light-client.md b/docs/spec/blockchain/light-client.md
similarity index 100%
rename from docs/spec/light-client.md
rename to docs/spec/blockchain/light-client.md
diff --git a/docs/spec/pre-amino.md b/docs/spec/blockchain/pre-amino.md
similarity index 100%
rename from docs/spec/pre-amino.md
rename to docs/spec/blockchain/pre-amino.md
diff --git a/docs/spec/state.md b/docs/spec/blockchain/state.md
similarity index 100%
rename from docs/spec/state.md
rename to docs/spec/blockchain/state.md
diff --git a/docs/spec/abci.md b/docs/spec/consensus/abci.md
similarity index 100%
rename from docs/spec/abci.md
rename to docs/spec/consensus/abci.md
diff --git a/docs/spec/bft-time.md b/docs/spec/consensus/bft-time.md
similarity index 100%
rename from docs/spec/bft-time.md
rename to docs/spec/consensus/bft-time.md