moves Request and Query factory method to the classes
moves request creation into the client