More clean-up and some renaming of files