Includes "moving" the directory query API into the same area. This will make more sense once the other query types are specified.