Housekeeping

A lot of moving and deleting.

(Hey, that rhymes!)