Reorganize examples
Update examples for new syntax