Merged client and server to clientserver