Rearranged for Gradle & android studio