More re-org of examples