Some initial structure and naming cleanup of easy targets