Updated README

Also fixed some of the errors with the auto generated files caused by
organizing the projects to upload to github.