moved client to it's own class, added URI_util lib, basic cleanup