Moving optional structs to the structs section.