Changed over to Android Studio