Minor client restructure