move ProxyService back to its own file