Readme and directory naming changes per pull request feedback.