cleanup of files and renaming