Finally cleaning the repo and getting it all to play nicely with VS