Moved HttpClientFactory and HttpContextFactory to the utils package