Reorganize a few things

I learned a little from writing setupext-janitor.  This PR rearranges the source tree to make things cleaner and simpler.