Rename a couple of directories for clarity
Update README.md