Replace old client with new one
previous commit continue with new files