refactored client and site, as well as uri builder
to be much cleaner