A little cleanup/re-arch in prep for CCC