moved files and added client side
Merge