Updated gradle files.
Updated.
Refactored.