Allow bundling of multiple separate components

* Switch to bundling multiple components, rather than scanning a root
  including page.

* Improving option handling and CLI tool