Change Log

- Name space Name Changes
- Preparations to merge client with Serve
- Assembly Changes