Solution restructuring

Restructured solution to Client, Server and Shared.  No code change