Move query language packages into query