Changed server proj to console app. Cleaned up code
Merged sln file
Removed old projects