Moved some plugins to bundles.