file renames and cleanup