Plugin system refactoring complete