Add many new bundles

Reorganize bundle grouping etc.