Finished restructuring the Client request functions

Signed-off-by: James Furey <james.p.furey@hotmail.com>