Clean up of the MSBuild target files and solution dependencies refactoring