Break out definitions into new files.
checkpoint
Structured refactor.
Interstitial
Checkpoint.