#18 Renamed package to make it consistent with group id