Restructured httpclient library in prep to swithching to new URL implementation.