These annotations aren't really utilities ... as such, move these
classes and update references.