Moved the proxies into their own package