better import path for Andy's module
fixed up submodule / lib import weirdness, should work.