Miscellaneous cleanups and reorgs in preparation for building