Move PluginContainer to task/plugin