Move annotation_features back to Curs.pm