replacing local Base module directory with factored-out submodule