Reorganized plugin  structure