Make the directory structure more user-friendly.
Merge pull request #1 from GPHemsley/restructuring

Make the directory structure more user-friendly.