Modularize plugins