Minor update to and restructure of examples