Moved annotator tool from species into annotator and fixed some missing references.