Moved some client related classes