Repackaged stand-alone client. Renamed client and server