moves shared classes to the client as these are the only place they're used