refactor to Android Studio structure