more plugin restructuring