Combine server with client
Remove server from master
Update to pass new client what it needs