Major restructuring of examples