Miguel/plugin refactor

Sure, we can do that