Reorganized plugin classes.