Move optional/system-specific bundles to bundle-opt