restructured plugin