Small updates. Primarily some renaming / reorganizing.