Include missing projects for each sln file
Apply CR
Fix config names
Merge pull request #2602 from ogail/restructure

Include missing projects for each sln file