Refactor Requester into multiple smaller classes
#697
Merged
Requester into multiple smaller classes
#697