diff --git a/version/version.go b/version/version.go
index 5a018ce069..93bfe2c058 100644
--- a/version/version.go
+++ b/version/version.go
@@ -3,7 +3,7 @@ package version
 
 // when updating these,
 // remember to also update examples/basecoin/tests/cli/rpc.sh
-// ... ugh ....
+// TODO improve
 
 const Maj = "0"
 const Min = "7"
diff --git a/modules/auth/bench_test.go b/x/auth/bench_test.go
similarity index 100%
rename from modules/auth/bench_test.go
rename to x/auth/bench_test.go
diff --git a/modules/auth/commands/wrap.go b/x/auth/commands/wrap.go
similarity index 100%
rename from modules/auth/commands/wrap.go
rename to x/auth/commands/wrap.go
diff --git a/modules/auth/errors.go b/x/auth/errors.go
similarity index 100%
rename from modules/auth/errors.go
rename to x/auth/errors.go
diff --git a/modules/auth/errors_test.go b/x/auth/errors_test.go
similarity index 100%
rename from modules/auth/errors_test.go
rename to x/auth/errors_test.go
diff --git a/modules/auth/helpers_test.go b/x/auth/helpers_test.go
similarity index 100%
rename from modules/auth/helpers_test.go
rename to x/auth/helpers_test.go
diff --git a/modules/auth/signature.go b/x/auth/signature.go
similarity index 100%
rename from modules/auth/signature.go
rename to x/auth/signature.go
diff --git a/modules/auth/signature_test.go b/x/auth/signature_test.go
similarity index 100%
rename from modules/auth/signature_test.go
rename to x/auth/signature_test.go
diff --git a/modules/auth/tx.go b/x/auth/tx.go
similarity index 100%
rename from modules/auth/tx.go
rename to x/auth/tx.go
diff --git a/modules/auth/tx_test.go b/x/auth/tx_test.go
similarity index 100%
rename from modules/auth/tx_test.go
rename to x/auth/tx_test.go
diff --git a/modules/coin/bench_test.go b/x/coin/bench_test.go
similarity index 100%
rename from modules/coin/bench_test.go
rename to x/coin/bench_test.go
diff --git a/modules/coin/coin.go b/x/coin/coin.go
similarity index 100%
rename from modules/coin/coin.go
rename to x/coin/coin.go
diff --git a/modules/coin/coin_test.go b/x/coin/coin_test.go
similarity index 100%
rename from modules/coin/coin_test.go
rename to x/coin/coin_test.go
diff --git a/modules/coin/commands/query.go b/x/coin/commands/query.go
similarity index 100%
rename from modules/coin/commands/query.go
rename to x/coin/commands/query.go
diff --git a/modules/coin/commands/tx.go b/x/coin/commands/tx.go
similarity index 100%
rename from modules/coin/commands/tx.go
rename to x/coin/commands/tx.go
diff --git a/modules/coin/errors.go b/x/coin/errors.go
similarity index 100%
rename from modules/coin/errors.go
rename to x/coin/errors.go
diff --git a/modules/coin/genesis.go b/x/coin/genesis.go
similarity index 100%
rename from modules/coin/genesis.go
rename to x/coin/genesis.go
diff --git a/modules/coin/handler.go b/x/coin/handler.go
similarity index 100%
rename from modules/coin/handler.go
rename to x/coin/handler.go
diff --git a/modules/coin/handler_test.go b/x/coin/handler_test.go
similarity index 100%
rename from modules/coin/handler_test.go
rename to x/coin/handler_test.go
diff --git a/modules/coin/helper.go b/x/coin/helper.go
similarity index 100%
rename from modules/coin/helper.go
rename to x/coin/helper.go
diff --git a/modules/coin/ibc_test.go b/x/coin/ibc_test.go
similarity index 100%
rename from modules/coin/ibc_test.go
rename to x/coin/ibc_test.go
diff --git a/modules/coin/rest/handlers.go b/x/coin/rest/handlers.go
similarity index 100%
rename from modules/coin/rest/handlers.go
rename to x/coin/rest/handlers.go
diff --git a/modules/coin/store.go b/x/coin/store.go
similarity index 100%
rename from modules/coin/store.go
rename to x/coin/store.go
diff --git a/modules/coin/tx.go b/x/coin/tx.go
similarity index 100%
rename from modules/coin/tx.go
rename to x/coin/tx.go
diff --git a/modules/coin/tx_test.go b/x/coin/tx_test.go
similarity index 100%
rename from modules/coin/tx_test.go
rename to x/coin/tx_test.go
diff --git a/modules/eyes/_gen.go b/x/eyes/_gen.go
similarity index 100%
rename from modules/eyes/_gen.go
rename to x/eyes/_gen.go
diff --git a/modules/eyes/commands/query.go b/x/eyes/commands/query.go
similarity index 100%
rename from modules/eyes/commands/query.go
rename to x/eyes/commands/query.go
diff --git a/modules/eyes/commands/tx.go b/x/eyes/commands/tx.go
similarity index 100%
rename from modules/eyes/commands/tx.go
rename to x/eyes/commands/tx.go
diff --git a/modules/eyes/errors.go b/x/eyes/errors.go
similarity index 100%
rename from modules/eyes/errors.go
rename to x/eyes/errors.go
diff --git a/modules/eyes/eyestxinner_wrapper.go b/x/eyes/eyestxinner_wrapper.go
similarity index 100%
rename from modules/eyes/eyestxinner_wrapper.go
rename to x/eyes/eyestxinner_wrapper.go
diff --git a/modules/eyes/handler.go b/x/eyes/handler.go
similarity index 100%
rename from modules/eyes/handler.go
rename to x/eyes/handler.go
diff --git a/modules/eyes/handler_test.go b/x/eyes/handler_test.go
similarity index 100%
rename from modules/eyes/handler_test.go
rename to x/eyes/handler_test.go
diff --git a/modules/eyes/store.go b/x/eyes/store.go
similarity index 100%
rename from modules/eyes/store.go
rename to x/eyes/store.go
diff --git a/modules/eyes/tx.go b/x/eyes/tx.go
similarity index 100%
rename from modules/eyes/tx.go
rename to x/eyes/tx.go
diff --git a/modules/fee/commands/wrap.go b/x/fee/commands/wrap.go
similarity index 100%
rename from modules/fee/commands/wrap.go
rename to x/fee/commands/wrap.go
diff --git a/modules/fee/error_test.go b/x/fee/error_test.go
similarity index 100%
rename from modules/fee/error_test.go
rename to x/fee/error_test.go
diff --git a/modules/fee/errors.go b/x/fee/errors.go
similarity index 100%
rename from modules/fee/errors.go
rename to x/fee/errors.go
diff --git a/modules/fee/handler.go b/x/fee/handler.go
similarity index 100%
rename from modules/fee/handler.go
rename to x/fee/handler.go
diff --git a/modules/fee/handler_test.go b/x/fee/handler_test.go
similarity index 100%
rename from modules/fee/handler_test.go
rename to x/fee/handler_test.go
diff --git a/modules/fee/tx.go b/x/fee/tx.go
similarity index 100%
rename from modules/fee/tx.go
rename to x/fee/tx.go
diff --git a/modules/nonce/commands/query.go b/x/nonce/commands/query.go
similarity index 100%
rename from modules/nonce/commands/query.go
rename to x/nonce/commands/query.go
diff --git a/modules/nonce/commands/wrap.go b/x/nonce/commands/wrap.go
similarity index 100%
rename from modules/nonce/commands/wrap.go
rename to x/nonce/commands/wrap.go
diff --git a/modules/nonce/errors.go b/x/nonce/errors.go
similarity index 100%
rename from modules/nonce/errors.go
rename to x/nonce/errors.go
diff --git a/modules/nonce/replaycheck.go b/x/nonce/replaycheck.go
similarity index 100%
rename from modules/nonce/replaycheck.go
rename to x/nonce/replaycheck.go
diff --git a/modules/nonce/rest/handlers.go b/x/nonce/rest/handlers.go
similarity index 100%
rename from modules/nonce/rest/handlers.go
rename to x/nonce/rest/handlers.go
diff --git a/modules/nonce/store.go b/x/nonce/store.go
similarity index 100%
rename from modules/nonce/store.go
rename to x/nonce/store.go
diff --git a/modules/nonce/tx.go b/x/nonce/tx.go
similarity index 100%
rename from modules/nonce/tx.go
rename to x/nonce/tx.go
diff --git a/modules/nonce/tx_test.go b/x/nonce/tx_test.go
similarity index 100%
rename from modules/nonce/tx_test.go
rename to x/nonce/tx_test.go