Rename files and cleanup