Direct plug-in refactoring to common plug-in