Get simpler/working screenshot code, first cut at reformatting files before screencast