update notebook examples with new wrapper usage, re-organize