Add more structs, move things around a bit