Issue #21: consolidate all bundles