Move proxy classes to proxy package