Move individual proxy classes to separate files