Simplified master server client code. Several class renames.