changes to package names, added httpclient