General cleanup, implementation of Map/Set and HttpClient
General cleanup, implementation of Map/Set and HttpClient