Rename structs.
Add header file.