Moving client side code in client folder