renaming files and cleaning up