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

Refs #6798