(chore) [WIP] Removed inner state concept - all state properties now at root of each store