Added assembly and tried to consolidate packaging of plugin