Repackage
Improved gradle files