add cosmic annotator + refactoring and bug fixing of annotator classes