Move server params to xml
Refactor and inject HttpClient