Renamed structs module to state