Restructure doco and refine example