More re-arrangment of plugin bundles