Reorganization of examples