More OO pundler, more flexible lookup for requirements files, more tests