Complete server refactoring
Update server csproj
Refactoring
Refactoring