Yeah, I'd prefer that. But I wasn't sure how to share it between the two sub-packages?