reorganization of client-server interface and file organization