restructure for plugins