Added bits and pieces in Communicator class; reorganization.