chore(annotations): Move annotations logic into an OO service

Refs #6798
Merge pull request #7437 from ewinslow/oo-annotations

chore(annotations): Move annotations logic into an OO service