Cleaning up. Add conf options to httpClient. Rebuild simulators structure.