WIP
gradle file refactor