Refactor/move client views

Like #744 only into the right branch.