Use simpler directory path 

Opened against integration branch as asked in #2273
Merge pull request #2276 from morrisonlevi/patch-3

Use simpler directory path