Reordering some files into a better format