First cut a redesign of projects/annotations models