Moved overworld/state to separate files. Renamed them too.