Merged into two projects; client server changed, interfaces better
implemented