Rearrange fields in Agent struct.
Add report structs.