Change structs a bit.
Back to the roots with some additions.