renamed and restructured proxies a little bit