Finally brought structures up to the same format.