Rename files, repair indents