Issue #12: further changes to support updates to repo structure