Major plugin restructuring.