Your license detection is nearly perfect, agreed.  I think it would be nice to uncouple the two though, if it's not too much work, just for consistency sake.  If this is a lot of work, then by all means, don't do it and we'll just link to the package overall instead.