Move the remaining examples to the new format