renaming the files, cleanup