add query annotator
add annotation consumer
add cpe descriptor
move data to data folder
update type system