csproj and sln updates

Project and Solution updates to streamline build process