Changed client design
Revert "Changed client design"

This reverts commit 7110c35393ba1dafd826e5ed3f3f405f02554c30.