Rename Xs_server to Server and Xs_server.Server to Server.Make

Signed-off-by: David Scott <dave.scott@eu.citrix.com>