Update main to reflect restructure

- Remove custom io structs