Separate files via structs.

Impact: Trivial.