Feature/2616 separate soledad into client and server 2