diff --git a/ethcore/src/account.rs b/ethcore/src/state/account.rs
similarity index 100%
rename from ethcore/src/account.rs
rename to ethcore/src/state/account.rs
diff --git a/ethcore/src/state.rs b/ethcore/src/state/mod.rs
similarity index 100%
rename from ethcore/src/state.rs
rename to ethcore/src/state/mod.rs
diff --git a/ethcore/src/substate.rs b/ethcore/src/state/substate.rs
similarity index 100%
rename from ethcore/src/substate.rs
rename to ethcore/src/state/substate.rs