Updated examples to new structure.