Brown-bag:  Fix botched last-minute refactoring so package is importable.