[Task #2797]: plugin refactoring complete