Updated build.gradle
Refactored sources to fit convention