resturctured packages old annotator -> deprecated  new annotator -> top level