Moved to Android Studio. Also made too many changes at the same time.