Refactor, plugin management done