Correct a few bugs preventing build. Update Readme files. Remove redundant directory.