Fix error in previous commit
General cleanup
Add new files from previous commit to VS projects