consolidate requirement paths

Hi Paul,

this PR should make file inclusion more robust.

Eric