Updates to org and activity code-examples

Should be the final pass....