Service project added and removed Server project

Service project added and removed Server project
Solution references fixed