Updated to reflect new main server and client files