refactored packages in Annotation library