Example directory cleanup

this cleans up the example directory and other places in the library affected by the changes.