Rejigged some files