Upgrade plugin-conditional pieces to separate files