Epic rearrangement for current Android Studio + gradle