Final for today

* A few more organizational changes
* Updated EventsAttribute example to use a wildlife sample