Refactor proxies under Proxy namespace