Refactored to include .sln and .csproj