FIX issue #99: Directory layout variation

BRANCH: pull/issue99
See commit 611b78a9e8bf0990f575c04498c6c457e7059fba