Tidy up the DataUtil and AllQueryEvaluators for consistency, adding licenses, etc