Move Proxy class into its own file