Changed folder format to match Android Studio
modified for Android Studio