Draft of an idea for the design of annotations
Updated Annotation classes to match the agreed-upon Annotation
hierarchy.