Reorganizing around interface functions, not views/api.