I'm not particularly happy about having some of these files in multiple bundles, but I don't have a better solution yet either.