plugin refactor
5 files changed