Rearranged build.gradle