Change groupId
Update to new patchtool format