Ensure local directory hierarchy (suspect there is a better way).
Merge pull request #81 from sw1nn/master

Ensure local directory hierarchy (suspect there is a better way).