diff --git a/CHANGELOG.md b/CHANGELOG.md
index 235c566ff8..3072e5367a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -101,6 +101,7 @@ generalized genesis accounts through the `GenesisAccount` interface.
 caching through `CommitKVStoreCacheManager`. Any application wishing to utilize an inter-block cache
 must set it in their app via a `BaseApp` option. The `BaseApp` docs have been drastically improved
 to detail this new feature and how state transitions occur.
+* (docs/spec) All module specs moved into their respective module dir in x/ (i.e. docs/spec/staking -->> x/staking/spec)
 
 ### Bug Fixes
 
diff --git a/docs/spec/auth/01_concepts.md b/x/auth/spec/01_concepts.md
similarity index 100%
rename from docs/spec/auth/01_concepts.md
rename to x/auth/spec/01_concepts.md
diff --git a/docs/spec/auth/02_state.md b/x/auth/spec/02_state.md
similarity index 100%
rename from docs/spec/auth/02_state.md
rename to x/auth/spec/02_state.md
diff --git a/docs/spec/auth/03_messages.md b/x/auth/spec/03_messages.md
similarity index 100%
rename from docs/spec/auth/03_messages.md
rename to x/auth/spec/03_messages.md
diff --git a/docs/spec/auth/03_types.md b/x/auth/spec/03_types.md
similarity index 100%
rename from docs/spec/auth/03_types.md
rename to x/auth/spec/03_types.md
diff --git a/docs/spec/auth/04_keepers.md b/x/auth/spec/04_keepers.md
similarity index 100%
rename from docs/spec/auth/04_keepers.md
rename to x/auth/spec/04_keepers.md
diff --git a/docs/spec/auth/05_vesting.md b/x/auth/spec/05_vesting.md
similarity index 100%
rename from docs/spec/auth/05_vesting.md
rename to x/auth/spec/05_vesting.md
diff --git a/docs/spec/auth/07_params.md b/x/auth/spec/07_params.md
similarity index 100%
rename from docs/spec/auth/07_params.md
rename to x/auth/spec/07_params.md
diff --git a/docs/spec/auth/README.md b/x/auth/spec/README.md
similarity index 100%
rename from docs/spec/auth/README.md
rename to x/auth/spec/README.md
diff --git a/docs/spec/bank/01_state.md b/x/bank/spec/01_state.md
similarity index 100%
rename from docs/spec/bank/01_state.md
rename to x/bank/spec/01_state.md
diff --git a/docs/spec/bank/02_keepers.md b/x/bank/spec/02_keepers.md
similarity index 100%
rename from docs/spec/bank/02_keepers.md
rename to x/bank/spec/02_keepers.md
diff --git a/docs/spec/bank/03_messages.md b/x/bank/spec/03_messages.md
similarity index 100%
rename from docs/spec/bank/03_messages.md
rename to x/bank/spec/03_messages.md
diff --git a/docs/spec/bank/04_events.md b/x/bank/spec/04_events.md
similarity index 100%
rename from docs/spec/bank/04_events.md
rename to x/bank/spec/04_events.md
diff --git a/docs/spec/bank/05_params.md b/x/bank/spec/05_params.md
similarity index 100%
rename from docs/spec/bank/05_params.md
rename to x/bank/spec/05_params.md
diff --git a/docs/spec/bank/README.md b/x/bank/spec/README.md
similarity index 100%
rename from docs/spec/bank/README.md
rename to x/bank/spec/README.md
diff --git a/docs/spec/crisis/01_state.md b/x/crisis/spec/01_state.md
similarity index 100%
rename from docs/spec/crisis/01_state.md
rename to x/crisis/spec/01_state.md
diff --git a/docs/spec/crisis/02_messages.md b/x/crisis/spec/02_messages.md
similarity index 100%
rename from docs/spec/crisis/02_messages.md
rename to x/crisis/spec/02_messages.md
diff --git a/docs/spec/crisis/03_events.md b/x/crisis/spec/03_events.md
similarity index 100%
rename from docs/spec/crisis/03_events.md
rename to x/crisis/spec/03_events.md
diff --git a/docs/spec/crisis/04_params.md b/x/crisis/spec/04_params.md
similarity index 100%
rename from docs/spec/crisis/04_params.md
rename to x/crisis/spec/04_params.md
diff --git a/docs/spec/crisis/README.md b/x/crisis/spec/README.md
similarity index 100%
rename from docs/spec/crisis/README.md
rename to x/crisis/spec/README.md
diff --git a/docs/spec/distribution/01_concepts.md b/x/distribution/spec/01_concepts.md
similarity index 100%
rename from docs/spec/distribution/01_concepts.md
rename to x/distribution/spec/01_concepts.md
diff --git a/docs/spec/distribution/02_state.md b/x/distribution/spec/02_state.md
similarity index 100%
rename from docs/spec/distribution/02_state.md
rename to x/distribution/spec/02_state.md
diff --git a/docs/spec/distribution/03_end_block.md b/x/distribution/spec/03_end_block.md
similarity index 100%
rename from docs/spec/distribution/03_end_block.md
rename to x/distribution/spec/03_end_block.md
diff --git a/docs/spec/distribution/04_messages.md b/x/distribution/spec/04_messages.md
similarity index 100%
rename from docs/spec/distribution/04_messages.md
rename to x/distribution/spec/04_messages.md
diff --git a/docs/spec/distribution/05_hooks.md b/x/distribution/spec/05_hooks.md
similarity index 100%
rename from docs/spec/distribution/05_hooks.md
rename to x/distribution/spec/05_hooks.md
diff --git a/docs/spec/distribution/06_events.md b/x/distribution/spec/06_events.md
similarity index 100%
rename from docs/spec/distribution/06_events.md
rename to x/distribution/spec/06_events.md
diff --git a/docs/spec/distribution/07_params.md b/x/distribution/spec/07_params.md
similarity index 100%
rename from docs/spec/distribution/07_params.md
rename to x/distribution/spec/07_params.md
diff --git a/docs/spec/distribution/README.md b/x/distribution/spec/README.md
similarity index 100%
rename from docs/spec/distribution/README.md
rename to x/distribution/spec/README.md
diff --git a/docs/spec/governance/01_concepts.md b/x/gov/spec/01_concepts.md
similarity index 100%
rename from docs/spec/governance/01_concepts.md
rename to x/gov/spec/01_concepts.md
diff --git a/docs/spec/governance/02_state.md b/x/gov/spec/02_state.md
similarity index 100%
rename from docs/spec/governance/02_state.md
rename to x/gov/spec/02_state.md
diff --git a/docs/spec/governance/03_messages.md b/x/gov/spec/03_messages.md
similarity index 100%
rename from docs/spec/governance/03_messages.md
rename to x/gov/spec/03_messages.md
diff --git a/docs/spec/governance/04_events.md b/x/gov/spec/04_events.md
similarity index 100%
rename from docs/spec/governance/04_events.md
rename to x/gov/spec/04_events.md
diff --git a/docs/spec/governance/05_future_improvements.md b/x/gov/spec/05_future_improvements.md
similarity index 100%
rename from docs/spec/governance/05_future_improvements.md
rename to x/gov/spec/05_future_improvements.md
diff --git a/docs/spec/governance/06_params.md b/x/gov/spec/06_params.md
similarity index 100%
rename from docs/spec/governance/06_params.md
rename to x/gov/spec/06_params.md
diff --git a/docs/spec/governance/README.md b/x/gov/spec/README.md
similarity index 100%
rename from docs/spec/governance/README.md
rename to x/gov/spec/README.md
diff --git a/docs/spec/mint/01_concepts.md b/x/mint/spec/01_concepts.md
similarity index 100%
rename from docs/spec/mint/01_concepts.md
rename to x/mint/spec/01_concepts.md
diff --git a/docs/spec/mint/02_state.md b/x/mint/spec/02_state.md
similarity index 100%
rename from docs/spec/mint/02_state.md
rename to x/mint/spec/02_state.md
diff --git a/docs/spec/mint/03_begin_block.md b/x/mint/spec/03_begin_block.md
similarity index 100%
rename from docs/spec/mint/03_begin_block.md
rename to x/mint/spec/03_begin_block.md
diff --git a/docs/spec/mint/04_params.md b/x/mint/spec/04_params.md
similarity index 100%
rename from docs/spec/mint/04_params.md
rename to x/mint/spec/04_params.md
diff --git a/docs/spec/mint/05_events.md b/x/mint/spec/05_events.md
similarity index 100%
rename from docs/spec/mint/05_events.md
rename to x/mint/spec/05_events.md
diff --git a/docs/spec/mint/README.md b/x/mint/spec/README.md
similarity index 100%
rename from docs/spec/mint/README.md
rename to x/mint/spec/README.md
diff --git a/docs/spec/nft/01_concepts.md b/x/nft/spec/01_concepts.md
similarity index 100%
rename from docs/spec/nft/01_concepts.md
rename to x/nft/spec/01_concepts.md
diff --git a/docs/spec/nft/02_state.md b/x/nft/spec/02_state.md
similarity index 100%
rename from docs/spec/nft/02_state.md
rename to x/nft/spec/02_state.md
diff --git a/docs/spec/nft/03_messages.md b/x/nft/spec/03_messages.md
similarity index 100%
rename from docs/spec/nft/03_messages.md
rename to x/nft/spec/03_messages.md
diff --git a/docs/spec/nft/04_events.md b/x/nft/spec/04_events.md
similarity index 100%
rename from docs/spec/nft/04_events.md
rename to x/nft/spec/04_events.md
diff --git a/docs/spec/nft/05_future_improvements.md b/x/nft/spec/05_future_improvements.md
similarity index 100%
rename from docs/spec/nft/05_future_improvements.md
rename to x/nft/spec/05_future_improvements.md
diff --git a/docs/spec/nft/06_appendix.md b/x/nft/spec/06_appendix.md
similarity index 100%
rename from docs/spec/nft/06_appendix.md
rename to x/nft/spec/06_appendix.md
diff --git a/docs/spec/nft/README.md b/x/nft/spec/README.md
similarity index 100%
rename from docs/spec/nft/README.md
rename to x/nft/spec/README.md
diff --git a/docs/spec/params/01_keeper.md b/x/params/spec/01_keeper.md
similarity index 100%
rename from docs/spec/params/01_keeper.md
rename to x/params/spec/01_keeper.md
diff --git a/docs/spec/params/02_subspace.md b/x/params/spec/02_subspace.md
similarity index 100%
rename from docs/spec/params/02_subspace.md
rename to x/params/spec/02_subspace.md
diff --git a/docs/spec/params/README.md b/x/params/spec/README.md
similarity index 100%
rename from docs/spec/params/README.md
rename to x/params/spec/README.md
diff --git a/docs/spec/slashing/01_concepts.md b/x/slashing/spec/01_concepts.md
similarity index 100%
rename from docs/spec/slashing/01_concepts.md
rename to x/slashing/spec/01_concepts.md
diff --git a/docs/spec/slashing/02_state.md b/x/slashing/spec/02_state.md
similarity index 100%
rename from docs/spec/slashing/02_state.md
rename to x/slashing/spec/02_state.md
diff --git a/docs/spec/slashing/03_messages.md b/x/slashing/spec/03_messages.md
similarity index 100%
rename from docs/spec/slashing/03_messages.md
rename to x/slashing/spec/03_messages.md
diff --git a/docs/spec/slashing/04_begin_block.md b/x/slashing/spec/04_begin_block.md
similarity index 100%
rename from docs/spec/slashing/04_begin_block.md
rename to x/slashing/spec/04_begin_block.md
diff --git a/docs/spec/slashing/05_hooks.md b/x/slashing/spec/05_hooks.md
similarity index 100%
rename from docs/spec/slashing/05_hooks.md
rename to x/slashing/spec/05_hooks.md
diff --git a/docs/spec/slashing/06_events.md b/x/slashing/spec/06_events.md
similarity index 100%
rename from docs/spec/slashing/06_events.md
rename to x/slashing/spec/06_events.md
diff --git a/docs/spec/slashing/07_tombstone.md b/x/slashing/spec/07_tombstone.md
similarity index 100%
rename from docs/spec/slashing/07_tombstone.md
rename to x/slashing/spec/07_tombstone.md
diff --git a/docs/spec/slashing/08_params.md b/x/slashing/spec/08_params.md
similarity index 100%
rename from docs/spec/slashing/08_params.md
rename to x/slashing/spec/08_params.md
diff --git a/docs/spec/slashing/README.md b/x/slashing/spec/README.md
similarity index 100%
rename from docs/spec/slashing/README.md
rename to x/slashing/spec/README.md
diff --git a/docs/spec/staking/01_state.md b/x/staking/spec/01_state.md
similarity index 100%
rename from docs/spec/staking/01_state.md
rename to x/staking/spec/01_state.md
diff --git a/docs/spec/staking/02_state_transitions.md b/x/staking/spec/02_state_transitions.md
similarity index 100%
rename from docs/spec/staking/02_state_transitions.md
rename to x/staking/spec/02_state_transitions.md
diff --git a/docs/spec/staking/03_messages.md b/x/staking/spec/03_messages.md
similarity index 100%
rename from docs/spec/staking/03_messages.md
rename to x/staking/spec/03_messages.md
diff --git a/docs/spec/staking/04_end_block.md b/x/staking/spec/04_end_block.md
similarity index 100%
rename from docs/spec/staking/04_end_block.md
rename to x/staking/spec/04_end_block.md
diff --git a/docs/spec/staking/05_hooks.md b/x/staking/spec/05_hooks.md
similarity index 100%
rename from docs/spec/staking/05_hooks.md
rename to x/staking/spec/05_hooks.md
diff --git a/docs/spec/staking/06_events.md b/x/staking/spec/06_events.md
similarity index 100%
rename from docs/spec/staking/06_events.md
rename to x/staking/spec/06_events.md
diff --git a/docs/spec/staking/07_params.md b/x/staking/spec/07_params.md
similarity index 100%
rename from docs/spec/staking/07_params.md
rename to x/staking/spec/07_params.md
diff --git a/docs/spec/staking/README.md b/x/staking/spec/README.md
similarity index 100%
rename from docs/spec/staking/README.md
rename to x/staking/spec/README.md
diff --git a/docs/spec/supply/01_concepts.md b/x/supply/spec/01_concepts.md
similarity index 100%
rename from docs/spec/supply/01_concepts.md
rename to x/supply/spec/01_concepts.md
diff --git a/docs/spec/supply/02_state.md b/x/supply/spec/02_state.md
similarity index 100%
rename from docs/spec/supply/02_state.md
rename to x/supply/spec/02_state.md
diff --git a/docs/spec/supply/03_future_improvements.md b/x/supply/spec/03_future_improvements.md
similarity index 100%
rename from docs/spec/supply/03_future_improvements.md
rename to x/supply/spec/03_future_improvements.md
diff --git a/docs/spec/supply/README.md b/x/supply/spec/README.md
similarity index 100%
rename from docs/spec/supply/README.md
rename to x/supply/spec/README.md