diff --git a/gaia/app/app.go b/app/app.go
similarity index 100%
rename from gaia/app/app.go
rename to app/app.go
diff --git a/gaia/app/app_test.go b/app/app_test.go
similarity index 100%
rename from gaia/app/app_test.go
rename to app/app_test.go
diff --git a/gaia/app/benchmarks/txsize_test.go b/app/benchmarks/txsize_test.go
similarity index 100%
rename from gaia/app/benchmarks/txsize_test.go
rename to app/benchmarks/txsize_test.go
diff --git a/gaia/app/export.go b/app/export.go
similarity index 100%
rename from gaia/app/export.go
rename to app/export.go
diff --git a/gaia/app/genesis.go b/app/genesis.go
similarity index 100%
rename from gaia/app/genesis.go
rename to app/genesis.go
diff --git a/gaia/app/genesis_test.go b/app/genesis_test.go
similarity index 100%
rename from gaia/app/genesis_test.go
rename to app/genesis_test.go
diff --git a/gaia/app/invariants.go b/app/invariants.go
similarity index 100%
rename from gaia/app/invariants.go
rename to app/invariants.go
diff --git a/gaia/app/sim_test.go b/app/sim_test.go
similarity index 100%
rename from gaia/app/sim_test.go
rename to app/sim_test.go
diff --git a/gaia/cmd/gaiacli/main.go b/cmd/gaiacli/main.go
similarity index 100%
rename from gaia/cmd/gaiacli/main.go
rename to cmd/gaiacli/main.go
diff --git a/gaia/cmd/gaiad/main.go b/cmd/gaiad/main.go
similarity index 100%
rename from gaia/cmd/gaiad/main.go
rename to cmd/gaiad/main.go
diff --git a/gaia/init/collect.go b/init/collect.go
similarity index 100%
rename from gaia/init/collect.go
rename to init/collect.go
diff --git a/gaia/init/genesis_accts.go b/init/genesis_accts.go
similarity index 100%
rename from gaia/init/genesis_accts.go
rename to init/genesis_accts.go
diff --git a/gaia/init/genesis_accts_test.go b/init/genesis_accts_test.go
similarity index 100%
rename from gaia/init/genesis_accts_test.go
rename to init/genesis_accts_test.go
diff --git a/gaia/init/gentx.go b/init/gentx.go
similarity index 100%
rename from gaia/init/gentx.go
rename to init/gentx.go
diff --git a/gaia/init/gentx_test.go b/init/gentx_test.go
similarity index 100%
rename from gaia/init/gentx_test.go
rename to init/gentx_test.go
diff --git a/gaia/init/init.go b/init/init.go
similarity index 100%
rename from gaia/init/init.go
rename to init/init.go
diff --git a/gaia/init/init_test.go b/init/init_test.go
similarity index 100%
rename from gaia/init/init_test.go
rename to init/init_test.go
diff --git a/gaia/init/testnet.go b/init/testnet.go
similarity index 100%
rename from gaia/init/testnet.go
rename to init/testnet.go
diff --git a/gaia/init/utils.go b/init/utils.go
similarity index 100%
rename from gaia/init/utils.go
rename to init/utils.go
diff --git a/gaia/init/utils_test.go b/init/utils_test.go
similarity index 100%
rename from gaia/init/utils_test.go
rename to init/utils_test.go
diff --git a/gaia/init/validate_genesis.go b/init/validate_genesis.go
similarity index 100%
rename from gaia/init/validate_genesis.go
rename to init/validate_genesis.go