moved proxy to more appropriate package