moved files for Android Studio format