Minor tweaks

minor file and naming tweaks.