Use more consistent directory structure
Merge pull request #382 from twpayne/move-files

Use more consistent directory structure