More structurized plugin structure