Big pile of reorganizing to make these more clear where they go.

Apologies to the Git Gods for this horrible commit.