Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.
(cherry picked from commit e00f74505c62310bd15aeaba8d6530f648397074)
* Grave digging and decomposition
* fix
* update based on review comments
* code review
* remove unused field
(cherry picked from commit fd7ff690b1ad7b1cf6cd62deba3076684e3e9282)