some cleanup and file renaming