more reorganization of examples