minor refactor csproj organization