reorganize plugins (refactoring)