Reorganized into client,server,shared