move common query objects to their own dir, in anticipation of top-level interfaces