Hmmmm. Yeah, I think a `Map[String, BundleDescriptor]` where `BundleDescriptor` is defined as:

```scala
case class BundleDescriptor(name: String, files: List[String], target: Option[String] = None)
```

... would be the best. So, that's essentially your last option except we're wrapping it in a case class. @Shadowfiend This would be a pretty decent structural change. What are your thoughts?