remove Query.java and its descriptor
add query concept annotator
add query doc annotator
add query triple annotator
add aae
update the cpe
update AAE
update annotators