Make diagram of Directory Organization best practice match the text.

The text and playbook content assumed a directory structure that didn't
match the diagram.
Merge pull request #1893 from bct/directory-organization-fix

Make diagram of Directory Organization best practice match the text.