Renaming files; some cleanup