Many changes, prior to Android Studio migration