This whole thing was an experiment in the new source format but it is increasingly looking like more trouble than it is worth. Let's just split it up into individual module packages.
I have been tempted to do that for a long time. We'll need to keep the two bundle packages as empty packages for a bit. And I don't think there is any urgency over this. However I would like to keep pkg-components and its current dependents as a backup plan.