update all files to match final layout