Mondooo refactor. One more day of this I think.
csproj update