Renamed the packages to the proposed maven coordinates