Enable loading bundles from generic bundle/ directory; remove generic bundles from bundle.json