Restructure examples
Update examples for syntax changes