changed solution structure

implemented client side partially
changed solution structure