Split out files and some renames