Attempt full move to refactored bdist_factory