restructured in preparation for more examples, fixed up image migration