restructuring plugins #2