Clean up.

Putting in the files that VS didn't. And removing the ones that VS put
it that it shouldn't have.