Moving to client folder