Renamed the groupId and the packages to suit the OSS policy