Add in gradle and fix main package name