Move request function into Client
Rename request unit to Client