FIxed resource filtering.
Tidied basedir references.
Path for use in unit tests.