Some changes and refactorings
Update README

Including some cleanup of old non-source files.