Rebuilt Whole Project

To fix the issue with the solution not working when pulled down from
source control the whole project was cleaned up and replaced. The
cleanup is not done, but this is a good start.