Query.qll
This commit in itself makes everything break, but should make it easy to follow the overall changes being made.