More plugins infrastructure
Cleanups in the plugins sctructure