Updated to latest structure that Android Studio generates.