Refactor AssemblyPluginController