Breakout heads into their own data structures.
30 files changed