Add (c), change example into class per file w/hdrs, fix xcomp break.