Refactor to stop ze loops of infinity

Annotations now reside in this project to stop dependency loops.
Projects using them will draw them down and merge/shade the annotations
as needed