Remove unused classes
Almost there
File support in Client
File entities working