update to plugin organization