Switch many of the files to new six format