Reorganize plugins