Overall, adding new directory called app/ for Android Studio builds. Cleaning up to remove commented out Switch.