Moved QueryBuilder to the more appropriate place.