diff --git a/.gitignore b/.gitignore index 229b1af6..a40b5543 100755 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,42 @@ /jni/almashot/armeabi-v7a/libalmalib.a /jni/almashot/x86/libalmalib.a /.settings + +.gradle +/local.properties +/.idea/workspace.xml +.DS_Store + +# built application files +*.apk +*.ap_ + +# files for the dex VM +*.dex + +# Java class files +*.class + +# generated files +bin/ +gen/ +/app/src/main/obj +/app/src/main/libs + +# Local configuration file (sdk path, etc) +local.properties + +# Eclipse project files +.classpath +.project + +# Proguard folder generated by Eclipse +proguard/ + +# Intellij project files +*.iml +*.ipr +*.iws +.idea/ +build/ +gradle/wrapper/ \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 00000000..82e6a548 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,64 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 28 + buildToolsVersion '28.0.3' + + defaultConfig { + applicationId "com.almalence.opencam" + minSdkVersion 14 + targetSdkVersion 28 + + ndk { + moduleName "bento4" + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } + + sourceSets.main { + jni.srcDirs = [] // This prevents the auto generation of Android.mk + jniLibs.srcDir 'src/main/libs' // This is not necessary unless you have precompiled libraries in your project. + } + +// externalNativeBuild { +// ndkBuild { +// path 'src/main/jni/Android.mk' +// } +// } + + task buildNative(type: Exec, description: 'Compile JNI source via NDK') { + def ndkDir = android.ndkDirectory + commandLine "$ndkDir/ndk-build", + '-C', file('src/main/jni').absolutePath, // Change src/main/jni the relative path to your jni source + '-j', Runtime.runtime.availableProcessors(), + 'all', + 'NDK_DEBUG=1' + } + + task cleanNative(type: Exec, description: 'Clean JNI object files') { + def ndkDir = android.ndkDirectory + commandLine "$ndkDir/ndk-build", + '-C', file('src/main/jni').absolutePath, // Change src/main/jni the relative path to your jni source + 'clean' + } + + clean.dependsOn 'cleanNative' + + tasks.withType(JavaCompile) { + compileTask -> compileTask.dependsOn buildNative + } + +} + +dependencies { + implementation 'com.android.support:support-v4:28.0.0' + implementation files('libs/androidexiv2.jar') + implementation files('libs/openiab-0.9.8.6.jar') + implementation 'com.google.zxing:core:3.2.1' +} diff --git a/libs/.gitignore b/app/libs/.gitignore similarity index 100% rename from libs/.gitignore rename to app/libs/.gitignore diff --git a/libs/android-support-v13.jar b/app/libs/android-support-v13.jar similarity index 100% rename from libs/android-support-v13.jar rename to app/libs/android-support-v13.jar diff --git a/libs/androidexiv2.jar b/app/libs/androidexiv2.jar similarity index 100% rename from libs/androidexiv2.jar rename to app/libs/androidexiv2.jar diff --git a/libs/openiab-0.9.8.6.jar b/app/libs/openiab-0.9.8.6.jar similarity index 100% rename from libs/openiab-0.9.8.6.jar rename to app/libs/openiab-0.9.8.6.jar diff --git a/libs/xzing-2.1/core.jar b/app/libs/xzing-2.1/core.jar similarity index 100% rename from libs/xzing-2.1/core.jar rename to app/libs/xzing-2.1/core.jar diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 99% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml index 4d2aee28..181f25d1 100755 --- a/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -224,6 +224,4 @@ --> - - + diff --git a/assets/opencamera_modes.xml b/app/src/main/assets/opencamera_modes.xml similarity index 100% rename from assets/opencamera_modes.xml rename to app/src/main/assets/opencamera_modes.xml diff --git a/assets/www/bottom_controls.png b/app/src/main/assets/www/bottom_controls.png similarity index 100% rename from assets/www/bottom_controls.png rename to app/src/main/assets/www/bottom_controls.png diff --git a/assets/www/controls.html b/app/src/main/assets/www/controls.html similarity index 100% rename from assets/www/controls.html rename to app/src/main/assets/www/controls.html diff --git a/assets/www/features.html b/app/src/main/assets/www/features.html similarity index 100% rename from assets/www/features.html rename to app/src/main/assets/www/features.html diff --git a/assets/www/maincontrols.html b/app/src/main/assets/www/maincontrols.html similarity index 100% rename from assets/www/maincontrols.html rename to app/src/main/assets/www/maincontrols.html diff --git a/assets/www/modes.html b/app/src/main/assets/www/modes.html similarity index 100% rename from assets/www/modes.html rename to app/src/main/assets/www/modes.html diff --git a/assets/www/moresettings.html b/app/src/main/assets/www/moresettings.html similarity index 100% rename from assets/www/moresettings.html rename to app/src/main/assets/www/moresettings.html diff --git a/assets/www/plugin_help_bestshot.jpg b/app/src/main/assets/www/plugin_help_bestshot.jpg similarity index 100% rename from assets/www/plugin_help_bestshot.jpg rename to app/src/main/assets/www/plugin_help_bestshot.jpg diff --git a/assets/www/plugin_help_dro.jpg b/app/src/main/assets/www/plugin_help_dro.jpg similarity index 100% rename from assets/www/plugin_help_dro.jpg rename to app/src/main/assets/www/plugin_help_dro.jpg diff --git a/assets/www/plugin_help_groupshot.png b/app/src/main/assets/www/plugin_help_groupshot.png similarity index 100% rename from assets/www/plugin_help_groupshot.png rename to app/src/main/assets/www/plugin_help_groupshot.png diff --git a/assets/www/plugin_help_multishot.jpg b/app/src/main/assets/www/plugin_help_multishot.jpg similarity index 100% rename from assets/www/plugin_help_multishot.jpg rename to app/src/main/assets/www/plugin_help_multishot.jpg diff --git a/assets/www/plugin_help_object.png b/app/src/main/assets/www/plugin_help_object.png similarity index 100% rename from assets/www/plugin_help_object.png rename to app/src/main/assets/www/plugin_help_object.png diff --git a/assets/www/plugin_help_panorama.png b/app/src/main/assets/www/plugin_help_panorama.png similarity index 100% rename from assets/www/plugin_help_panorama.png rename to app/src/main/assets/www/plugin_help_panorama.png diff --git a/assets/www/plugin_help_sequence.png b/app/src/main/assets/www/plugin_help_sequence.png similarity index 100% rename from assets/www/plugin_help_sequence.png rename to app/src/main/assets/www/plugin_help_sequence.png diff --git a/assets/www/prefs.png b/app/src/main/assets/www/prefs.png similarity index 100% rename from assets/www/prefs.png rename to app/src/main/assets/www/prefs.png diff --git a/assets/www/preshot.jpg b/app/src/main/assets/www/preshot.jpg similarity index 100% rename from assets/www/preshot.jpg rename to app/src/main/assets/www/preshot.jpg diff --git a/assets/www/selftimer_control.jpg b/app/src/main/assets/www/selftimer_control.jpg similarity index 100% rename from assets/www/selftimer_control.jpg rename to app/src/main/assets/www/selftimer_control.jpg diff --git a/assets/www/top_controls.jpg b/app/src/main/assets/www/top_controls.jpg similarity index 100% rename from assets/www/top_controls.jpg rename to app/src/main/assets/www/top_controls.jpg diff --git a/src/com/almalence/SwapHeap.java b/app/src/main/java/com/almalence/SwapHeap.java similarity index 100% rename from src/com/almalence/SwapHeap.java rename to app/src/main/java/com/almalence/SwapHeap.java diff --git a/src/com/almalence/YuvImage.java b/app/src/main/java/com/almalence/YuvImage.java similarity index 100% rename from src/com/almalence/YuvImage.java rename to app/src/main/java/com/almalence/YuvImage.java diff --git a/src/com/almalence/asynctaskmanager/AsyncTaskManager.java b/app/src/main/java/com/almalence/asynctaskmanager/AsyncTaskManager.java similarity index 100% rename from src/com/almalence/asynctaskmanager/AsyncTaskManager.java rename to app/src/main/java/com/almalence/asynctaskmanager/AsyncTaskManager.java diff --git a/src/com/almalence/asynctaskmanager/IProgressTracker.java b/app/src/main/java/com/almalence/asynctaskmanager/IProgressTracker.java similarity index 100% rename from src/com/almalence/asynctaskmanager/IProgressTracker.java rename to app/src/main/java/com/almalence/asynctaskmanager/IProgressTracker.java diff --git a/src/com/almalence/asynctaskmanager/OnTaskCompleteListener.java b/app/src/main/java/com/almalence/asynctaskmanager/OnTaskCompleteListener.java similarity index 100% rename from src/com/almalence/asynctaskmanager/OnTaskCompleteListener.java rename to app/src/main/java/com/almalence/asynctaskmanager/OnTaskCompleteListener.java diff --git a/src/com/almalence/asynctaskmanager/Task.java b/app/src/main/java/com/almalence/asynctaskmanager/Task.java similarity index 100% rename from src/com/almalence/asynctaskmanager/Task.java rename to app/src/main/java/com/almalence/asynctaskmanager/Task.java diff --git a/src/com/almalence/googsharing/Thumbnail.java b/app/src/main/java/com/almalence/googsharing/Thumbnail.java similarity index 100% rename from src/com/almalence/googsharing/Thumbnail.java rename to app/src/main/java/com/almalence/googsharing/Thumbnail.java diff --git a/src/com/almalence/opencam/AlarmReceiver.java b/app/src/main/java/com/almalence/opencam/AlarmReceiver.java similarity index 100% rename from src/com/almalence/opencam/AlarmReceiver.java rename to app/src/main/java/com/almalence/opencam/AlarmReceiver.java diff --git a/src/com/almalence/opencam/ApplicationInterface.java b/app/src/main/java/com/almalence/opencam/ApplicationInterface.java similarity index 100% rename from src/com/almalence/opencam/ApplicationInterface.java rename to app/src/main/java/com/almalence/opencam/ApplicationInterface.java diff --git a/src/com/almalence/opencam/ApplicationScreen.java b/app/src/main/java/com/almalence/opencam/ApplicationScreen.java similarity index 100% rename from src/com/almalence/opencam/ApplicationScreen.java rename to app/src/main/java/com/almalence/opencam/ApplicationScreen.java diff --git a/src/com/almalence/opencam/CameraParameters.java b/app/src/main/java/com/almalence/opencam/CameraParameters.java similarity index 100% rename from src/com/almalence/opencam/CameraParameters.java rename to app/src/main/java/com/almalence/opencam/CameraParameters.java diff --git a/src/com/almalence/opencam/ConfigParser.java b/app/src/main/java/com/almalence/opencam/ConfigParser.java similarity index 100% rename from src/com/almalence/opencam/ConfigParser.java rename to app/src/main/java/com/almalence/opencam/ConfigParser.java diff --git a/src/com/almalence/opencam/FolderPicker.java b/app/src/main/java/com/almalence/opencam/FolderPicker.java similarity index 100% rename from src/com/almalence/opencam/FolderPicker.java rename to app/src/main/java/com/almalence/opencam/FolderPicker.java diff --git a/src/com/almalence/opencam/FolderPickerLollipop.java b/app/src/main/java/com/almalence/opencam/FolderPickerLollipop.java similarity index 100% rename from src/com/almalence/opencam/FolderPickerLollipop.java rename to app/src/main/java/com/almalence/opencam/FolderPickerLollipop.java diff --git a/src/com/almalence/opencam/Fragment.java b/app/src/main/java/com/almalence/opencam/Fragment.java similarity index 100% rename from src/com/almalence/opencam/Fragment.java rename to app/src/main/java/com/almalence/opencam/Fragment.java diff --git a/src/com/almalence/opencam/HWButtonStart.java b/app/src/main/java/com/almalence/opencam/HWButtonStart.java similarity index 100% rename from src/com/almalence/opencam/HWButtonStart.java rename to app/src/main/java/com/almalence/opencam/HWButtonStart.java diff --git a/src/com/almalence/opencam/MainScreen.java b/app/src/main/java/com/almalence/opencam/MainScreen.java similarity index 100% rename from src/com/almalence/opencam/MainScreen.java rename to app/src/main/java/com/almalence/opencam/MainScreen.java diff --git a/src/com/almalence/opencam/Mode.java b/app/src/main/java/com/almalence/opencam/Mode.java similarity index 100% rename from src/com/almalence/opencam/Mode.java rename to app/src/main/java/com/almalence/opencam/Mode.java diff --git a/src/com/almalence/opencam/NotificationService.java b/app/src/main/java/com/almalence/opencam/NotificationService.java similarity index 100% rename from src/com/almalence/opencam/NotificationService.java rename to app/src/main/java/com/almalence/opencam/NotificationService.java diff --git a/src/com/almalence/opencam/Plugin.java b/app/src/main/java/com/almalence/opencam/Plugin.java similarity index 100% rename from src/com/almalence/opencam/Plugin.java rename to app/src/main/java/com/almalence/opencam/Plugin.java diff --git a/src/com/almalence/opencam/PluginCapture.java b/app/src/main/java/com/almalence/opencam/PluginCapture.java similarity index 100% rename from src/com/almalence/opencam/PluginCapture.java rename to app/src/main/java/com/almalence/opencam/PluginCapture.java diff --git a/src/com/almalence/opencam/PluginExport.java b/app/src/main/java/com/almalence/opencam/PluginExport.java similarity index 100% rename from src/com/almalence/opencam/PluginExport.java rename to app/src/main/java/com/almalence/opencam/PluginExport.java diff --git a/src/com/almalence/opencam/PluginManager.java b/app/src/main/java/com/almalence/opencam/PluginManager.java similarity index 100% rename from src/com/almalence/opencam/PluginManager.java rename to app/src/main/java/com/almalence/opencam/PluginManager.java diff --git a/src/com/almalence/opencam/PluginManagerBase.java b/app/src/main/java/com/almalence/opencam/PluginManagerBase.java similarity index 100% rename from src/com/almalence/opencam/PluginManagerBase.java rename to app/src/main/java/com/almalence/opencam/PluginManagerBase.java diff --git a/src/com/almalence/opencam/PluginManagerInterface.java b/app/src/main/java/com/almalence/opencam/PluginManagerInterface.java similarity index 100% rename from src/com/almalence/opencam/PluginManagerInterface.java rename to app/src/main/java/com/almalence/opencam/PluginManagerInterface.java diff --git a/src/com/almalence/opencam/PluginProcessing.java b/app/src/main/java/com/almalence/opencam/PluginProcessing.java similarity index 100% rename from src/com/almalence/opencam/PluginProcessing.java rename to app/src/main/java/com/almalence/opencam/PluginProcessing.java diff --git a/src/com/almalence/opencam/PluginType.java b/app/src/main/java/com/almalence/opencam/PluginType.java similarity index 100% rename from src/com/almalence/opencam/PluginType.java rename to app/src/main/java/com/almalence/opencam/PluginType.java diff --git a/src/com/almalence/opencam/PluginViewfinder.java b/app/src/main/java/com/almalence/opencam/PluginViewfinder.java similarity index 100% rename from src/com/almalence/opencam/PluginViewfinder.java rename to app/src/main/java/com/almalence/opencam/PluginViewfinder.java diff --git a/src/com/almalence/opencam/Preferences.java b/app/src/main/java/com/almalence/opencam/Preferences.java similarity index 100% rename from src/com/almalence/opencam/Preferences.java rename to app/src/main/java/com/almalence/opencam/Preferences.java diff --git a/src/com/almalence/opencam/ProcessingService.java b/app/src/main/java/com/almalence/opencam/ProcessingService.java similarity index 100% rename from src/com/almalence/opencam/ProcessingService.java rename to app/src/main/java/com/almalence/opencam/ProcessingService.java diff --git a/src/com/almalence/opencam/SavingService.java b/app/src/main/java/com/almalence/opencam/SavingService.java similarity index 100% rename from src/com/almalence/opencam/SavingService.java rename to app/src/main/java/com/almalence/opencam/SavingService.java diff --git a/src/com/almalence/opencam/SoundPlayer.java b/app/src/main/java/com/almalence/opencam/SoundPlayer.java similarity index 100% rename from src/com/almalence/opencam/SoundPlayer.java rename to app/src/main/java/com/almalence/opencam/SoundPlayer.java diff --git a/src/com/almalence/opencam/cameracontroller/Camera2Controller.java b/app/src/main/java/com/almalence/opencam/cameracontroller/Camera2Controller.java similarity index 100% rename from src/com/almalence/opencam/cameracontroller/Camera2Controller.java rename to app/src/main/java/com/almalence/opencam/cameracontroller/Camera2Controller.java diff --git a/src/com/almalence/opencam/cameracontroller/CameraController.java b/app/src/main/java/com/almalence/opencam/cameracontroller/CameraController.java similarity index 100% rename from src/com/almalence/opencam/cameracontroller/CameraController.java rename to app/src/main/java/com/almalence/opencam/cameracontroller/CameraController.java diff --git a/src/com/almalence/opencam/cameracontroller/SonyRemoteCamera.java b/app/src/main/java/com/almalence/opencam/cameracontroller/SonyRemoteCamera.java similarity index 100% rename from src/com/almalence/opencam/cameracontroller/SonyRemoteCamera.java rename to app/src/main/java/com/almalence/opencam/cameracontroller/SonyRemoteCamera.java diff --git a/src/com/almalence/opencam/ui/AlmalenceGUI.java b/app/src/main/java/com/almalence/opencam/ui/AlmalenceGUI.java similarity index 100% rename from src/com/almalence/opencam/ui/AlmalenceGUI.java rename to app/src/main/java/com/almalence/opencam/ui/AlmalenceGUI.java diff --git a/src/com/almalence/opencam/ui/AlmalenceStore.java b/app/src/main/java/com/almalence/opencam/ui/AlmalenceStore.java similarity index 100% rename from src/com/almalence/opencam/ui/AlmalenceStore.java rename to app/src/main/java/com/almalence/opencam/ui/AlmalenceStore.java diff --git a/src/com/almalence/opencam/ui/AudioRecorder.java b/app/src/main/java/com/almalence/opencam/ui/AudioRecorder.java similarity index 100% rename from src/com/almalence/opencam/ui/AudioRecorder.java rename to app/src/main/java/com/almalence/opencam/ui/AudioRecorder.java diff --git a/src/com/almalence/opencam/ui/ColorEffectQuickSetting.java b/app/src/main/java/com/almalence/opencam/ui/ColorEffectQuickSetting.java similarity index 100% rename from src/com/almalence/opencam/ui/ColorEffectQuickSetting.java rename to app/src/main/java/com/almalence/opencam/ui/ColorEffectQuickSetting.java diff --git a/src/com/almalence/opencam/ui/EglEncoder.java b/app/src/main/java/com/almalence/opencam/ui/EglEncoder.java similarity index 100% rename from src/com/almalence/opencam/ui/EglEncoder.java rename to app/src/main/java/com/almalence/opencam/ui/EglEncoder.java diff --git a/src/com/almalence/opencam/ui/ElementAdapter.java b/app/src/main/java/com/almalence/opencam/ui/ElementAdapter.java similarity index 100% rename from src/com/almalence/opencam/ui/ElementAdapter.java rename to app/src/main/java/com/almalence/opencam/ui/ElementAdapter.java diff --git a/src/com/almalence/opencam/ui/GLLayer.java b/app/src/main/java/com/almalence/opencam/ui/GLLayer.java similarity index 100% rename from src/com/almalence/opencam/ui/GLLayer.java rename to app/src/main/java/com/almalence/opencam/ui/GLLayer.java diff --git a/src/com/almalence/opencam/ui/GUI.java b/app/src/main/java/com/almalence/opencam/ui/GUI.java similarity index 100% rename from src/com/almalence/opencam/ui/GUI.java rename to app/src/main/java/com/almalence/opencam/ui/GUI.java diff --git a/src/com/almalence/opencam/ui/ImageSizeQuickSetting.java b/app/src/main/java/com/almalence/opencam/ui/ImageSizeQuickSetting.java similarity index 100% rename from src/com/almalence/opencam/ui/ImageSizeQuickSetting.java rename to app/src/main/java/com/almalence/opencam/ui/ImageSizeQuickSetting.java diff --git a/src/com/almalence/opencam/ui/QuickSettingDialog.java b/app/src/main/java/com/almalence/opencam/ui/QuickSettingDialog.java similarity index 100% rename from src/com/almalence/opencam/ui/QuickSettingDialog.java rename to app/src/main/java/com/almalence/opencam/ui/QuickSettingDialog.java diff --git a/src/com/almalence/opencam/ui/SamplePagerAdapter.java b/app/src/main/java/com/almalence/opencam/ui/SamplePagerAdapter.java similarity index 100% rename from src/com/almalence/opencam/ui/SamplePagerAdapter.java rename to app/src/main/java/com/almalence/opencam/ui/SamplePagerAdapter.java diff --git a/src/com/almalence/opencam/ui/SeekBarPreference.java b/app/src/main/java/com/almalence/opencam/ui/SeekBarPreference.java similarity index 100% rename from src/com/almalence/opencam/ui/SeekBarPreference.java rename to app/src/main/java/com/almalence/opencam/ui/SeekBarPreference.java diff --git a/src/com/almalence/opencam/ui/SelfTimerAndPhotoTimeLapse.java b/app/src/main/java/com/almalence/opencam/ui/SelfTimerAndPhotoTimeLapse.java similarity index 100% rename from src/com/almalence/opencam/ui/SelfTimerAndPhotoTimeLapse.java rename to app/src/main/java/com/almalence/opencam/ui/SelfTimerAndPhotoTimeLapse.java diff --git a/src/com/almalence/opencam/ui/SelfTimerAndTimeLapseDialog.java b/app/src/main/java/com/almalence/opencam/ui/SelfTimerAndTimeLapseDialog.java similarity index 100% rename from src/com/almalence/opencam/ui/SelfTimerAndTimeLapseDialog.java rename to app/src/main/java/com/almalence/opencam/ui/SelfTimerAndTimeLapseDialog.java diff --git a/src/com/almalence/opencam/ui/SonyCameraDeviceExplorer.java b/app/src/main/java/com/almalence/opencam/ui/SonyCameraDeviceExplorer.java similarity index 100% rename from src/com/almalence/opencam/ui/SonyCameraDeviceExplorer.java rename to app/src/main/java/com/almalence/opencam/ui/SonyCameraDeviceExplorer.java diff --git a/src/com/almalence/opencam/ui/SonyCameraDeviceExplorerDialog.java b/app/src/main/java/com/almalence/opencam/ui/SonyCameraDeviceExplorerDialog.java similarity index 100% rename from src/com/almalence/opencam/ui/SonyCameraDeviceExplorerDialog.java rename to app/src/main/java/com/almalence/opencam/ui/SonyCameraDeviceExplorerDialog.java diff --git a/src/com/almalence/plugins/capture/bestshot/BestShotCapturePlugin.java b/app/src/main/java/com/almalence/plugins/capture/bestshot/BestShotCapturePlugin.java similarity index 100% rename from src/com/almalence/plugins/capture/bestshot/BestShotCapturePlugin.java rename to app/src/main/java/com/almalence/plugins/capture/bestshot/BestShotCapturePlugin.java diff --git a/src/com/almalence/plugins/capture/burst/BurstCapturePlugin.java b/app/src/main/java/com/almalence/plugins/capture/burst/BurstCapturePlugin.java similarity index 100% rename from src/com/almalence/plugins/capture/burst/BurstCapturePlugin.java rename to app/src/main/java/com/almalence/plugins/capture/burst/BurstCapturePlugin.java diff --git a/src/com/almalence/plugins/capture/expobracketing/ExpoBracketingCapturePlugin.java b/app/src/main/java/com/almalence/plugins/capture/expobracketing/ExpoBracketingCapturePlugin.java similarity index 100% rename from src/com/almalence/plugins/capture/expobracketing/ExpoBracketingCapturePlugin.java rename to app/src/main/java/com/almalence/plugins/capture/expobracketing/ExpoBracketingCapturePlugin.java diff --git a/src/com/almalence/plugins/capture/multishot/MultiShotCapturePlugin.java b/app/src/main/java/com/almalence/plugins/capture/multishot/MultiShotCapturePlugin.java similarity index 100% rename from src/com/almalence/plugins/capture/multishot/MultiShotCapturePlugin.java rename to app/src/main/java/com/almalence/plugins/capture/multishot/MultiShotCapturePlugin.java diff --git a/src/com/almalence/plugins/capture/night/GLCameraPreview.java b/app/src/main/java/com/almalence/plugins/capture/night/GLCameraPreview.java similarity index 100% rename from src/com/almalence/plugins/capture/night/GLCameraPreview.java rename to app/src/main/java/com/almalence/plugins/capture/night/GLCameraPreview.java diff --git a/src/com/almalence/plugins/capture/night/NightCapturePlugin.java b/app/src/main/java/com/almalence/plugins/capture/night/NightCapturePlugin.java similarity index 100% rename from src/com/almalence/plugins/capture/night/NightCapturePlugin.java rename to app/src/main/java/com/almalence/plugins/capture/night/NightCapturePlugin.java diff --git a/src/com/almalence/plugins/capture/panoramaaugmented/AugmentedPanoramaEngine.java b/app/src/main/java/com/almalence/plugins/capture/panoramaaugmented/AugmentedPanoramaEngine.java similarity index 100% rename from src/com/almalence/plugins/capture/panoramaaugmented/AugmentedPanoramaEngine.java rename to app/src/main/java/com/almalence/plugins/capture/panoramaaugmented/AugmentedPanoramaEngine.java diff --git a/src/com/almalence/plugins/capture/panoramaaugmented/AugmentedRotationListener.java b/app/src/main/java/com/almalence/plugins/capture/panoramaaugmented/AugmentedRotationListener.java similarity index 100% rename from src/com/almalence/plugins/capture/panoramaaugmented/AugmentedRotationListener.java rename to app/src/main/java/com/almalence/plugins/capture/panoramaaugmented/AugmentedRotationListener.java diff --git a/src/com/almalence/plugins/capture/panoramaaugmented/PanoramaAugmentedCapturePlugin.java b/app/src/main/java/com/almalence/plugins/capture/panoramaaugmented/PanoramaAugmentedCapturePlugin.java similarity index 100% rename from src/com/almalence/plugins/capture/panoramaaugmented/PanoramaAugmentedCapturePlugin.java rename to app/src/main/java/com/almalence/plugins/capture/panoramaaugmented/PanoramaAugmentedCapturePlugin.java diff --git a/src/com/almalence/plugins/capture/panoramaaugmented/Vector3d.java b/app/src/main/java/com/almalence/plugins/capture/panoramaaugmented/Vector3d.java similarity index 100% rename from src/com/almalence/plugins/capture/panoramaaugmented/Vector3d.java rename to app/src/main/java/com/almalence/plugins/capture/panoramaaugmented/Vector3d.java diff --git a/src/com/almalence/plugins/capture/panoramaaugmented/VfGyroSensor.java b/app/src/main/java/com/almalence/plugins/capture/panoramaaugmented/VfGyroSensor.java similarity index 100% rename from src/com/almalence/plugins/capture/panoramaaugmented/VfGyroSensor.java rename to app/src/main/java/com/almalence/plugins/capture/panoramaaugmented/VfGyroSensor.java diff --git a/src/com/almalence/plugins/capture/preshot/PreShot.java b/app/src/main/java/com/almalence/plugins/capture/preshot/PreShot.java similarity index 100% rename from src/com/almalence/plugins/capture/preshot/PreShot.java rename to app/src/main/java/com/almalence/plugins/capture/preshot/PreShot.java diff --git a/src/com/almalence/plugins/capture/preshot/PreshotCapturePlugin.java b/app/src/main/java/com/almalence/plugins/capture/preshot/PreshotCapturePlugin.java similarity index 100% rename from src/com/almalence/plugins/capture/preshot/PreshotCapturePlugin.java rename to app/src/main/java/com/almalence/plugins/capture/preshot/PreshotCapturePlugin.java diff --git a/src/com/almalence/plugins/capture/standard/CapturePlugin.java b/app/src/main/java/com/almalence/plugins/capture/standard/CapturePlugin.java similarity index 100% rename from src/com/almalence/plugins/capture/standard/CapturePlugin.java rename to app/src/main/java/com/almalence/plugins/capture/standard/CapturePlugin.java diff --git a/src/com/almalence/plugins/capture/video/DROVideoEngine.java b/app/src/main/java/com/almalence/plugins/capture/video/DROVideoEngine.java similarity index 100% rename from src/com/almalence/plugins/capture/video/DROVideoEngine.java rename to app/src/main/java/com/almalence/plugins/capture/video/DROVideoEngine.java diff --git a/src/com/almalence/plugins/capture/video/Mp4Editor.java b/app/src/main/java/com/almalence/plugins/capture/video/Mp4Editor.java similarity index 100% rename from src/com/almalence/plugins/capture/video/Mp4Editor.java rename to app/src/main/java/com/almalence/plugins/capture/video/Mp4Editor.java diff --git a/src/com/almalence/plugins/capture/video/RealtimeDRO.java b/app/src/main/java/com/almalence/plugins/capture/video/RealtimeDRO.java similarity index 100% rename from src/com/almalence/plugins/capture/video/RealtimeDRO.java rename to app/src/main/java/com/almalence/plugins/capture/video/RealtimeDRO.java diff --git a/src/com/almalence/plugins/capture/video/TimeLapseDialog.java b/app/src/main/java/com/almalence/plugins/capture/video/TimeLapseDialog.java similarity index 100% rename from src/com/almalence/plugins/capture/video/TimeLapseDialog.java rename to app/src/main/java/com/almalence/plugins/capture/video/TimeLapseDialog.java diff --git a/src/com/almalence/plugins/capture/video/VideoCapturePlugin.java b/app/src/main/java/com/almalence/plugins/capture/video/VideoCapturePlugin.java similarity index 100% rename from src/com/almalence/plugins/capture/video/VideoCapturePlugin.java rename to app/src/main/java/com/almalence/plugins/capture/video/VideoCapturePlugin.java diff --git a/src/com/almalence/plugins/export/ExifDriver/ExifDriver.java b/app/src/main/java/com/almalence/plugins/export/ExifDriver/ExifDriver.java similarity index 100% rename from src/com/almalence/plugins/export/ExifDriver/ExifDriver.java rename to app/src/main/java/com/almalence/plugins/export/ExifDriver/ExifDriver.java diff --git a/src/com/almalence/plugins/export/ExifDriver/ExifManager.java b/app/src/main/java/com/almalence/plugins/export/ExifDriver/ExifManager.java similarity index 100% rename from src/com/almalence/plugins/export/ExifDriver/ExifManager.java rename to app/src/main/java/com/almalence/plugins/export/ExifDriver/ExifManager.java diff --git a/src/com/almalence/plugins/export/ExifDriver/Values/ExifValue.java b/app/src/main/java/com/almalence/plugins/export/ExifDriver/Values/ExifValue.java similarity index 100% rename from src/com/almalence/plugins/export/ExifDriver/Values/ExifValue.java rename to app/src/main/java/com/almalence/plugins/export/ExifDriver/Values/ExifValue.java diff --git a/src/com/almalence/plugins/export/ExifDriver/Values/UndefinedValueAccessException.java b/app/src/main/java/com/almalence/plugins/export/ExifDriver/Values/UndefinedValueAccessException.java similarity index 100% rename from src/com/almalence/plugins/export/ExifDriver/Values/UndefinedValueAccessException.java rename to app/src/main/java/com/almalence/plugins/export/ExifDriver/Values/UndefinedValueAccessException.java diff --git a/src/com/almalence/plugins/export/ExifDriver/Values/ValueByteArray.java b/app/src/main/java/com/almalence/plugins/export/ExifDriver/Values/ValueByteArray.java similarity index 100% rename from src/com/almalence/plugins/export/ExifDriver/Values/ValueByteArray.java rename to app/src/main/java/com/almalence/plugins/export/ExifDriver/Values/ValueByteArray.java diff --git a/src/com/almalence/plugins/export/ExifDriver/Values/ValueNumber.java b/app/src/main/java/com/almalence/plugins/export/ExifDriver/Values/ValueNumber.java similarity index 100% rename from src/com/almalence/plugins/export/ExifDriver/Values/ValueNumber.java rename to app/src/main/java/com/almalence/plugins/export/ExifDriver/Values/ValueNumber.java diff --git a/src/com/almalence/plugins/export/ExifDriver/Values/ValueRationals.java b/app/src/main/java/com/almalence/plugins/export/ExifDriver/Values/ValueRationals.java similarity index 100% rename from src/com/almalence/plugins/export/ExifDriver/Values/ValueRationals.java rename to app/src/main/java/com/almalence/plugins/export/ExifDriver/Values/ValueRationals.java diff --git a/src/com/almalence/plugins/export/standard/ExportPlugin.java b/app/src/main/java/com/almalence/plugins/export/standard/ExportPlugin.java similarity index 100% rename from src/com/almalence/plugins/export/standard/ExportPlugin.java rename to app/src/main/java/com/almalence/plugins/export/standard/ExportPlugin.java diff --git a/src/com/almalence/plugins/export/standard/GPSTagsConverter.java b/app/src/main/java/com/almalence/plugins/export/standard/GPSTagsConverter.java similarity index 100% rename from src/com/almalence/plugins/export/standard/GPSTagsConverter.java rename to app/src/main/java/com/almalence/plugins/export/standard/GPSTagsConverter.java diff --git a/src/com/almalence/plugins/processing/bestshot/AlmaShotBestShot.java b/app/src/main/java/com/almalence/plugins/processing/bestshot/AlmaShotBestShot.java similarity index 100% rename from src/com/almalence/plugins/processing/bestshot/AlmaShotBestShot.java rename to app/src/main/java/com/almalence/plugins/processing/bestshot/AlmaShotBestShot.java diff --git a/src/com/almalence/plugins/processing/bestshot/BestshotProcessingPlugin.java b/app/src/main/java/com/almalence/plugins/processing/bestshot/BestshotProcessingPlugin.java similarity index 100% rename from src/com/almalence/plugins/processing/bestshot/BestshotProcessingPlugin.java rename to app/src/main/java/com/almalence/plugins/processing/bestshot/BestshotProcessingPlugin.java diff --git a/src/com/almalence/plugins/processing/groupshot/AlmaShotGroupShot.java b/app/src/main/java/com/almalence/plugins/processing/groupshot/AlmaShotGroupShot.java old mode 100755 new mode 100644 similarity index 100% rename from src/com/almalence/plugins/processing/groupshot/AlmaShotGroupShot.java rename to app/src/main/java/com/almalence/plugins/processing/groupshot/AlmaShotGroupShot.java diff --git a/src/com/almalence/plugins/processing/groupshot/Face.java b/app/src/main/java/com/almalence/plugins/processing/groupshot/Face.java similarity index 100% rename from src/com/almalence/plugins/processing/groupshot/Face.java rename to app/src/main/java/com/almalence/plugins/processing/groupshot/Face.java diff --git a/src/com/almalence/plugins/processing/groupshot/GroupShotCore.java b/app/src/main/java/com/almalence/plugins/processing/groupshot/GroupShotCore.java old mode 100755 new mode 100644 similarity index 100% rename from src/com/almalence/plugins/processing/groupshot/GroupShotCore.java rename to app/src/main/java/com/almalence/plugins/processing/groupshot/GroupShotCore.java diff --git a/src/com/almalence/plugins/processing/groupshot/GroupShotProcessingPlugin.java b/app/src/main/java/com/almalence/plugins/processing/groupshot/GroupShotProcessingPlugin.java similarity index 100% rename from src/com/almalence/plugins/processing/groupshot/GroupShotProcessingPlugin.java rename to app/src/main/java/com/almalence/plugins/processing/groupshot/GroupShotProcessingPlugin.java diff --git a/src/com/almalence/plugins/processing/groupshot/HorizontalGalleryView.java b/app/src/main/java/com/almalence/plugins/processing/groupshot/HorizontalGalleryView.java old mode 100755 new mode 100644 similarity index 96% rename from src/com/almalence/plugins/processing/groupshot/HorizontalGalleryView.java rename to app/src/main/java/com/almalence/plugins/processing/groupshot/HorizontalGalleryView.java index 3d47b075..8c34419f --- a/src/com/almalence/plugins/processing/groupshot/HorizontalGalleryView.java +++ b/app/src/main/java/com/almalence/plugins/processing/groupshot/HorizontalGalleryView.java @@ -1,251 +1,251 @@ -/* -The contents of this file are subject to the Mozilla Public License -Version 1.1 (the "License"); you may not use this file except in -compliance with the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" -basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -License for the specific language governing rights and limitations -under the License. - -The Original Code is collection of files collectively known as Open Camera. - -The Initial Developer of the Original Code is Almalence Inc. -Portions created by Initial Developer are Copyright (C) 2013 -by Almalence Inc. All Rights Reserved. - */ - -package com.almalence.plugins.processing.groupshot; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.Paint.Style; -import android.graphics.Rect; -import android.graphics.RectF; -import android.util.AttributeSet; -import android.view.MotionEvent; -import android.view.View; - -public class HorizontalGalleryView extends View -{ - private static int BORDER_SIZE = 4; - - public interface SequenceListener - { - public void onSequenceChanged(int selectedIndex); - } - - private Bitmap[] images = null; - private boolean[] enabled = null; - private int selected = 0; - private int[] indexes = null; - private final Rect inRect = new Rect(); - private final RectF outRect = new RectF(); - - private int width; - private int height; - - private int touchedIndex = -1; - private float touchedX; - private float touchedY; - private float touchingX; - - private final Paint paint = new Paint(); - - private SequenceListener listener = null; - - public HorizontalGalleryView(final Context context) - { - super(context); - - this.init(); - } - - public HorizontalGalleryView(final Context context, final AttributeSet attrs) - { - super(context, attrs); - - this.init(); - } - - public HorizontalGalleryView(final Context context, final AttributeSet attrs, final int defStyle) - { - super(context, attrs, defStyle); - - this.init(); - } - - private void init() - { - this.paint.setStrokeWidth(BORDER_SIZE); - this.paint.setStyle(Style.STROKE); - this.paint.setAntiAlias(true); - } - - @Override - protected void onDraw(final Canvas canvas) - { - if (this.indexes != null) - { - final int imageWidth = this.getImageWidth(); - int touched = -1; - - for (int i = 0; i < this.indexes.length; i++) - { - if (this.indexes[i] != selected) - { - final int actualIndex = this.indexes[i]; - - this.inRect.left = 0; - this.inRect.top = 0; - this.inRect.right = this.images[actualIndex].getWidth() - 1; - this.inRect.bottom = this.images[actualIndex].getHeight() - 1; - - final float imageHeight = Math.min(this.height, this.images[actualIndex].getHeight() * imageWidth - / (float) this.images[actualIndex].getWidth()); - this.outRect.left = i * imageWidth; - this.outRect.top = this.height - imageHeight; - this.outRect.right = (i + 1) * imageWidth - 1; - this.outRect.bottom = this.height - 1; - - canvas.drawBitmap(this.images[actualIndex], this.inRect, this.outRect, null); - - this.paint.setColor(Color.WHITE); - canvas.drawRect(this.outRect.left + BORDER_SIZE / 2.0f, this.outRect.top + BORDER_SIZE / 2.0f, - this.outRect.right - BORDER_SIZE / 2.0f, this.outRect.bottom - BORDER_SIZE / 2.0f, - this.paint); - } else - { - touched = i; - } - } - - if (touched >= 0) - { - this.inRect.left = 0; - this.inRect.top = 0; - this.inRect.right = this.images[selected].getWidth() - 1; - this.inRect.bottom = this.images[selected].getHeight() - 1; - - final float imageHeight = Math.min(this.height, this.images[selected].getHeight() * imageWidth - / (float) this.images[selected].getWidth()); - this.outRect.left = touched * imageWidth + this.touchingX - this.touchedX; - this.outRect.top = this.height - imageHeight; - this.outRect.right = this.outRect.left + imageWidth; - this.outRect.bottom = this.height - 1; - - canvas.drawBitmap(this.images[selected], this.inRect, this.outRect, null); - - this.paint.setColor(Color.rgb(0, 160, 255)); - canvas.drawRect(this.outRect.left + BORDER_SIZE / 2.0f, this.outRect.top + BORDER_SIZE / 2.0f, - this.outRect.right - BORDER_SIZE / 2.0f, this.outRect.bottom - BORDER_SIZE / 2.0f, this.paint); - } - } - } - - @Override - protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) - { - this.setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec)); - } - - @Override - protected void onSizeChanged(final int w, final int h, final int oldw, final int oldh) - { - this.width = w; - this.height = h; - - super.onSizeChanged(w, h, oldw, oldh); - } - - @Override - public boolean onTouchEvent(final MotionEvent event) - { - if (!this.isEnabled()) - { - return true; - } - - switch (event.getAction()) - { - case MotionEvent.ACTION_UP: - { - touchedX = event.getX(); - this.touchedY = event.getY(); - this.touchingX = event.getX(); - final int touch_pos = (int) (this.touchedX / this.getImageWidth()); - touchedIndex = this.indexes[Math.min(Math.max(touch_pos, 0), this.indexes.length - 1)]; - - if (touchedIndex != -1) - { - if(touchedIndex != selected) - { - selected = touchedIndex; - this.notifyListener(); - } - } - - this.touchedIndex = -1; - } - break; - default: - break; - } - - this.invalidate(); - this.requestLayout(); - - return true; - } - - public void setContent(final Bitmap[] images, final SequenceListener listener) - { - if (images != null) - { - this.listener = listener; - - this.images = new Bitmap[images.length]; - System.arraycopy(images, 0, this.images, 0, images.length); - - this.initIndexes(); - } - } - - private void notifyListener() - { - if (this.listener != null) - { - this.listener.onSequenceChanged(selected); - } - } - - private void initIndexes() - { - if (this.images != null) - { - this.indexes = new int[this.images.length]; - for (int i = 0; i < this.images.length; i++) - { - this.indexes[i] = i; - } - - this.enabled = new boolean[this.images.length]; - for (int i = 0; i < this.images.length; i++) - { - this.enabled[i] = true; - } - } else - { - throw new RuntimeException(); - } - } - - private int getImageWidth() - { - return (this.width / this.images.length); - } -} +/* +The contents of this file are subject to the Mozilla Public License +Version 1.1 (the "License"); you may not use this file except in +compliance with the License. You may obtain a copy of the License at +http://www.mozilla.org/MPL/ + +Software distributed under the License is distributed on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +License for the specific language governing rights and limitations +under the License. + +The Original Code is collection of files collectively known as Open Camera. + +The Initial Developer of the Original Code is Almalence Inc. +Portions created by Initial Developer are Copyright (C) 2013 +by Almalence Inc. All Rights Reserved. + */ + +package com.almalence.plugins.processing.groupshot; + +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Paint.Style; +import android.graphics.Rect; +import android.graphics.RectF; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.view.View; + +public class HorizontalGalleryView extends View +{ + private static int BORDER_SIZE = 4; + + public interface SequenceListener + { + public void onSequenceChanged(int selectedIndex); + } + + private Bitmap[] images = null; + private boolean[] enabled = null; + private int selected = 0; + private int[] indexes = null; + private final Rect inRect = new Rect(); + private final RectF outRect = new RectF(); + + private int width; + private int height; + + private int touchedIndex = -1; + private float touchedX; + private float touchedY; + private float touchingX; + + private final Paint paint = new Paint(); + + private SequenceListener listener = null; + + public HorizontalGalleryView(final Context context) + { + super(context); + + this.init(); + } + + public HorizontalGalleryView(final Context context, final AttributeSet attrs) + { + super(context, attrs); + + this.init(); + } + + public HorizontalGalleryView(final Context context, final AttributeSet attrs, final int defStyle) + { + super(context, attrs, defStyle); + + this.init(); + } + + private void init() + { + this.paint.setStrokeWidth(BORDER_SIZE); + this.paint.setStyle(Style.STROKE); + this.paint.setAntiAlias(true); + } + + @Override + protected void onDraw(final Canvas canvas) + { + if (this.indexes != null) + { + final int imageWidth = this.getImageWidth(); + int touched = -1; + + for (int i = 0; i < this.indexes.length; i++) + { + if (this.indexes[i] != selected) + { + final int actualIndex = this.indexes[i]; + + this.inRect.left = 0; + this.inRect.top = 0; + this.inRect.right = this.images[actualIndex].getWidth() - 1; + this.inRect.bottom = this.images[actualIndex].getHeight() - 1; + + final float imageHeight = Math.min(this.height, this.images[actualIndex].getHeight() * imageWidth + / (float) this.images[actualIndex].getWidth()); + this.outRect.left = i * imageWidth; + this.outRect.top = this.height - imageHeight; + this.outRect.right = (i + 1) * imageWidth - 1; + this.outRect.bottom = this.height - 1; + + canvas.drawBitmap(this.images[actualIndex], this.inRect, this.outRect, null); + + this.paint.setColor(Color.WHITE); + canvas.drawRect(this.outRect.left + BORDER_SIZE / 2.0f, this.outRect.top + BORDER_SIZE / 2.0f, + this.outRect.right - BORDER_SIZE / 2.0f, this.outRect.bottom - BORDER_SIZE / 2.0f, + this.paint); + } else + { + touched = i; + } + } + + if (touched >= 0) + { + this.inRect.left = 0; + this.inRect.top = 0; + this.inRect.right = this.images[selected].getWidth() - 1; + this.inRect.bottom = this.images[selected].getHeight() - 1; + + final float imageHeight = Math.min(this.height, this.images[selected].getHeight() * imageWidth + / (float) this.images[selected].getWidth()); + this.outRect.left = touched * imageWidth + this.touchingX - this.touchedX; + this.outRect.top = this.height - imageHeight; + this.outRect.right = this.outRect.left + imageWidth; + this.outRect.bottom = this.height - 1; + + canvas.drawBitmap(this.images[selected], this.inRect, this.outRect, null); + + this.paint.setColor(Color.rgb(0, 160, 255)); + canvas.drawRect(this.outRect.left + BORDER_SIZE / 2.0f, this.outRect.top + BORDER_SIZE / 2.0f, + this.outRect.right - BORDER_SIZE / 2.0f, this.outRect.bottom - BORDER_SIZE / 2.0f, this.paint); + } + } + } + + @Override + protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) + { + this.setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec)); + } + + @Override + protected void onSizeChanged(final int w, final int h, final int oldw, final int oldh) + { + this.width = w; + this.height = h; + + super.onSizeChanged(w, h, oldw, oldh); + } + + @Override + public boolean onTouchEvent(final MotionEvent event) + { + if (!this.isEnabled()) + { + return true; + } + + switch (event.getAction()) + { + case MotionEvent.ACTION_UP: + { + touchedX = event.getX(); + this.touchedY = event.getY(); + this.touchingX = event.getX(); + final int touch_pos = (int) (this.touchedX / this.getImageWidth()); + touchedIndex = this.indexes[Math.min(Math.max(touch_pos, 0), this.indexes.length - 1)]; + + if (touchedIndex != -1) + { + if(touchedIndex != selected) + { + selected = touchedIndex; + this.notifyListener(); + } + } + + this.touchedIndex = -1; + } + break; + default: + break; + } + + this.invalidate(); + this.requestLayout(); + + return true; + } + + public void setContent(final Bitmap[] images, final SequenceListener listener) + { + if (images != null) + { + this.listener = listener; + + this.images = new Bitmap[images.length]; + System.arraycopy(images, 0, this.images, 0, images.length); + + this.initIndexes(); + } + } + + private void notifyListener() + { + if (this.listener != null) + { + this.listener.onSequenceChanged(selected); + } + } + + private void initIndexes() + { + if (this.images != null) + { + this.indexes = new int[this.images.length]; + for (int i = 0; i < this.images.length; i++) + { + this.indexes[i] = i; + } + + this.enabled = new boolean[this.images.length]; + for (int i = 0; i < this.images.length; i++) + { + this.enabled[i] = true; + } + } else + { + throw new RuntimeException(); + } + } + + private int getImageWidth() + { + return (this.width / this.images.length); + } +} diff --git a/src/com/almalence/plugins/processing/groupshot/ImageAdapter.java b/app/src/main/java/com/almalence/plugins/processing/groupshot/ImageAdapter.java similarity index 100% rename from src/com/almalence/plugins/processing/groupshot/ImageAdapter.java rename to app/src/main/java/com/almalence/plugins/processing/groupshot/ImageAdapter.java diff --git a/src/com/almalence/plugins/processing/hdr/Adjustment.java b/app/src/main/java/com/almalence/plugins/processing/hdr/Adjustment.java similarity index 100% rename from src/com/almalence/plugins/processing/hdr/Adjustment.java rename to app/src/main/java/com/almalence/plugins/processing/hdr/Adjustment.java diff --git a/src/com/almalence/plugins/processing/hdr/AdjustmentsPreset.java b/app/src/main/java/com/almalence/plugins/processing/hdr/AdjustmentsPreset.java similarity index 100% rename from src/com/almalence/plugins/processing/hdr/AdjustmentsPreset.java rename to app/src/main/java/com/almalence/plugins/processing/hdr/AdjustmentsPreset.java diff --git a/src/com/almalence/plugins/processing/hdr/AlmaShotHDR.java b/app/src/main/java/com/almalence/plugins/processing/hdr/AlmaShotHDR.java similarity index 100% rename from src/com/almalence/plugins/processing/hdr/AlmaShotHDR.java rename to app/src/main/java/com/almalence/plugins/processing/hdr/AlmaShotHDR.java diff --git a/src/com/almalence/plugins/processing/hdr/HDRProcessingPlugin.java b/app/src/main/java/com/almalence/plugins/processing/hdr/HDRProcessingPlugin.java similarity index 100% rename from src/com/almalence/plugins/processing/hdr/HDRProcessingPlugin.java rename to app/src/main/java/com/almalence/plugins/processing/hdr/HDRProcessingPlugin.java diff --git a/src/com/almalence/plugins/processing/multishot/AlmaCLRShot.java b/app/src/main/java/com/almalence/plugins/processing/multishot/AlmaCLRShot.java old mode 100755 new mode 100644 similarity index 100% rename from src/com/almalence/plugins/processing/multishot/AlmaCLRShot.java rename to app/src/main/java/com/almalence/plugins/processing/multishot/AlmaCLRShot.java diff --git a/src/com/almalence/plugins/processing/multishot/MultiShotProcessingPlugin.java b/app/src/main/java/com/almalence/plugins/processing/multishot/MultiShotProcessingPlugin.java similarity index 100% rename from src/com/almalence/plugins/processing/multishot/MultiShotProcessingPlugin.java rename to app/src/main/java/com/almalence/plugins/processing/multishot/MultiShotProcessingPlugin.java diff --git a/src/com/almalence/plugins/processing/multishot/MultiShotProcessingRouter.java b/app/src/main/java/com/almalence/plugins/processing/multishot/MultiShotProcessingRouter.java old mode 100755 new mode 100644 similarity index 100% rename from src/com/almalence/plugins/processing/multishot/MultiShotProcessingRouter.java rename to app/src/main/java/com/almalence/plugins/processing/multishot/MultiShotProcessingRouter.java diff --git a/src/com/almalence/plugins/processing/night/AlmaShotNight.java b/app/src/main/java/com/almalence/plugins/processing/night/AlmaShotNight.java similarity index 100% rename from src/com/almalence/plugins/processing/night/AlmaShotNight.java rename to app/src/main/java/com/almalence/plugins/processing/night/AlmaShotNight.java diff --git a/src/com/almalence/plugins/processing/night/NightProcessingPlugin.java b/app/src/main/java/com/almalence/plugins/processing/night/NightProcessingPlugin.java similarity index 100% rename from src/com/almalence/plugins/processing/night/NightProcessingPlugin.java rename to app/src/main/java/com/almalence/plugins/processing/night/NightProcessingPlugin.java diff --git a/src/com/almalence/plugins/processing/objectremoval/AlmaCLRShot.java b/app/src/main/java/com/almalence/plugins/processing/objectremoval/AlmaCLRShot.java similarity index 100% rename from src/com/almalence/plugins/processing/objectremoval/AlmaCLRShot.java rename to app/src/main/java/com/almalence/plugins/processing/objectremoval/AlmaCLRShot.java diff --git a/src/com/almalence/plugins/processing/objectremoval/ObjectRemovalCore.java b/app/src/main/java/com/almalence/plugins/processing/objectremoval/ObjectRemovalCore.java old mode 100755 new mode 100644 similarity index 100% rename from src/com/almalence/plugins/processing/objectremoval/ObjectRemovalCore.java rename to app/src/main/java/com/almalence/plugins/processing/objectremoval/ObjectRemovalCore.java diff --git a/src/com/almalence/plugins/processing/objectremoval/ObjectRemovalProcessingPlugin.java b/app/src/main/java/com/almalence/plugins/processing/objectremoval/ObjectRemovalProcessingPlugin.java similarity index 100% rename from src/com/almalence/plugins/processing/objectremoval/ObjectRemovalProcessingPlugin.java rename to app/src/main/java/com/almalence/plugins/processing/objectremoval/ObjectRemovalProcessingPlugin.java diff --git a/src/com/almalence/plugins/processing/panorama/AlmashotPanorama.java b/app/src/main/java/com/almalence/plugins/processing/panorama/AlmashotPanorama.java similarity index 100% rename from src/com/almalence/plugins/processing/panorama/AlmashotPanorama.java rename to app/src/main/java/com/almalence/plugins/processing/panorama/AlmashotPanorama.java diff --git a/src/com/almalence/plugins/processing/panorama/PanoramaProcessingPlugin.java b/app/src/main/java/com/almalence/plugins/processing/panorama/PanoramaProcessingPlugin.java similarity index 100% rename from src/com/almalence/plugins/processing/panorama/PanoramaProcessingPlugin.java rename to app/src/main/java/com/almalence/plugins/processing/panorama/PanoramaProcessingPlugin.java diff --git a/src/com/almalence/plugins/processing/preshot/PreshotProcessingPlugin.java b/app/src/main/java/com/almalence/plugins/processing/preshot/PreshotProcessingPlugin.java similarity index 100% rename from src/com/almalence/plugins/processing/preshot/PreshotProcessingPlugin.java rename to app/src/main/java/com/almalence/plugins/processing/preshot/PreshotProcessingPlugin.java diff --git a/src/com/almalence/plugins/processing/sequence/AlmaCLRShot.java b/app/src/main/java/com/almalence/plugins/processing/sequence/AlmaCLRShot.java similarity index 100% rename from src/com/almalence/plugins/processing/sequence/AlmaCLRShot.java rename to app/src/main/java/com/almalence/plugins/processing/sequence/AlmaCLRShot.java diff --git a/src/com/almalence/plugins/processing/sequence/OrderControl.java b/app/src/main/java/com/almalence/plugins/processing/sequence/OrderControl.java similarity index 100% rename from src/com/almalence/plugins/processing/sequence/OrderControl.java rename to app/src/main/java/com/almalence/plugins/processing/sequence/OrderControl.java diff --git a/src/com/almalence/plugins/processing/sequence/SequenceCore.java b/app/src/main/java/com/almalence/plugins/processing/sequence/SequenceCore.java old mode 100755 new mode 100644 similarity index 100% rename from src/com/almalence/plugins/processing/sequence/SequenceCore.java rename to app/src/main/java/com/almalence/plugins/processing/sequence/SequenceCore.java diff --git a/src/com/almalence/plugins/processing/sequence/SequenceProcessingPlugin.java b/app/src/main/java/com/almalence/plugins/processing/sequence/SequenceProcessingPlugin.java similarity index 100% rename from src/com/almalence/plugins/processing/sequence/SequenceProcessingPlugin.java rename to app/src/main/java/com/almalence/plugins/processing/sequence/SequenceProcessingPlugin.java diff --git a/src/com/almalence/plugins/processing/simple/AlmaShotDRO.java b/app/src/main/java/com/almalence/plugins/processing/simple/AlmaShotDRO.java similarity index 100% rename from src/com/almalence/plugins/processing/simple/AlmaShotDRO.java rename to app/src/main/java/com/almalence/plugins/processing/simple/AlmaShotDRO.java diff --git a/src/com/almalence/plugins/processing/simple/SimpleProcessingPlugin.java b/app/src/main/java/com/almalence/plugins/processing/simple/SimpleProcessingPlugin.java similarity index 100% rename from src/com/almalence/plugins/processing/simple/SimpleProcessingPlugin.java rename to app/src/main/java/com/almalence/plugins/processing/simple/SimpleProcessingPlugin.java diff --git a/src/com/almalence/plugins/vf/aeawlock/AeAwLockVFPlugin.java b/app/src/main/java/com/almalence/plugins/vf/aeawlock/AeAwLockVFPlugin.java similarity index 100% rename from src/com/almalence/plugins/vf/aeawlock/AeAwLockVFPlugin.java rename to app/src/main/java/com/almalence/plugins/vf/aeawlock/AeAwLockVFPlugin.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/Barcode.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/Barcode.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/Barcode.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/Barcode.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/BarcodeArrayAdapter.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/BarcodeArrayAdapter.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/BarcodeArrayAdapter.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/BarcodeArrayAdapter.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/BarcodeHistoryListDialog.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/BarcodeHistoryListDialog.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/BarcodeHistoryListDialog.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/BarcodeHistoryListDialog.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/BarcodeScannerVFPlugin.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/BarcodeScannerVFPlugin.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/BarcodeScannerVFPlugin.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/BarcodeScannerVFPlugin.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/BarcodeStorageHelper.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/BarcodeStorageHelper.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/BarcodeStorageHelper.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/BarcodeStorageHelper.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/BarcodeViewDialog.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/BarcodeViewDialog.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/BarcodeViewDialog.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/BarcodeViewDialog.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/result/CalendarResultHandler.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/CalendarResultHandler.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/result/CalendarResultHandler.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/CalendarResultHandler.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/result/Contents.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/Contents.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/result/Contents.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/Contents.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/result/EmailAddressResultHandler.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/EmailAddressResultHandler.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/result/EmailAddressResultHandler.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/EmailAddressResultHandler.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/result/GeoResultHandler.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/GeoResultHandler.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/result/GeoResultHandler.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/GeoResultHandler.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/result/LocaleManager.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/LocaleManager.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/result/LocaleManager.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/LocaleManager.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/result/ProductResultHandler.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/ProductResultHandler.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/result/ProductResultHandler.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/ProductResultHandler.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/result/ResultButtonListener.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/ResultButtonListener.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/result/ResultButtonListener.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/ResultButtonListener.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/result/ResultHandler.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/ResultHandler.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/result/ResultHandler.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/ResultHandler.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/result/ResultHandlerFactory.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/ResultHandlerFactory.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/result/ResultHandlerFactory.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/ResultHandlerFactory.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/result/SMSResultHandler.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/SMSResultHandler.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/result/SMSResultHandler.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/SMSResultHandler.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/result/TelResultHandler.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/TelResultHandler.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/result/TelResultHandler.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/TelResultHandler.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/result/TextResultHandler.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/TextResultHandler.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/result/TextResultHandler.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/TextResultHandler.java diff --git a/src/com/almalence/plugins/vf/barcodescanner/result/URIResultHandler.java b/app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/URIResultHandler.java similarity index 100% rename from src/com/almalence/plugins/vf/barcodescanner/result/URIResultHandler.java rename to app/src/main/java/com/almalence/plugins/vf/barcodescanner/result/URIResultHandler.java diff --git a/src/com/almalence/plugins/vf/focus/FocusIndicator.java b/app/src/main/java/com/almalence/plugins/vf/focus/FocusIndicator.java similarity index 100% rename from src/com/almalence/plugins/vf/focus/FocusIndicator.java rename to app/src/main/java/com/almalence/plugins/vf/focus/FocusIndicator.java diff --git a/src/com/almalence/plugins/vf/focus/FocusIndicatorView.java b/app/src/main/java/com/almalence/plugins/vf/focus/FocusIndicatorView.java similarity index 100% rename from src/com/almalence/plugins/vf/focus/FocusIndicatorView.java rename to app/src/main/java/com/almalence/plugins/vf/focus/FocusIndicatorView.java diff --git a/src/com/almalence/plugins/vf/focus/FocusVFPlugin.java b/app/src/main/java/com/almalence/plugins/vf/focus/FocusVFPlugin.java similarity index 100% rename from src/com/almalence/plugins/vf/focus/FocusVFPlugin.java rename to app/src/main/java/com/almalence/plugins/vf/focus/FocusVFPlugin.java diff --git a/src/com/almalence/plugins/vf/focus/Rotatable.java b/app/src/main/java/com/almalence/plugins/vf/focus/Rotatable.java similarity index 100% rename from src/com/almalence/plugins/vf/focus/Rotatable.java rename to app/src/main/java/com/almalence/plugins/vf/focus/Rotatable.java diff --git a/src/com/almalence/plugins/vf/focus/RotateLayout.java b/app/src/main/java/com/almalence/plugins/vf/focus/RotateLayout.java similarity index 100% rename from src/com/almalence/plugins/vf/focus/RotateLayout.java rename to app/src/main/java/com/almalence/plugins/vf/focus/RotateLayout.java diff --git a/src/com/almalence/plugins/vf/grid/GridVFPlugin.java b/app/src/main/java/com/almalence/plugins/vf/grid/GridVFPlugin.java similarity index 100% rename from src/com/almalence/plugins/vf/grid/GridVFPlugin.java rename to app/src/main/java/com/almalence/plugins/vf/grid/GridVFPlugin.java diff --git a/src/com/almalence/plugins/vf/gyro/AugmentedSurfaceView.java b/app/src/main/java/com/almalence/plugins/vf/gyro/AugmentedSurfaceView.java similarity index 100% rename from src/com/almalence/plugins/vf/gyro/AugmentedSurfaceView.java rename to app/src/main/java/com/almalence/plugins/vf/gyro/AugmentedSurfaceView.java diff --git a/src/com/almalence/plugins/vf/gyro/GyroVFPlugin.java b/app/src/main/java/com/almalence/plugins/vf/gyro/GyroVFPlugin.java similarity index 100% rename from src/com/almalence/plugins/vf/gyro/GyroVFPlugin.java rename to app/src/main/java/com/almalence/plugins/vf/gyro/GyroVFPlugin.java diff --git a/src/com/almalence/plugins/vf/histogram/Histogram.java b/app/src/main/java/com/almalence/plugins/vf/histogram/Histogram.java similarity index 100% rename from src/com/almalence/plugins/vf/histogram/Histogram.java rename to app/src/main/java/com/almalence/plugins/vf/histogram/Histogram.java diff --git a/src/com/almalence/plugins/vf/histogram/HistogramVFPlugin.java b/app/src/main/java/com/almalence/plugins/vf/histogram/HistogramVFPlugin.java similarity index 100% rename from src/com/almalence/plugins/vf/histogram/HistogramVFPlugin.java rename to app/src/main/java/com/almalence/plugins/vf/histogram/HistogramVFPlugin.java diff --git a/src/com/almalence/plugins/vf/infoset/InfosetVFPlugin.java b/app/src/main/java/com/almalence/plugins/vf/infoset/InfosetVFPlugin.java similarity index 100% rename from src/com/almalence/plugins/vf/infoset/InfosetVFPlugin.java rename to app/src/main/java/com/almalence/plugins/vf/infoset/InfosetVFPlugin.java diff --git a/src/com/almalence/plugins/vf/zoom/ZoomVFPlugin.java b/app/src/main/java/com/almalence/plugins/vf/zoom/ZoomVFPlugin.java similarity index 100% rename from src/com/almalence/plugins/vf/zoom/ZoomVFPlugin.java rename to app/src/main/java/com/almalence/plugins/vf/zoom/ZoomVFPlugin.java diff --git a/src/com/almalence/sony/cameraremote/DeviceListAdapter.java b/app/src/main/java/com/almalence/sony/cameraremote/DeviceListAdapter.java similarity index 100% rename from src/com/almalence/sony/cameraremote/DeviceListAdapter.java rename to app/src/main/java/com/almalence/sony/cameraremote/DeviceListAdapter.java diff --git a/src/com/almalence/sony/cameraremote/PictureCallbackSonyRemote.java b/app/src/main/java/com/almalence/sony/cameraremote/PictureCallbackSonyRemote.java similarity index 100% rename from src/com/almalence/sony/cameraremote/PictureCallbackSonyRemote.java rename to app/src/main/java/com/almalence/sony/cameraremote/PictureCallbackSonyRemote.java diff --git a/src/com/almalence/sony/cameraremote/ServerDevice.java b/app/src/main/java/com/almalence/sony/cameraremote/ServerDevice.java similarity index 100% rename from src/com/almalence/sony/cameraremote/ServerDevice.java rename to app/src/main/java/com/almalence/sony/cameraremote/ServerDevice.java diff --git a/src/com/almalence/sony/cameraremote/SimpleCameraEventObserver.java b/app/src/main/java/com/almalence/sony/cameraremote/SimpleCameraEventObserver.java similarity index 100% rename from src/com/almalence/sony/cameraremote/SimpleCameraEventObserver.java rename to app/src/main/java/com/almalence/sony/cameraremote/SimpleCameraEventObserver.java diff --git a/src/com/almalence/sony/cameraremote/SimpleRemoteApi.java b/app/src/main/java/com/almalence/sony/cameraremote/SimpleRemoteApi.java similarity index 100% rename from src/com/almalence/sony/cameraremote/SimpleRemoteApi.java rename to app/src/main/java/com/almalence/sony/cameraremote/SimpleRemoteApi.java diff --git a/src/com/almalence/sony/cameraremote/SimpleSsdpClient.java b/app/src/main/java/com/almalence/sony/cameraremote/SimpleSsdpClient.java similarity index 100% rename from src/com/almalence/sony/cameraremote/SimpleSsdpClient.java rename to app/src/main/java/com/almalence/sony/cameraremote/SimpleSsdpClient.java diff --git a/src/com/almalence/sony/cameraremote/SimpleStreamSurfaceView.java b/app/src/main/java/com/almalence/sony/cameraremote/SimpleStreamSurfaceView.java similarity index 100% rename from src/com/almalence/sony/cameraremote/SimpleStreamSurfaceView.java rename to app/src/main/java/com/almalence/sony/cameraremote/SimpleStreamSurfaceView.java diff --git a/src/com/almalence/sony/cameraremote/ZoomCallbackSonyRemote.java b/app/src/main/java/com/almalence/sony/cameraremote/ZoomCallbackSonyRemote.java similarity index 100% rename from src/com/almalence/sony/cameraremote/ZoomCallbackSonyRemote.java rename to app/src/main/java/com/almalence/sony/cameraremote/ZoomCallbackSonyRemote.java diff --git a/src/com/almalence/sony/cameraremote/utils/DisplayHelper.java b/app/src/main/java/com/almalence/sony/cameraremote/utils/DisplayHelper.java similarity index 100% rename from src/com/almalence/sony/cameraremote/utils/DisplayHelper.java rename to app/src/main/java/com/almalence/sony/cameraremote/utils/DisplayHelper.java diff --git a/src/com/almalence/sony/cameraremote/utils/NFCHandler.java b/app/src/main/java/com/almalence/sony/cameraremote/utils/NFCHandler.java similarity index 100% rename from src/com/almalence/sony/cameraremote/utils/NFCHandler.java rename to app/src/main/java/com/almalence/sony/cameraremote/utils/NFCHandler.java diff --git a/src/com/almalence/sony/cameraremote/utils/SimpleHttpClient.java b/app/src/main/java/com/almalence/sony/cameraremote/utils/SimpleHttpClient.java similarity index 100% rename from src/com/almalence/sony/cameraremote/utils/SimpleHttpClient.java rename to app/src/main/java/com/almalence/sony/cameraremote/utils/SimpleHttpClient.java diff --git a/src/com/almalence/sony/cameraremote/utils/SimpleLiveviewSlicer.java b/app/src/main/java/com/almalence/sony/cameraremote/utils/SimpleLiveviewSlicer.java similarity index 100% rename from src/com/almalence/sony/cameraremote/utils/SimpleLiveviewSlicer.java rename to app/src/main/java/com/almalence/sony/cameraremote/utils/SimpleLiveviewSlicer.java diff --git a/src/com/almalence/sony/cameraremote/utils/SimpleRemoteApiHelper.java b/app/src/main/java/com/almalence/sony/cameraremote/utils/SimpleRemoteApiHelper.java similarity index 100% rename from src/com/almalence/sony/cameraremote/utils/SimpleRemoteApiHelper.java rename to app/src/main/java/com/almalence/sony/cameraremote/utils/SimpleRemoteApiHelper.java diff --git a/src/com/almalence/sony/cameraremote/utils/WifiHandler.java b/app/src/main/java/com/almalence/sony/cameraremote/utils/WifiHandler.java similarity index 100% rename from src/com/almalence/sony/cameraremote/utils/WifiHandler.java rename to app/src/main/java/com/almalence/sony/cameraremote/utils/WifiHandler.java diff --git a/src/com/almalence/sony/cameraremote/utils/WifiListener.java b/app/src/main/java/com/almalence/sony/cameraremote/utils/WifiListener.java similarity index 100% rename from src/com/almalence/sony/cameraremote/utils/WifiListener.java rename to app/src/main/java/com/almalence/sony/cameraremote/utils/WifiListener.java diff --git a/src/com/almalence/sony/cameraremote/utils/XmlElement.java b/app/src/main/java/com/almalence/sony/cameraremote/utils/XmlElement.java similarity index 100% rename from src/com/almalence/sony/cameraremote/utils/XmlElement.java rename to app/src/main/java/com/almalence/sony/cameraremote/utils/XmlElement.java diff --git a/src/com/almalence/ui/ListPreferenceAdapter.java b/app/src/main/java/com/almalence/ui/ListPreferenceAdapter.java similarity index 100% rename from src/com/almalence/ui/ListPreferenceAdapter.java rename to app/src/main/java/com/almalence/ui/ListPreferenceAdapter.java diff --git a/src/com/almalence/ui/Panel.java b/app/src/main/java/com/almalence/ui/Panel.java similarity index 100% rename from src/com/almalence/ui/Panel.java rename to app/src/main/java/com/almalence/ui/Panel.java diff --git a/src/com/almalence/ui/RotateDialog.java b/app/src/main/java/com/almalence/ui/RotateDialog.java similarity index 100% rename from src/com/almalence/ui/RotateDialog.java rename to app/src/main/java/com/almalence/ui/RotateDialog.java diff --git a/src/com/almalence/ui/RotateImageView.java b/app/src/main/java/com/almalence/ui/RotateImageView.java similarity index 100% rename from src/com/almalence/ui/RotateImageView.java rename to app/src/main/java/com/almalence/ui/RotateImageView.java diff --git a/src/com/almalence/ui/RotateLayout.java b/app/src/main/java/com/almalence/ui/RotateLayout.java similarity index 100% rename from src/com/almalence/ui/RotateLayout.java rename to app/src/main/java/com/almalence/ui/RotateLayout.java diff --git a/src/com/almalence/ui/ShutterSwitch.java b/app/src/main/java/com/almalence/ui/ShutterSwitch.java similarity index 100% rename from src/com/almalence/ui/ShutterSwitch.java rename to app/src/main/java/com/almalence/ui/ShutterSwitch.java diff --git a/src/com/almalence/ui/Switch/AllCapsTransformationMethod.java b/app/src/main/java/com/almalence/ui/Switch/AllCapsTransformationMethod.java similarity index 100% rename from src/com/almalence/ui/Switch/AllCapsTransformationMethod.java rename to app/src/main/java/com/almalence/ui/Switch/AllCapsTransformationMethod.java diff --git a/src/com/almalence/ui/Switch/Switch.java b/app/src/main/java/com/almalence/ui/Switch/Switch.java similarity index 100% rename from src/com/almalence/ui/Switch/Switch.java rename to app/src/main/java/com/almalence/ui/Switch/Switch.java diff --git a/src/com/almalence/ui/Switch/TransformationMethodCompat.java b/app/src/main/java/com/almalence/ui/Switch/TransformationMethodCompat.java similarity index 100% rename from src/com/almalence/ui/Switch/TransformationMethodCompat.java rename to app/src/main/java/com/almalence/ui/Switch/TransformationMethodCompat.java diff --git a/src/com/almalence/ui/Switch/TransformationMethodCompat2.java b/app/src/main/java/com/almalence/ui/Switch/TransformationMethodCompat2.java similarity index 100% rename from src/com/almalence/ui/Switch/TransformationMethodCompat2.java rename to app/src/main/java/com/almalence/ui/Switch/TransformationMethodCompat2.java diff --git a/src/com/almalence/ui/VerticalSeekBar.java b/app/src/main/java/com/almalence/ui/VerticalSeekBar.java similarity index 100% rename from src/com/almalence/ui/VerticalSeekBar.java rename to app/src/main/java/com/almalence/ui/VerticalSeekBar.java diff --git a/src/com/almalence/util/AppEditorNotifier.java b/app/src/main/java/com/almalence/util/AppEditorNotifier.java similarity index 100% rename from src/com/almalence/util/AppEditorNotifier.java rename to app/src/main/java/com/almalence/util/AppEditorNotifier.java diff --git a/src/com/almalence/util/AppRater.java b/app/src/main/java/com/almalence/util/AppRater.java similarity index 100% rename from src/com/almalence/util/AppRater.java rename to app/src/main/java/com/almalence/util/AppRater.java diff --git a/app/src/main/java/com/almalence/util/AppWidgetNotifier.java b/app/src/main/java/com/almalence/util/AppWidgetNotifier.java new file mode 100644 index 00000000..37711f14 --- /dev/null +++ b/app/src/main/java/com/almalence/util/AppWidgetNotifier.java @@ -0,0 +1,190 @@ +/* +The contents of this file are subject to the Mozilla Public License +Version 1.1 (the "License"); you may not use this file except in +compliance with the License. You may obtain a copy of the License at +http://www.mozilla.org/MPL/ + +Software distributed under the License is distributed on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +License for the specific language governing rights and limitations +under the License. + +The Original Code is collection of files collectively known as Open Camera. + +The Initial Developer of the Original Code is Almalence Inc. +Portions created by Initial Developer are Copyright (C) 2013 +by Almalence Inc. All Rights Reserved. + */ + +package com.almalence.util; + +import android.app.Activity; +import android.app.AlertDialog; +import android.content.DialogInterface; +import android.content.DialogInterface.OnCancelListener; +import android.content.SharedPreferences; +import android.view.View; +import android.view.View.OnClickListener; +import android.widget.Button; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; + +// +/* */ + +public class AppWidgetNotifier +{ + private static final int DAYS_UNTIL_PROMPT = 0; + private static final int LAUNCHES_UNTIL_PROMPT = 2; + + public static void app_launched(Activity mContext) + { + SharedPreferences prefs = mContext.getSharedPreferences("appwidgetnotifier", 0); + if (prefs.getBoolean("dontshowagainwidgetnotifier", false)) + { + return; + } + + SharedPreferences.Editor editor = prefs.edit(); + + // Increment launch counter + long launch_count = prefs.getLong("launch_count_widgetnotifier", 0) + 1; + editor.putLong("launch_count_widgetnotifier", launch_count); + + // Get date of first launch + Long date_firstLaunch = prefs.getLong("date_firstlaunch_widgetnotifier", 0); + if (date_firstLaunch == 0) + { + date_firstLaunch = System.currentTimeMillis(); + editor.putLong("date_firstlaunch_widgetnotifier", date_firstLaunch); + } + + editor.commit(); + } + + public static final boolean isABCWidgetInstalled(Activity activity) + { + try + { + activity.getPackageManager().getInstallerPackageName("com.almalence.opencamwidget"); + } catch (IllegalArgumentException e) + { + return false; + } + + return true; + } + + public static boolean showNotifierDialogIfNeeded(final Activity mContext) + { + // check if installed + if (isABCWidgetInstalled(ApplicationScreen.instance)) + { + return false; + } + + final SharedPreferences prefs = mContext.getSharedPreferences("appwidgetnotifier", 0); + if (prefs.getBoolean("dontshowagainwidgetnotifier", false)) + { + return false; + } + + final long launch_count = prefs.getLong("launch_count_widgetnotifier", 0) + 1; + final Long date_firstLaunch = prefs.getLong("date_firstlaunch_widgetnotifier", 0); + + if (launch_count >= LAUNCHES_UNTIL_PROMPT) + { + if (System.currentTimeMillis() >= date_firstLaunch + Long.valueOf((long)DAYS_UNTIL_PROMPT * 24 * 60 * 60 * 1000)) + { + showNotifierDialog(mContext, prefs); + + return true; + } + } + + return false; + } + + private static void showNotifierDialog(final Activity mContext, final SharedPreferences prefs) + { + final float density = mContext.getResources().getDisplayMetrics().density; + + LinearLayout ll = new LinearLayout(mContext); + ll.setOrientation(LinearLayout.VERTICAL); + ll.setPadding((int) (10 * density), (int) (10 * density), (int) (10 * density), (int) (10 * density)); + + ImageView img = new ImageView(mContext); + img.setImageDrawable(ApplicationScreen.getAppResources().getDrawable(R.drawable.widget_adv)); + ll.addView(img); + + TextView tv = new TextView(mContext); + tv.setText(ApplicationScreen.getAppResources().getString(R.string.widgetAdvText)); + tv.setWidth((int) (250 * density)); + tv.setPadding((int) (4 * density), 0, (int) (4 * density), (int) (24 * density)); + ll.addView(tv); + + Button b1 = new Button(mContext); + b1.setText(ApplicationScreen.getAppResources().getString(R.string.widgetInstallText)); + ll.addView(b1); + + Button b3 = new Button(mContext); + b3.setText(ApplicationScreen.getAppResources().getString(R.string.widgetNoText)); + ll.addView(b3); + + final AlertDialog.Builder builder = new AlertDialog.Builder(mContext); + builder.setView(ll); + final AlertDialog dialog = builder.create(); + dialog.setOnCancelListener(new OnCancelListener() + { + @Override + public void onCancel(DialogInterface dialog) + { + mContext.finish(); + } + }); + + b1.setOnClickListener(new OnClickListener() + { + public void onClick(View v) + { + MainScreen.callStoreInstall(mContext, "com.almalence.opencamwidget"); + + if (prefs != null) + { + prefs.edit().putBoolean("dontshowagainwidgetnotifier", true).commit(); + + mContext.finish(); + } + + dialog.dismiss(); + } + }); + + b3.setOnClickListener(new OnClickListener() + { + public void onClick(View v) + { + if (prefs != null) + { + prefs.edit().putBoolean("dontshowagainwidgetnotifier", true).commit(); + + mContext.finish(); + } + + dialog.dismiss(); + } + }); + + dialog.show(); + } +} diff --git a/src/com/almalence/util/FpsMeasurer.java b/app/src/main/java/com/almalence/util/FpsMeasurer.java similarity index 100% rename from src/com/almalence/util/FpsMeasurer.java rename to app/src/main/java/com/almalence/util/FpsMeasurer.java diff --git a/src/com/almalence/util/HeapUtil.java b/app/src/main/java/com/almalence/util/HeapUtil.java similarity index 100% rename from src/com/almalence/util/HeapUtil.java rename to app/src/main/java/com/almalence/util/HeapUtil.java diff --git a/src/com/almalence/util/ImageConversion.java b/app/src/main/java/com/almalence/util/ImageConversion.java similarity index 100% rename from src/com/almalence/util/ImageConversion.java rename to app/src/main/java/com/almalence/util/ImageConversion.java diff --git a/src/com/almalence/util/MLocation.java b/app/src/main/java/com/almalence/util/MLocation.java similarity index 100% rename from src/com/almalence/util/MLocation.java rename to app/src/main/java/com/almalence/util/MLocation.java diff --git a/src/com/almalence/util/MemoryImageCache.java b/app/src/main/java/com/almalence/util/MemoryImageCache.java similarity index 100% rename from src/com/almalence/util/MemoryImageCache.java rename to app/src/main/java/com/almalence/util/MemoryImageCache.java diff --git a/src/com/almalence/util/Size.java b/app/src/main/java/com/almalence/util/Size.java similarity index 100% rename from src/com/almalence/util/Size.java rename to app/src/main/java/com/almalence/util/Size.java diff --git a/src/com/almalence/util/Util.java b/app/src/main/java/com/almalence/util/Util.java similarity index 100% rename from src/com/almalence/util/Util.java rename to app/src/main/java/com/almalence/util/Util.java diff --git a/src/com/almalence/util/exifreader/imaging/ImageMetadataReader.java b/app/src/main/java/com/almalence/util/exifreader/imaging/ImageMetadataReader.java similarity index 100% rename from src/com/almalence/util/exifreader/imaging/ImageMetadataReader.java rename to app/src/main/java/com/almalence/util/exifreader/imaging/ImageMetadataReader.java diff --git a/src/com/almalence/util/exifreader/imaging/ImageProcessingException.java b/app/src/main/java/com/almalence/util/exifreader/imaging/ImageProcessingException.java similarity index 100% rename from src/com/almalence/util/exifreader/imaging/ImageProcessingException.java rename to app/src/main/java/com/almalence/util/exifreader/imaging/ImageProcessingException.java diff --git a/src/com/almalence/util/exifreader/imaging/PhotographicConversions.java b/app/src/main/java/com/almalence/util/exifreader/imaging/PhotographicConversions.java similarity index 100% rename from src/com/almalence/util/exifreader/imaging/PhotographicConversions.java rename to app/src/main/java/com/almalence/util/exifreader/imaging/PhotographicConversions.java diff --git a/src/com/almalence/util/exifreader/imaging/jpeg/JpegMetadataReader.java b/app/src/main/java/com/almalence/util/exifreader/imaging/jpeg/JpegMetadataReader.java similarity index 100% rename from src/com/almalence/util/exifreader/imaging/jpeg/JpegMetadataReader.java rename to app/src/main/java/com/almalence/util/exifreader/imaging/jpeg/JpegMetadataReader.java diff --git a/src/com/almalence/util/exifreader/imaging/jpeg/JpegProcessingException.java b/app/src/main/java/com/almalence/util/exifreader/imaging/jpeg/JpegProcessingException.java similarity index 100% rename from src/com/almalence/util/exifreader/imaging/jpeg/JpegProcessingException.java rename to app/src/main/java/com/almalence/util/exifreader/imaging/jpeg/JpegProcessingException.java diff --git a/src/com/almalence/util/exifreader/imaging/jpeg/JpegSegmentData.java b/app/src/main/java/com/almalence/util/exifreader/imaging/jpeg/JpegSegmentData.java similarity index 100% rename from src/com/almalence/util/exifreader/imaging/jpeg/JpegSegmentData.java rename to app/src/main/java/com/almalence/util/exifreader/imaging/jpeg/JpegSegmentData.java diff --git a/src/com/almalence/util/exifreader/imaging/jpeg/JpegSegmentReader.java b/app/src/main/java/com/almalence/util/exifreader/imaging/jpeg/JpegSegmentReader.java similarity index 100% rename from src/com/almalence/util/exifreader/imaging/jpeg/JpegSegmentReader.java rename to app/src/main/java/com/almalence/util/exifreader/imaging/jpeg/JpegSegmentReader.java diff --git a/src/com/almalence/util/exifreader/lang/BufferBoundsException.java b/app/src/main/java/com/almalence/util/exifreader/lang/BufferBoundsException.java similarity index 100% rename from src/com/almalence/util/exifreader/lang/BufferBoundsException.java rename to app/src/main/java/com/almalence/util/exifreader/lang/BufferBoundsException.java diff --git a/src/com/almalence/util/exifreader/lang/BufferReader.java b/app/src/main/java/com/almalence/util/exifreader/lang/BufferReader.java similarity index 100% rename from src/com/almalence/util/exifreader/lang/BufferReader.java rename to app/src/main/java/com/almalence/util/exifreader/lang/BufferReader.java diff --git a/src/com/almalence/util/exifreader/lang/ByteArrayReader.java b/app/src/main/java/com/almalence/util/exifreader/lang/ByteArrayReader.java similarity index 100% rename from src/com/almalence/util/exifreader/lang/ByteArrayReader.java rename to app/src/main/java/com/almalence/util/exifreader/lang/ByteArrayReader.java diff --git a/src/com/almalence/util/exifreader/lang/CompoundException.java b/app/src/main/java/com/almalence/util/exifreader/lang/CompoundException.java similarity index 100% rename from src/com/almalence/util/exifreader/lang/CompoundException.java rename to app/src/main/java/com/almalence/util/exifreader/lang/CompoundException.java diff --git a/src/com/almalence/util/exifreader/lang/GeoLocation.java b/app/src/main/java/com/almalence/util/exifreader/lang/GeoLocation.java similarity index 100% rename from src/com/almalence/util/exifreader/lang/GeoLocation.java rename to app/src/main/java/com/almalence/util/exifreader/lang/GeoLocation.java diff --git a/src/com/almalence/util/exifreader/lang/NullOutputStream.java b/app/src/main/java/com/almalence/util/exifreader/lang/NullOutputStream.java similarity index 100% rename from src/com/almalence/util/exifreader/lang/NullOutputStream.java rename to app/src/main/java/com/almalence/util/exifreader/lang/NullOutputStream.java diff --git a/src/com/almalence/util/exifreader/lang/RandomAccessFileReader.java b/app/src/main/java/com/almalence/util/exifreader/lang/RandomAccessFileReader.java similarity index 100% rename from src/com/almalence/util/exifreader/lang/RandomAccessFileReader.java rename to app/src/main/java/com/almalence/util/exifreader/lang/RandomAccessFileReader.java diff --git a/src/com/almalence/util/exifreader/lang/Rational.java b/app/src/main/java/com/almalence/util/exifreader/lang/Rational.java similarity index 100% rename from src/com/almalence/util/exifreader/lang/Rational.java rename to app/src/main/java/com/almalence/util/exifreader/lang/Rational.java diff --git a/src/com/almalence/util/exifreader/lang/StringUtil.java b/app/src/main/java/com/almalence/util/exifreader/lang/StringUtil.java similarity index 100% rename from src/com/almalence/util/exifreader/lang/StringUtil.java rename to app/src/main/java/com/almalence/util/exifreader/lang/StringUtil.java diff --git a/src/com/almalence/util/exifreader/lang/annotations/NotNull.java b/app/src/main/java/com/almalence/util/exifreader/lang/annotations/NotNull.java similarity index 100% rename from src/com/almalence/util/exifreader/lang/annotations/NotNull.java rename to app/src/main/java/com/almalence/util/exifreader/lang/annotations/NotNull.java diff --git a/src/com/almalence/util/exifreader/lang/annotations/Nullable.java b/app/src/main/java/com/almalence/util/exifreader/lang/annotations/Nullable.java similarity index 100% rename from src/com/almalence/util/exifreader/lang/annotations/Nullable.java rename to app/src/main/java/com/almalence/util/exifreader/lang/annotations/Nullable.java diff --git a/src/com/almalence/util/exifreader/lang/annotations/SuppressWarnings.java b/app/src/main/java/com/almalence/util/exifreader/lang/annotations/SuppressWarnings.java similarity index 100% rename from src/com/almalence/util/exifreader/lang/annotations/SuppressWarnings.java rename to app/src/main/java/com/almalence/util/exifreader/lang/annotations/SuppressWarnings.java diff --git a/src/com/almalence/util/exifreader/metadata/DefaultTagDescriptor.java b/app/src/main/java/com/almalence/util/exifreader/metadata/DefaultTagDescriptor.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/DefaultTagDescriptor.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/DefaultTagDescriptor.java diff --git a/src/com/almalence/util/exifreader/metadata/Directory.java b/app/src/main/java/com/almalence/util/exifreader/metadata/Directory.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/Directory.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/Directory.java diff --git a/src/com/almalence/util/exifreader/metadata/Metadata.java b/app/src/main/java/com/almalence/util/exifreader/metadata/Metadata.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/Metadata.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/Metadata.java diff --git a/src/com/almalence/util/exifreader/metadata/MetadataException.java b/app/src/main/java/com/almalence/util/exifreader/metadata/MetadataException.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/MetadataException.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/MetadataException.java diff --git a/src/com/almalence/util/exifreader/metadata/MetadataReader.java b/app/src/main/java/com/almalence/util/exifreader/metadata/MetadataReader.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/MetadataReader.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/MetadataReader.java diff --git a/src/com/almalence/util/exifreader/metadata/Tag.java b/app/src/main/java/com/almalence/util/exifreader/metadata/Tag.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/Tag.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/Tag.java diff --git a/src/com/almalence/util/exifreader/metadata/TagDescriptor.java b/app/src/main/java/com/almalence/util/exifreader/metadata/TagDescriptor.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/TagDescriptor.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/TagDescriptor.java diff --git a/src/com/almalence/util/exifreader/metadata/exif/DataFormat.java b/app/src/main/java/com/almalence/util/exifreader/metadata/exif/DataFormat.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/exif/DataFormat.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/exif/DataFormat.java diff --git a/src/com/almalence/util/exifreader/metadata/exif/ExifIFD0Descriptor.java b/app/src/main/java/com/almalence/util/exifreader/metadata/exif/ExifIFD0Descriptor.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/exif/ExifIFD0Descriptor.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/exif/ExifIFD0Descriptor.java diff --git a/src/com/almalence/util/exifreader/metadata/exif/ExifIFD0Directory.java b/app/src/main/java/com/almalence/util/exifreader/metadata/exif/ExifIFD0Directory.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/exif/ExifIFD0Directory.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/exif/ExifIFD0Directory.java diff --git a/src/com/almalence/util/exifreader/metadata/exif/ExifReader.java b/app/src/main/java/com/almalence/util/exifreader/metadata/exif/ExifReader.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/exif/ExifReader.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/exif/ExifReader.java diff --git a/src/com/almalence/util/exifreader/metadata/exif/ExifSubIFDDescriptor.java b/app/src/main/java/com/almalence/util/exifreader/metadata/exif/ExifSubIFDDescriptor.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/exif/ExifSubIFDDescriptor.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/exif/ExifSubIFDDescriptor.java diff --git a/src/com/almalence/util/exifreader/metadata/exif/ExifSubIFDDirectory.java b/app/src/main/java/com/almalence/util/exifreader/metadata/exif/ExifSubIFDDirectory.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/exif/ExifSubIFDDirectory.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/exif/ExifSubIFDDirectory.java diff --git a/src/com/almalence/util/exifreader/metadata/jpeg/JpegCommentDescriptor.java b/app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegCommentDescriptor.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/jpeg/JpegCommentDescriptor.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegCommentDescriptor.java diff --git a/src/com/almalence/util/exifreader/metadata/jpeg/JpegCommentDirectory.java b/app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegCommentDirectory.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/jpeg/JpegCommentDirectory.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegCommentDirectory.java diff --git a/src/com/almalence/util/exifreader/metadata/jpeg/JpegCommentReader.java b/app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegCommentReader.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/jpeg/JpegCommentReader.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegCommentReader.java diff --git a/src/com/almalence/util/exifreader/metadata/jpeg/JpegComponent.java b/app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegComponent.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/jpeg/JpegComponent.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegComponent.java diff --git a/src/com/almalence/util/exifreader/metadata/jpeg/JpegDescriptor.java b/app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegDescriptor.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/jpeg/JpegDescriptor.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegDescriptor.java diff --git a/src/com/almalence/util/exifreader/metadata/jpeg/JpegDirectory.java b/app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegDirectory.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/jpeg/JpegDirectory.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegDirectory.java diff --git a/src/com/almalence/util/exifreader/metadata/jpeg/JpegReader.java b/app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegReader.java similarity index 100% rename from src/com/almalence/util/exifreader/metadata/jpeg/JpegReader.java rename to app/src/main/java/com/almalence/util/exifreader/metadata/jpeg/JpegReader.java diff --git a/src/com/almalence/widget/OpenCameraFullSolidWidgetProvider.java b/app/src/main/java/com/almalence/widget/OpenCameraFullSolidWidgetProvider.java similarity index 100% rename from src/com/almalence/widget/OpenCameraFullSolidWidgetProvider.java rename to app/src/main/java/com/almalence/widget/OpenCameraFullSolidWidgetProvider.java diff --git a/src/com/almalence/widget/OpenCameraFullSolidWidgetService.java b/app/src/main/java/com/almalence/widget/OpenCameraFullSolidWidgetService.java similarity index 100% rename from src/com/almalence/widget/OpenCameraFullSolidWidgetService.java rename to app/src/main/java/com/almalence/widget/OpenCameraFullSolidWidgetService.java diff --git a/src/com/almalence/widget/OpenCameraSolidWidgetConfigureActivity.java b/app/src/main/java/com/almalence/widget/OpenCameraSolidWidgetConfigureActivity.java similarity index 100% rename from src/com/almalence/widget/OpenCameraSolidWidgetConfigureActivity.java rename to app/src/main/java/com/almalence/widget/OpenCameraSolidWidgetConfigureActivity.java diff --git a/src/com/almalence/widget/OpenCameraSolidWidgetProvider.java b/app/src/main/java/com/almalence/widget/OpenCameraSolidWidgetProvider.java similarity index 100% rename from src/com/almalence/widget/OpenCameraSolidWidgetProvider.java rename to app/src/main/java/com/almalence/widget/OpenCameraSolidWidgetProvider.java diff --git a/src/com/almalence/widget/OpenCameraSolidWidgetService.java b/app/src/main/java/com/almalence/widget/OpenCameraSolidWidgetService.java similarity index 100% rename from src/com/almalence/widget/OpenCameraSolidWidgetService.java rename to app/src/main/java/com/almalence/widget/OpenCameraSolidWidgetService.java diff --git a/src/com/almalence/widget/OpenCameraWidgetConfigureActivity.java b/app/src/main/java/com/almalence/widget/OpenCameraWidgetConfigureActivity.java similarity index 100% rename from src/com/almalence/widget/OpenCameraWidgetConfigureActivity.java rename to app/src/main/java/com/almalence/widget/OpenCameraWidgetConfigureActivity.java diff --git a/src/com/almalence/widget/OpenCameraWidgetItem.java b/app/src/main/java/com/almalence/widget/OpenCameraWidgetItem.java similarity index 100% rename from src/com/almalence/widget/OpenCameraWidgetItem.java rename to app/src/main/java/com/almalence/widget/OpenCameraWidgetItem.java diff --git a/src/com/almalence/widget/OpenCameraWidgetProvider.java b/app/src/main/java/com/almalence/widget/OpenCameraWidgetProvider.java similarity index 100% rename from src/com/almalence/widget/OpenCameraWidgetProvider.java rename to app/src/main/java/com/almalence/widget/OpenCameraWidgetProvider.java diff --git a/src/com/almalence/widget/OpenCameraWidgetService.java b/app/src/main/java/com/almalence/widget/OpenCameraWidgetService.java similarity index 100% rename from src/com/almalence/widget/OpenCameraWidgetService.java rename to app/src/main/java/com/almalence/widget/OpenCameraWidgetService.java diff --git a/jni/Android.mk b/app/src/main/jni/Android.mk similarity index 100% rename from jni/Android.mk rename to app/src/main/jni/Android.mk diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk new file mode 100755 index 00000000..3f92d56a --- /dev/null +++ b/app/src/main/jni/Application.mk @@ -0,0 +1,12 @@ +#APP_ABI := armeabi-v7a +APP_ABI := x86 + +#unlocked +#APP_ABI := armeabi-v7a x86 + +#APP_STL := gnustl_static +APP_STL := c++_shared +APP_OPTIM := release +APP_PLATFORM := android-21 +#NDK_TOOLCHAIN_VERSION=4.9 +APP_ALLOW_MISSING_DEPS=true \ No newline at end of file diff --git a/jni/Flags.mk b/app/src/main/jni/Flags.mk similarity index 100% rename from jni/Flags.mk rename to app/src/main/jni/Flags.mk diff --git a/jni/almashot/Almalence Imaging SDK for Open Camera - LICENSE.pdf b/app/src/main/jni/almashot/Almalence Imaging SDK for Open Camera - LICENSE.pdf similarity index 100% rename from jni/almashot/Almalence Imaging SDK for Open Camera - LICENSE.pdf rename to app/src/main/jni/almashot/Almalence Imaging SDK for Open Camera - LICENSE.pdf diff --git a/jni/almashot/Android.mk b/app/src/main/jni/almashot/Android.mk similarity index 100% rename from jni/almashot/Android.mk rename to app/src/main/jni/almashot/Android.mk diff --git a/jni/almashot/armeabi-v7a/libalmalib_eval.a b/app/src/main/jni/almashot/armeabi-v7a/libalmalib_eval.a similarity index 100% rename from jni/almashot/armeabi-v7a/libalmalib_eval.a rename to app/src/main/jni/almashot/armeabi-v7a/libalmalib_eval.a diff --git a/jni/almashot/armeabi-v7a/libversion.txt b/app/src/main/jni/almashot/armeabi-v7a/libversion.txt similarity index 100% rename from jni/almashot/armeabi-v7a/libversion.txt rename to app/src/main/jni/almashot/armeabi-v7a/libversion.txt diff --git a/jni/almashot/stub.cpp b/app/src/main/jni/almashot/stub.cpp similarity index 100% rename from jni/almashot/stub.cpp rename to app/src/main/jni/almashot/stub.cpp diff --git a/jni/almashot/x86/libalmalib_eval.a b/app/src/main/jni/almashot/x86/libalmalib_eval.a similarity index 100% rename from jni/almashot/x86/libalmalib_eval.a rename to app/src/main/jni/almashot/x86/libalmalib_eval.a diff --git a/jni/almashot/x86/libversion.txt b/app/src/main/jni/almashot/x86/libversion.txt similarity index 100% rename from jni/almashot/x86/libversion.txt rename to app/src/main/jni/almashot/x86/libversion.txt diff --git a/jni/bestshot/Android.mk b/app/src/main/jni/bestshot/Android.mk similarity index 100% rename from jni/bestshot/Android.mk rename to app/src/main/jni/bestshot/Android.mk diff --git a/jni/bestshot/bestshot.cpp b/app/src/main/jni/bestshot/bestshot.cpp similarity index 100% rename from jni/bestshot/bestshot.cpp rename to app/src/main/jni/bestshot/bestshot.cpp diff --git a/jni/dro/Android.mk b/app/src/main/jni/dro/Android.mk similarity index 100% rename from jni/dro/Android.mk rename to app/src/main/jni/dro/Android.mk diff --git a/jni/dro/almashot-dro.cpp b/app/src/main/jni/dro/almashot-dro.cpp similarity index 100% rename from jni/dro/almashot-dro.cpp rename to app/src/main/jni/dro/almashot-dro.cpp diff --git a/jni/groupshot/Android.mk b/app/src/main/jni/groupshot/Android.mk similarity index 100% rename from jni/groupshot/Android.mk rename to app/src/main/jni/groupshot/Android.mk diff --git a/jni/groupshot/Embedded/common/conf/b_BasicEm/LibConfig.h b/app/src/main/jni/groupshot/Embedded/common/conf/b_BasicEm/LibConfig.h similarity index 100% rename from jni/groupshot/Embedded/common/conf/b_BasicEm/LibConfig.h rename to app/src/main/jni/groupshot/Embedded/common/conf/b_BasicEm/LibConfig.h diff --git a/jni/groupshot/Embedded/common/data/APIEm/Modules/RFFprec_501.bmd b/app/src/main/jni/groupshot/Embedded/common/data/APIEm/Modules/RFFprec_501.bmd similarity index 100% rename from jni/groupshot/Embedded/common/data/APIEm/Modules/RFFprec_501.bmd rename to app/src/main/jni/groupshot/Embedded/common/data/APIEm/Modules/RFFprec_501.bmd diff --git a/jni/groupshot/Embedded/common/data/APIEm/Modules/RFFspeed_501.bmd b/app/src/main/jni/groupshot/Embedded/common/data/APIEm/Modules/RFFspeed_501.bmd similarity index 100% rename from jni/groupshot/Embedded/common/data/APIEm/Modules/RFFspeed_501.bmd rename to app/src/main/jni/groupshot/Embedded/common/data/APIEm/Modules/RFFspeed_501.bmd diff --git a/jni/groupshot/Embedded/common/data/APIEm/Modules/RFFstd_501.bmd b/app/src/main/jni/groupshot/Embedded/common/data/APIEm/Modules/RFFstd_501.bmd similarity index 100% rename from jni/groupshot/Embedded/common/data/APIEm/Modules/RFFstd_501.bmd rename to app/src/main/jni/groupshot/Embedded/common/data/APIEm/Modules/RFFstd_501.bmd diff --git a/jni/groupshot/Embedded/common/data/APIEm/Modules/bmd_dump.c b/app/src/main/jni/groupshot/Embedded/common/data/APIEm/Modules/bmd_dump.c similarity index 100% rename from jni/groupshot/Embedded/common/data/APIEm/Modules/bmd_dump.c rename to app/src/main/jni/groupshot/Embedded/common/data/APIEm/Modules/bmd_dump.c diff --git a/jni/groupshot/Embedded/common/src/b_APIEm/BFFaceFinder.c b/app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/BFFaceFinder.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_APIEm/BFFaceFinder.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/BFFaceFinder.c diff --git a/jni/groupshot/Embedded/common/src/b_APIEm/BFFaceFinder.h b/app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/BFFaceFinder.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_APIEm/BFFaceFinder.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/BFFaceFinder.h diff --git a/jni/groupshot/Embedded/common/src/b_APIEm/DCR.c b/app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/DCR.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_APIEm/DCR.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/DCR.c diff --git a/jni/groupshot/Embedded/common/src/b_APIEm/DCR.h b/app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/DCR.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_APIEm/DCR.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/DCR.h diff --git a/jni/groupshot/Embedded/common/src/b_APIEm/FaceFinder.c b/app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/FaceFinder.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_APIEm/FaceFinder.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/FaceFinder.c diff --git a/jni/groupshot/Embedded/common/src/b_APIEm/FaceFinder.h b/app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/FaceFinder.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_APIEm/FaceFinder.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/FaceFinder.h diff --git a/jni/groupshot/Embedded/common/src/b_APIEm/FaceFinderRef.c b/app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/FaceFinderRef.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_APIEm/FaceFinderRef.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/FaceFinderRef.c diff --git a/jni/groupshot/Embedded/common/src/b_APIEm/FaceFinderRef.h b/app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/FaceFinderRef.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_APIEm/FaceFinderRef.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/FaceFinderRef.h diff --git a/jni/groupshot/Embedded/common/src/b_APIEm/Functions.c b/app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/Functions.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_APIEm/Functions.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/Functions.c diff --git a/jni/groupshot/Embedded/common/src/b_APIEm/Functions.h b/app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/Functions.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_APIEm/Functions.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/Functions.h diff --git a/jni/groupshot/Embedded/common/src/b_APIEm/Types.h b/app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/Types.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_APIEm/Types.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_APIEm/Types.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/APh.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/APh.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/APh.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/APh.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/APh.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/APh.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/APh.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/APh.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/APhArr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/APhArr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/APhArr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/APhArr.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/APhArr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/APhArr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/APhArr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/APhArr.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Basic.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Basic.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Basic.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Basic.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Complex.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Complex.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Complex.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Complex.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Complex.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Complex.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Complex.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Complex.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/ComplexArr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/ComplexArr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/ComplexArr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/ComplexArr.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/ComplexArr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/ComplexArr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/ComplexArr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/ComplexArr.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Config.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Config.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Config.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Config.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Context.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Context.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Context.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Context.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Context.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Context.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Context.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Context.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/DynMemManager.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/DynMemManager.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/DynMemManager.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/DynMemManager.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/DynMemManager.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/DynMemManager.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/DynMemManager.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/DynMemManager.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Functions.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Functions.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Functions.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Functions.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Functions.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Functions.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Functions.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Functions.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Int16Arr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Int16Arr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Int16Arr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Int16Arr.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Int16Arr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Int16Arr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Int16Arr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Int16Arr.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Int32Arr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Int32Arr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Int32Arr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Int32Arr.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Int32Arr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Int32Arr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Int32Arr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Int32Arr.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Int8Arr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Int8Arr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Int8Arr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Int8Arr.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Int8Arr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Int8Arr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Int8Arr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Int8Arr.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Math.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Math.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Math.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Math.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Math.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Math.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Math.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Math.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/MathSSE2.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/MathSSE2.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/MathSSE2.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/MathSSE2.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/MemSeg.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/MemSeg.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/MemSeg.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/MemSeg.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/MemSeg.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/MemSeg.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/MemSeg.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/MemSeg.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/MemTbl.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/MemTbl.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/MemTbl.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/MemTbl.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/MemTbl.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/MemTbl.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/MemTbl.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/MemTbl.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Memory.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Memory.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Memory.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Memory.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Memory.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Memory.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Memory.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Memory.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Phase.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Phase.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Phase.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Phase.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/Phase.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Phase.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/Phase.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/Phase.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/String.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/String.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/String.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/String.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/String.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/String.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/String.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/String.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/UInt16Arr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/UInt16Arr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/UInt16Arr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/UInt16Arr.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/UInt16Arr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/UInt16Arr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/UInt16Arr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/UInt16Arr.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/UInt32Arr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/UInt32Arr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/UInt32Arr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/UInt32Arr.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/UInt32Arr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/UInt32Arr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/UInt32Arr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/UInt32Arr.h diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/UInt8Arr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/UInt8Arr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/UInt8Arr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/UInt8Arr.c diff --git a/jni/groupshot/Embedded/common/src/b_BasicEm/UInt8Arr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/UInt8Arr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BasicEm/UInt8Arr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BasicEm/UInt8Arr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/BitParam.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/BitParam.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/BitParam.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/BitParam.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/BitParam.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/BitParam.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/BitParam.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/BitParam.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Feature.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Feature.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/Feature.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Feature.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Feature.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Feature.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/Feature.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Feature.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Functions.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Functions.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/Functions.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Functions.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Functions.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Functions.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/Functions.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Functions.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x2Ftr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x2Ftr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x2Ftr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x2Ftr.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x2Ftr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x2Ftr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x2Ftr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x2Ftr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x4Ftr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x4Ftr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x4Ftr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x4Ftr.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x4Ftr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x4Ftr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x4Ftr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Dns2x4Ftr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Tld2x4Ftr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Tld2x4Ftr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Tld2x4Ftr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Tld2x4Ftr.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Tld2x4Ftr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Tld2x4Ftr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Tld2x4Ftr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/I04Tld2x4Ftr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Dns2x4Ftr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Dns2x4Ftr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Dns2x4Ftr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Dns2x4Ftr.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Dns2x4Ftr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Dns2x4Ftr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Dns2x4Ftr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Dns2x4Ftr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld1x1Ftr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld1x1Ftr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld1x1Ftr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld1x1Ftr.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld1x1Ftr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld1x1Ftr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld1x1Ftr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld1x1Ftr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld2x4Ftr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld2x4Ftr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld2x4Ftr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld2x4Ftr.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld2x4Ftr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld2x4Ftr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld2x4Ftr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L01Tld2x4Ftr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x2Ftr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x2Ftr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x2Ftr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x2Ftr.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x2Ftr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x2Ftr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x2Ftr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x2Ftr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x4Ftr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x4Ftr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x4Ftr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x4Ftr.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x4Ftr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x4Ftr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x4Ftr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns2x4Ftr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns3x3Ftr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns3x3Ftr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns3x3Ftr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns3x3Ftr.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns3x3Ftr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns3x3Ftr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns3x3Ftr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Dns3x3Ftr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Tld2x4Ftr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Tld2x4Ftr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Tld2x4Ftr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Tld2x4Ftr.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Tld2x4Ftr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Tld2x4Ftr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Tld2x4Ftr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L04Tld2x4Ftr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns3x3Ftr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns3x3Ftr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns3x3Ftr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns3x3Ftr.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns3x3Ftr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns3x3Ftr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns3x3Ftr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns3x3Ftr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns4x4Ftr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns4x4Ftr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns4x4Ftr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns4x4Ftr.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns4x4Ftr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns4x4Ftr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns4x4Ftr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06Dns4x4Ftr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06DnsNx4x4Ftr.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06DnsNx4x4Ftr.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06DnsNx4x4Ftr.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06DnsNx4x4Ftr.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06DnsNx4x4Ftr.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06DnsNx4x4Ftr.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06DnsNx4x4Ftr.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/L06DnsNx4x4Ftr.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanDetector.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanDetector.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanDetector.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanDetector.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanDetector.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanDetector.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanDetector.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanDetector.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanner.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanner.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanner.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanner.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanner.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanner.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanner.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/LocalScanner.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/ScanDetector.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/ScanDetector.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/ScanDetector.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/ScanDetector.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/ScanDetector.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/ScanDetector.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/ScanDetector.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/ScanDetector.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Scanner.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Scanner.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/Scanner.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Scanner.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Scanner.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Scanner.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/Scanner.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Scanner.h diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Sequence.c b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Sequence.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/Sequence.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Sequence.c diff --git a/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Sequence.h b/app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Sequence.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_BitFeatureEm/Sequence.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_BitFeatureEm/Sequence.h diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/APhImage.c b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/APhImage.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/APhImage.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/APhImage.c diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/APhImage.h b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/APhImage.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/APhImage.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/APhImage.h diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/ComplexImage.c b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/ComplexImage.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/ComplexImage.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/ComplexImage.c diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/ComplexImage.h b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/ComplexImage.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/ComplexImage.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/ComplexImage.h diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/Flt16Image.c b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/Flt16Image.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/Flt16Image.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/Flt16Image.c diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/Flt16Image.h b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/Flt16Image.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/Flt16Image.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/Flt16Image.h diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/Functions.c b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/Functions.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/Functions.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/Functions.c diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/Functions.h b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/Functions.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/Functions.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/Functions.h diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq.c b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq.c diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq.h b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq.h diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq16.c b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq16.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq16.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq16.c diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq16.h b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq16.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq16.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/HistoEq16.h diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/ToneDownBGSupp.c b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/ToneDownBGSupp.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/ToneDownBGSupp.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/ToneDownBGSupp.c diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/ToneDownBGSupp.h b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/ToneDownBGSupp.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/ToneDownBGSupp.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/ToneDownBGSupp.h diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/UInt16ByteImage.c b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt16ByteImage.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/UInt16ByteImage.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt16ByteImage.c diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/UInt16ByteImage.h b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt16ByteImage.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/UInt16ByteImage.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt16ByteImage.h diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/UInt16BytePyrImage.c b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt16BytePyrImage.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/UInt16BytePyrImage.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt16BytePyrImage.c diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/UInt16BytePyrImage.h b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt16BytePyrImage.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/UInt16BytePyrImage.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt16BytePyrImage.h diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/UInt32Image.c b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt32Image.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/UInt32Image.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt32Image.c diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/UInt32Image.h b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt32Image.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/UInt32Image.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt32Image.h diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/UInt8Image.c b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt8Image.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/UInt8Image.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt8Image.c diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/UInt8Image.h b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt8Image.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/UInt8Image.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt8Image.h diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/UInt8PyramidalImage.c b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt8PyramidalImage.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/UInt8PyramidalImage.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt8PyramidalImage.c diff --git a/jni/groupshot/Embedded/common/src/b_ImageEm/UInt8PyramidalImage.h b/app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt8PyramidalImage.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_ImageEm/UInt8PyramidalImage.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_ImageEm/UInt8PyramidalImage.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Alt.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Alt.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Alt.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Alt.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Alt.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Alt.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Alt.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Alt.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Cluster2D.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Cluster2D.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Cluster2D.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Cluster2D.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Cluster2D.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Cluster2D.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Cluster2D.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Cluster2D.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Cluster3D.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Cluster3D.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Cluster3D.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Cluster3D.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Cluster3D.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Cluster3D.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Cluster3D.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Cluster3D.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/CompactAlt.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/CompactAlt.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/CompactAlt.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/CompactAlt.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/CompactAlt.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/CompactAlt.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/CompactAlt.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/CompactAlt.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/CompactMat.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/CompactMat.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/CompactMat.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/CompactMat.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/CompactMat.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/CompactMat.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/CompactMat.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/CompactMat.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt2D.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt2D.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt2D.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt2D.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt2D.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt2D.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt2D.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt2D.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt3D.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt3D.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt3D.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt3D.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt3D.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt3D.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt3D.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Alt3D.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat2D.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat2D.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat2D.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat2D.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat2D.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat2D.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat2D.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat2D.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat3D.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat3D.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat3D.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat3D.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat3D.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat3D.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat3D.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Mat3D.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec2D.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec2D.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec2D.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec2D.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec2D.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec2D.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec2D.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec2D.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec3D.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec3D.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec3D.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec3D.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec3D.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec3D.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec3D.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Flt16Vec3D.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Functions.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Functions.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Functions.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Functions.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Functions.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Functions.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Functions.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Functions.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/IdCluster2D.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/IdCluster2D.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/IdCluster2D.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/IdCluster2D.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/IdCluster2D.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/IdCluster2D.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/IdCluster2D.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/IdCluster2D.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Mat2D.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Mat2D.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Int16Mat2D.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Mat2D.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Mat2D.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Mat2D.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Int16Mat2D.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Mat2D.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Rect.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Rect.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Int16Rect.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Rect.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Rect.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Rect.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Int16Rect.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Rect.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec2D.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec2D.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec2D.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec2D.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec2D.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec2D.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec2D.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec2D.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec3D.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec3D.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec3D.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec3D.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec3D.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec3D.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec3D.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int16Vec3D.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Int32Mat.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int32Mat.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Int32Mat.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int32Mat.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Int32Mat.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int32Mat.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Int32Mat.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Int32Mat.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/MapSequence.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/MapSequence.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/MapSequence.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/MapSequence.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/MapSequence.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/MapSequence.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/MapSequence.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/MapSequence.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Mat.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Mat.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Mat.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Mat.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Mat.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Mat.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Mat.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Mat.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Normalizer.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Normalizer.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Normalizer.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Normalizer.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Normalizer.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Normalizer.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Normalizer.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Normalizer.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/RBFMap2D.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/RBFMap2D.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/RBFMap2D.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/RBFMap2D.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/RBFMap2D.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/RBFMap2D.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/RBFMap2D.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/RBFMap2D.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/SubVecMap.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/SubVecMap.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/SubVecMap.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/SubVecMap.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/SubVecMap.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/SubVecMap.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/SubVecMap.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/SubVecMap.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Uint32Rect.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Uint32Rect.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Uint32Rect.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Uint32Rect.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/Uint32Rect.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Uint32Rect.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/Uint32Rect.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/Uint32Rect.h diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/VectorMap.c b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/VectorMap.c similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/VectorMap.c rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/VectorMap.c diff --git a/jni/groupshot/Embedded/common/src/b_TensorEm/VectorMap.h b/app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/VectorMap.h similarity index 100% rename from jni/groupshot/Embedded/common/src/b_TensorEm/VectorMap.h rename to app/src/main/jni/groupshot/Embedded/common/src/b_TensorEm/VectorMap.h diff --git a/jni/groupshot/FaceDetector.cpp b/app/src/main/jni/groupshot/FaceDetector.cpp similarity index 100% rename from jni/groupshot/FaceDetector.cpp rename to app/src/main/jni/groupshot/FaceDetector.cpp diff --git a/jni/groupshot/FaceDetector.h b/app/src/main/jni/groupshot/FaceDetector.h similarity index 100% rename from jni/groupshot/FaceDetector.h rename to app/src/main/jni/groupshot/FaceDetector.h diff --git a/jni/groupshot/FaceRecEm/common/src/b_FDSDK/DCR.c b/app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/DCR.c similarity index 100% rename from jni/groupshot/FaceRecEm/common/src/b_FDSDK/DCR.c rename to app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/DCR.c diff --git a/jni/groupshot/FaceRecEm/common/src/b_FDSDK/DCR.h b/app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/DCR.h similarity index 100% rename from jni/groupshot/FaceRecEm/common/src/b_FDSDK/DCR.h rename to app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/DCR.h diff --git a/jni/groupshot/FaceRecEm/common/src/b_FDSDK/DCR_Internal.h b/app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/DCR_Internal.h similarity index 100% rename from jni/groupshot/FaceRecEm/common/src/b_FDSDK/DCR_Internal.h rename to app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/DCR_Internal.h diff --git a/jni/groupshot/FaceRecEm/common/src/b_FDSDK/FaceFinder.c b/app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/FaceFinder.c similarity index 100% rename from jni/groupshot/FaceRecEm/common/src/b_FDSDK/FaceFinder.c rename to app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/FaceFinder.c diff --git a/jni/groupshot/FaceRecEm/common/src/b_FDSDK/FaceFinder.h b/app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/FaceFinder.h similarity index 100% rename from jni/groupshot/FaceRecEm/common/src/b_FDSDK/FaceFinder.h rename to app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/FaceFinder.h diff --git a/jni/groupshot/FaceRecEm/common/src/b_FDSDK/FaceFinder_Internal.h b/app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/FaceFinder_Internal.h similarity index 100% rename from jni/groupshot/FaceRecEm/common/src/b_FDSDK/FaceFinder_Internal.h rename to app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/FaceFinder_Internal.h diff --git a/jni/groupshot/FaceRecEm/common/src/b_FDSDK/SDK.c b/app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/SDK.c similarity index 100% rename from jni/groupshot/FaceRecEm/common/src/b_FDSDK/SDK.c rename to app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/SDK.c diff --git a/jni/groupshot/FaceRecEm/common/src/b_FDSDK/SDK.h b/app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/SDK.h similarity index 100% rename from jni/groupshot/FaceRecEm/common/src/b_FDSDK/SDK.h rename to app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/SDK.h diff --git a/jni/groupshot/FaceRecEm/common/src/b_FDSDK/SDK_Internal.h b/app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/SDK_Internal.h similarity index 100% rename from jni/groupshot/FaceRecEm/common/src/b_FDSDK/SDK_Internal.h rename to app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/SDK_Internal.h diff --git a/jni/groupshot/FaceRecEm/common/src/b_FDSDK/Types.h b/app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/Types.h similarity index 100% rename from jni/groupshot/FaceRecEm/common/src/b_FDSDK/Types.h rename to app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/Types.h diff --git a/jni/groupshot/FaceRecEm/common/src/b_FDSDK/fd_emb_sdk.h b/app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/fd_emb_sdk.h similarity index 100% rename from jni/groupshot/FaceRecEm/common/src/b_FDSDK/fd_emb_sdk.h rename to app/src/main/jni/groupshot/FaceRecEm/common/src/b_FDSDK/fd_emb_sdk.h diff --git a/jni/groupshot/almashot-seamless.cpp b/app/src/main/jni/groupshot/almashot-seamless.cpp similarity index 100% rename from jni/groupshot/almashot-seamless.cpp rename to app/src/main/jni/groupshot/almashot-seamless.cpp diff --git a/jni/hdrprocessing/Android.mk b/app/src/main/jni/hdrprocessing/Android.mk similarity index 100% rename from jni/hdrprocessing/Android.mk rename to app/src/main/jni/hdrprocessing/Android.mk diff --git a/jni/hdrprocessing/almashot-hdr.cpp b/app/src/main/jni/hdrprocessing/almashot-hdr.cpp similarity index 100% rename from jni/hdrprocessing/almashot-hdr.cpp rename to app/src/main/jni/hdrprocessing/almashot-hdr.cpp diff --git a/jni/hiresportrait/Android.mk b/app/src/main/jni/hiresportrait/Android.mk similarity index 100% rename from jni/hiresportrait/Android.mk rename to app/src/main/jni/hiresportrait/Android.mk diff --git a/jni/hiresportrait/hiresportrait.cpp b/app/src/main/jni/hiresportrait/hiresportrait.cpp similarity index 100% rename from jni/hiresportrait/hiresportrait.cpp rename to app/src/main/jni/hiresportrait/hiresportrait.cpp diff --git a/jni/histogram/Android.mk b/app/src/main/jni/histogram/Android.mk similarity index 100% rename from jni/histogram/Android.mk rename to app/src/main/jni/histogram/Android.mk diff --git a/jni/histogram/histogram.cpp b/app/src/main/jni/histogram/histogram.cpp similarity index 100% rename from jni/histogram/histogram.cpp rename to app/src/main/jni/histogram/histogram.cpp diff --git a/jni/include/almashot/aligner.h b/app/src/main/jni/include/almashot/aligner.h similarity index 100% rename from jni/include/almashot/aligner.h rename to app/src/main/jni/include/almashot/aligner.h diff --git a/jni/include/almashot/almashot.h b/app/src/main/jni/include/almashot/almashot.h similarity index 100% rename from jni/include/almashot/almashot.h rename to app/src/main/jni/include/almashot/almashot.h diff --git a/jni/include/almashot/almashot_raw.h b/app/src/main/jni/include/almashot/almashot_raw.h similarity index 100% rename from jni/include/almashot/almashot_raw.h rename to app/src/main/jni/include/almashot/almashot_raw.h diff --git a/jni/include/almashot/bestshot.h b/app/src/main/jni/include/almashot/bestshot.h similarity index 100% rename from jni/include/almashot/bestshot.h rename to app/src/main/jni/include/almashot/bestshot.h diff --git a/app/src/main/jni/include/almashot/blurless.h b/app/src/main/jni/include/almashot/blurless.h new file mode 100644 index 00000000..c07087b9 --- /dev/null +++ b/app/src/main/jni/include/almashot/blurless.h @@ -0,0 +1,119 @@ +/* ------------------------------------------------------------------------- *\ + + Almalence, Inc. + 3803 Mt. Bonnell Rd + Austin, 78731 + Texas, USA + + CONFIDENTIAL: CONTAINS CONFIDENTIAL PROPRIETARY INFORMATION OWNED BY + ALMALENCE, INC., INCLUDING BUT NOT LIMITED TO TRADE SECRETS, + KNOW-HOW, TECHNICAL AND BUSINESS INFORMATION. USE, DISCLOSURE OR + DISTRIBUTION OF THE SOFTWARE IN ANY FORM IS LIMITED TO SPECIFICALLY + AUTHORIZED LICENSEES OF ALMALENCE, INC. ANY UNAUTHORIZED DISCLOSURE + IS A VIOLATION OF STATE, FEDERAL, AND INTERNATIONAL LAWS. + BOTH CIVIL AND CRIMINAL PENALTIES APPLY. + + DO NOT DUPLICATE. UNAUTHORIZED DUPLICATION IS A VIOLATION OF STATE, + FEDERAL AND INTERNATIONAL LAWS. + + USE OF THE SOFTWARE IS AT YOUR SOLE RISK. THE SOFTWARE IS PROVIDED ON AN + "AS IS" BASIS AND WITHOUT WARRANTY OF ANY KIND. TO THE MAXIMUM EXTENT + PERMITTED BY LAW, ALMALENCE EXPRESSLY DISCLAIM ALL WARRANTIES AND + CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT + LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + + ALMALENCE DOES NOT WARRANT THAT THE SOFTWARE WILL MEET YOUR REQUIREMENTS, + OR THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, + OR THAT DEFECTS IN THE SOFTWARE WILL BE CORRECTED. UNDER NO CIRCUMSTANCES, + INCLUDING NEGLIGENCE, SHALL ALMALENCE, OR ITS DIRECTORS, OFFICERS, + EMPLOYEES OR AGENTS, BE LIABLE TO YOU FOR ANY INCIDENTAL, INDIRECT, + SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE, MISUSE OR + INABILITY TO USE THE SOFTWARE OR RELATED DOCUMENTATION. + + COPYRIGHT 2010-2014, ALMALENCE, INC. + + --------------------------------------------------------------------------- + + Blurless Exposure public header + +\* ------------------------------------------------------------------------- */ + +#ifndef __BLURLESS_H__ +#define __BLURLESS_H__ + +#if defined __cplusplus +extern "C" +{ +#endif + + +#include "almashot.h" + +// BlurLess_Preview - call to construct preview +// +// instance - an address of a pointer to hold instance-related data, to be later passed to BlurLess_Process +// in - four or six captured frames in YUV format. in[0]-in[n] should be allocated with malloc +// Caller should allocate but should not free in[0]-in[n] buffers! (They are freed internally in BlurLess_Process) +// Preview - sx/4 x sy/4 preview image in interleaved RGB888 format +// SensorGain is the sensor gain during capture, in u8.8 fixed-point format +// DeGhostGain is used to adjust amount of de-ghosting, set to 256 +// DeGhostFrame - number of frames to be used to get moving objects data, recommended: 1 +// Mode: +// 0 - four input frames, with exposure adjustment, BE processing method 1 +// 1 - six input frames with the same exposure, BE processing method 2 +// 2 - six to ten input frames with the same exposure, BE processing method 3 +// nFrames - number of input frames +// sx, sy: dimensions of input frames (width, height) +// preFilter - apply pre-filtering (useful for sensors with high noise) +// postFilter - apply luma and chroma post-filtering (soft-threshold median, sensor-gain and lens-shading dependent) +// zeroBlackLevel - do not subtract black level from the input frames +// enhanceLuma/enhanceChroma - amount of luma/chroma enhancement to apply (only in Mode 2), recommended value: 9 +// 0 - no enhancement +// 1..10 - enhance (the higher the number the brighter or more colorful image output will be) +// +int BlurLess_Preview +( + void **instance, + Uint8 **in, + Uint8 * Preview, + Uint8 *restrict debug1, + Uint8 *restrict debug2, + int SensorGain, + int DeGhostGain, + int DeGhostFrames, + int Mode, + int nFrames, + int sx, + int sy, + int preFilter, + int postFilter, + int postSharpen, + int zeroBlackLevel, + int enhanceLuma, + int enhanceChroma, + int externalBuffers +); + +// BlurLess_Process - call to construct full-size image (should be called after BlurLess_Preview) +// +// instance - pointer to instance set by BlurLess_Preview +// out - SX x SY full-size composed image in interleaved RGB888 format +// caller should free 'out' once it is not needed. +// +int BlurLess_Process +( + void *instance, + Uint8 ** Out, + int *x0_out, + int *y0_out, + int *w_out, + int *h_out +); + + +#if defined __cplusplus +} +#endif + +#endif // __BLURLESS_H__ diff --git a/jni/include/almashot/dro.h b/app/src/main/jni/include/almashot/dro.h similarity index 100% rename from jni/include/almashot/dro.h rename to app/src/main/jni/include/almashot/dro.h diff --git a/jni/include/almashot/filters.h b/app/src/main/jni/include/almashot/filters.h similarity index 100% rename from jni/include/almashot/filters.h rename to app/src/main/jni/include/almashot/filters.h diff --git a/jni/include/almashot/fstacking.h b/app/src/main/jni/include/almashot/fstacking.h similarity index 100% rename from jni/include/almashot/fstacking.h rename to app/src/main/jni/include/almashot/fstacking.h diff --git a/jni/include/almashot/hdr.h b/app/src/main/jni/include/almashot/hdr.h similarity index 100% rename from jni/include/almashot/hdr.h rename to app/src/main/jni/include/almashot/hdr.h diff --git a/jni/include/almashot/movobj.h b/app/src/main/jni/include/almashot/movobj.h similarity index 100% rename from jni/include/almashot/movobj.h rename to app/src/main/jni/include/almashot/movobj.h diff --git a/jni/include/almashot/panorama.h b/app/src/main/jni/include/almashot/panorama.h similarity index 100% rename from jni/include/almashot/panorama.h rename to app/src/main/jni/include/almashot/panorama.h diff --git a/jni/include/almashot/seamless.h b/app/src/main/jni/include/almashot/seamless.h similarity index 100% rename from jni/include/almashot/seamless.h rename to app/src/main/jni/include/almashot/seamless.h diff --git a/jni/include/almashot/supersensor.h b/app/src/main/jni/include/almashot/supersensor.h similarity index 100% rename from jni/include/almashot/supersensor.h rename to app/src/main/jni/include/almashot/supersensor.h diff --git a/jni/include/almashot/superzoom.h b/app/src/main/jni/include/almashot/superzoom.h similarity index 100% rename from jni/include/almashot/superzoom.h rename to app/src/main/jni/include/almashot/superzoom.h diff --git a/jni/include/bento4/Ap4.h b/app/src/main/jni/include/bento4/Ap4.h similarity index 100% rename from jni/include/bento4/Ap4.h rename to app/src/main/jni/include/bento4/Ap4.h diff --git a/jni/include/bento4/Ap48bdlAtom.h b/app/src/main/jni/include/bento4/Ap48bdlAtom.h similarity index 100% rename from jni/include/bento4/Ap48bdlAtom.h rename to app/src/main/jni/include/bento4/Ap48bdlAtom.h diff --git a/jni/include/bento4/Ap4AdtsParser.h b/app/src/main/jni/include/bento4/Ap4AdtsParser.h similarity index 100% rename from jni/include/bento4/Ap4AdtsParser.h rename to app/src/main/jni/include/bento4/Ap4AdtsParser.h diff --git a/jni/include/bento4/Ap4AesBlockCipher.h b/app/src/main/jni/include/bento4/Ap4AesBlockCipher.h similarity index 100% rename from jni/include/bento4/Ap4AesBlockCipher.h rename to app/src/main/jni/include/bento4/Ap4AesBlockCipher.h diff --git a/jni/include/bento4/Ap4AinfAtom.h b/app/src/main/jni/include/bento4/Ap4AinfAtom.h similarity index 100% rename from jni/include/bento4/Ap4AinfAtom.h rename to app/src/main/jni/include/bento4/Ap4AinfAtom.h diff --git a/jni/include/bento4/Ap4Array.h b/app/src/main/jni/include/bento4/Ap4Array.h similarity index 100% rename from jni/include/bento4/Ap4Array.h rename to app/src/main/jni/include/bento4/Ap4Array.h diff --git a/jni/include/bento4/Ap4Atom.h b/app/src/main/jni/include/bento4/Ap4Atom.h similarity index 100% rename from jni/include/bento4/Ap4Atom.h rename to app/src/main/jni/include/bento4/Ap4Atom.h diff --git a/jni/include/bento4/Ap4AtomFactory.h b/app/src/main/jni/include/bento4/Ap4AtomFactory.h similarity index 100% rename from jni/include/bento4/Ap4AtomFactory.h rename to app/src/main/jni/include/bento4/Ap4AtomFactory.h diff --git a/jni/include/bento4/Ap4AtomSampleTable.h b/app/src/main/jni/include/bento4/Ap4AtomSampleTable.h similarity index 100% rename from jni/include/bento4/Ap4AtomSampleTable.h rename to app/src/main/jni/include/bento4/Ap4AtomSampleTable.h diff --git a/jni/include/bento4/Ap4AtomixAdapters.h b/app/src/main/jni/include/bento4/Ap4AtomixAdapters.h similarity index 100% rename from jni/include/bento4/Ap4AtomixAdapters.h rename to app/src/main/jni/include/bento4/Ap4AtomixAdapters.h diff --git a/jni/include/bento4/Ap4AvcParser.h b/app/src/main/jni/include/bento4/Ap4AvcParser.h similarity index 100% rename from jni/include/bento4/Ap4AvcParser.h rename to app/src/main/jni/include/bento4/Ap4AvcParser.h diff --git a/jni/include/bento4/Ap4AvccAtom.h b/app/src/main/jni/include/bento4/Ap4AvccAtom.h similarity index 100% rename from jni/include/bento4/Ap4AvccAtom.h rename to app/src/main/jni/include/bento4/Ap4AvccAtom.h diff --git a/jni/include/bento4/Ap4BitStream.h b/app/src/main/jni/include/bento4/Ap4BitStream.h similarity index 100% rename from jni/include/bento4/Ap4BitStream.h rename to app/src/main/jni/include/bento4/Ap4BitStream.h diff --git a/jni/include/bento4/Ap4BlocAtom.h b/app/src/main/jni/include/bento4/Ap4BlocAtom.h similarity index 100% rename from jni/include/bento4/Ap4BlocAtom.h rename to app/src/main/jni/include/bento4/Ap4BlocAtom.h diff --git a/jni/include/bento4/Ap4ByteStream.h b/app/src/main/jni/include/bento4/Ap4ByteStream.h similarity index 100% rename from jni/include/bento4/Ap4ByteStream.h rename to app/src/main/jni/include/bento4/Ap4ByteStream.h diff --git a/jni/include/bento4/Ap4Co64Atom.h b/app/src/main/jni/include/bento4/Ap4Co64Atom.h similarity index 100% rename from jni/include/bento4/Ap4Co64Atom.h rename to app/src/main/jni/include/bento4/Ap4Co64Atom.h diff --git a/jni/include/bento4/Ap4Command.h b/app/src/main/jni/include/bento4/Ap4Command.h similarity index 100% rename from jni/include/bento4/Ap4Command.h rename to app/src/main/jni/include/bento4/Ap4Command.h diff --git a/jni/include/bento4/Ap4CommandFactory.h b/app/src/main/jni/include/bento4/Ap4CommandFactory.h similarity index 100% rename from jni/include/bento4/Ap4CommandFactory.h rename to app/src/main/jni/include/bento4/Ap4CommandFactory.h diff --git a/jni/include/bento4/Ap4CommonEncryption.h b/app/src/main/jni/include/bento4/Ap4CommonEncryption.h similarity index 100% rename from jni/include/bento4/Ap4CommonEncryption.h rename to app/src/main/jni/include/bento4/Ap4CommonEncryption.h diff --git a/jni/include/bento4/Ap4Config.h b/app/src/main/jni/include/bento4/Ap4Config.h similarity index 100% rename from jni/include/bento4/Ap4Config.h rename to app/src/main/jni/include/bento4/Ap4Config.h diff --git a/jni/include/bento4/Ap4Constants.h b/app/src/main/jni/include/bento4/Ap4Constants.h similarity index 100% rename from jni/include/bento4/Ap4Constants.h rename to app/src/main/jni/include/bento4/Ap4Constants.h diff --git a/jni/include/bento4/Ap4ContainerAtom.h b/app/src/main/jni/include/bento4/Ap4ContainerAtom.h similarity index 100% rename from jni/include/bento4/Ap4ContainerAtom.h rename to app/src/main/jni/include/bento4/Ap4ContainerAtom.h diff --git a/jni/include/bento4/Ap4CttsAtom.h b/app/src/main/jni/include/bento4/Ap4CttsAtom.h similarity index 100% rename from jni/include/bento4/Ap4CttsAtom.h rename to app/src/main/jni/include/bento4/Ap4CttsAtom.h diff --git a/jni/include/bento4/Ap4DataBuffer.h b/app/src/main/jni/include/bento4/Ap4DataBuffer.h similarity index 100% rename from jni/include/bento4/Ap4DataBuffer.h rename to app/src/main/jni/include/bento4/Ap4DataBuffer.h diff --git a/jni/include/bento4/Ap4Debug.h b/app/src/main/jni/include/bento4/Ap4Debug.h similarity index 100% rename from jni/include/bento4/Ap4Debug.h rename to app/src/main/jni/include/bento4/Ap4Debug.h diff --git a/jni/include/bento4/Ap4Dec3Atom.h b/app/src/main/jni/include/bento4/Ap4Dec3Atom.h similarity index 100% rename from jni/include/bento4/Ap4Dec3Atom.h rename to app/src/main/jni/include/bento4/Ap4Dec3Atom.h diff --git a/jni/include/bento4/Ap4DecoderConfigDescriptor.h b/app/src/main/jni/include/bento4/Ap4DecoderConfigDescriptor.h similarity index 100% rename from jni/include/bento4/Ap4DecoderConfigDescriptor.h rename to app/src/main/jni/include/bento4/Ap4DecoderConfigDescriptor.h diff --git a/jni/include/bento4/Ap4DecoderSpecificInfoDescriptor.h b/app/src/main/jni/include/bento4/Ap4DecoderSpecificInfoDescriptor.h similarity index 100% rename from jni/include/bento4/Ap4DecoderSpecificInfoDescriptor.h rename to app/src/main/jni/include/bento4/Ap4DecoderSpecificInfoDescriptor.h diff --git a/jni/include/bento4/Ap4Descriptor.h b/app/src/main/jni/include/bento4/Ap4Descriptor.h similarity index 100% rename from jni/include/bento4/Ap4Descriptor.h rename to app/src/main/jni/include/bento4/Ap4Descriptor.h diff --git a/jni/include/bento4/Ap4DescriptorFactory.h b/app/src/main/jni/include/bento4/Ap4DescriptorFactory.h similarity index 100% rename from jni/include/bento4/Ap4DescriptorFactory.h rename to app/src/main/jni/include/bento4/Ap4DescriptorFactory.h diff --git a/jni/include/bento4/Ap4DrefAtom.h b/app/src/main/jni/include/bento4/Ap4DrefAtom.h similarity index 100% rename from jni/include/bento4/Ap4DrefAtom.h rename to app/src/main/jni/include/bento4/Ap4DrefAtom.h diff --git a/jni/include/bento4/Ap4DynamicCast.h b/app/src/main/jni/include/bento4/Ap4DynamicCast.h similarity index 100% rename from jni/include/bento4/Ap4DynamicCast.h rename to app/src/main/jni/include/bento4/Ap4DynamicCast.h diff --git a/jni/include/bento4/Ap4ElstAtom.h b/app/src/main/jni/include/bento4/Ap4ElstAtom.h similarity index 100% rename from jni/include/bento4/Ap4ElstAtom.h rename to app/src/main/jni/include/bento4/Ap4ElstAtom.h diff --git a/jni/include/bento4/Ap4EsDescriptor.h b/app/src/main/jni/include/bento4/Ap4EsDescriptor.h similarity index 100% rename from jni/include/bento4/Ap4EsDescriptor.h rename to app/src/main/jni/include/bento4/Ap4EsDescriptor.h diff --git a/jni/include/bento4/Ap4EsdsAtom.h b/app/src/main/jni/include/bento4/Ap4EsdsAtom.h similarity index 100% rename from jni/include/bento4/Ap4EsdsAtom.h rename to app/src/main/jni/include/bento4/Ap4EsdsAtom.h diff --git a/jni/include/bento4/Ap4Expandable.h b/app/src/main/jni/include/bento4/Ap4Expandable.h similarity index 100% rename from jni/include/bento4/Ap4Expandable.h rename to app/src/main/jni/include/bento4/Ap4Expandable.h diff --git a/jni/include/bento4/Ap4File.h b/app/src/main/jni/include/bento4/Ap4File.h similarity index 100% rename from jni/include/bento4/Ap4File.h rename to app/src/main/jni/include/bento4/Ap4File.h diff --git a/jni/include/bento4/Ap4FileByteStream.h b/app/src/main/jni/include/bento4/Ap4FileByteStream.h similarity index 100% rename from jni/include/bento4/Ap4FileByteStream.h rename to app/src/main/jni/include/bento4/Ap4FileByteStream.h diff --git a/jni/include/bento4/Ap4FileCopier.h b/app/src/main/jni/include/bento4/Ap4FileCopier.h similarity index 100% rename from jni/include/bento4/Ap4FileCopier.h rename to app/src/main/jni/include/bento4/Ap4FileCopier.h diff --git a/jni/include/bento4/Ap4FileWriter.h b/app/src/main/jni/include/bento4/Ap4FileWriter.h similarity index 100% rename from jni/include/bento4/Ap4FileWriter.h rename to app/src/main/jni/include/bento4/Ap4FileWriter.h diff --git a/jni/include/bento4/Ap4FragmentSampleTable.h b/app/src/main/jni/include/bento4/Ap4FragmentSampleTable.h similarity index 100% rename from jni/include/bento4/Ap4FragmentSampleTable.h rename to app/src/main/jni/include/bento4/Ap4FragmentSampleTable.h diff --git a/jni/include/bento4/Ap4FrmaAtom.h b/app/src/main/jni/include/bento4/Ap4FrmaAtom.h similarity index 100% rename from jni/include/bento4/Ap4FrmaAtom.h rename to app/src/main/jni/include/bento4/Ap4FrmaAtom.h diff --git a/jni/include/bento4/Ap4FtypAtom.h b/app/src/main/jni/include/bento4/Ap4FtypAtom.h similarity index 100% rename from jni/include/bento4/Ap4FtypAtom.h rename to app/src/main/jni/include/bento4/Ap4FtypAtom.h diff --git a/jni/include/bento4/Ap4GrpiAtom.h b/app/src/main/jni/include/bento4/Ap4GrpiAtom.h similarity index 100% rename from jni/include/bento4/Ap4GrpiAtom.h rename to app/src/main/jni/include/bento4/Ap4GrpiAtom.h diff --git a/jni/include/bento4/Ap4HdlrAtom.h b/app/src/main/jni/include/bento4/Ap4HdlrAtom.h similarity index 100% rename from jni/include/bento4/Ap4HdlrAtom.h rename to app/src/main/jni/include/bento4/Ap4HdlrAtom.h diff --git a/jni/include/bento4/Ap4HevcParser.h b/app/src/main/jni/include/bento4/Ap4HevcParser.h similarity index 100% rename from jni/include/bento4/Ap4HevcParser.h rename to app/src/main/jni/include/bento4/Ap4HevcParser.h diff --git a/jni/include/bento4/Ap4HintTrackReader.h b/app/src/main/jni/include/bento4/Ap4HintTrackReader.h similarity index 100% rename from jni/include/bento4/Ap4HintTrackReader.h rename to app/src/main/jni/include/bento4/Ap4HintTrackReader.h diff --git a/jni/include/bento4/Ap4Hmac.h b/app/src/main/jni/include/bento4/Ap4Hmac.h similarity index 100% rename from jni/include/bento4/Ap4Hmac.h rename to app/src/main/jni/include/bento4/Ap4Hmac.h diff --git a/jni/include/bento4/Ap4HmhdAtom.h b/app/src/main/jni/include/bento4/Ap4HmhdAtom.h similarity index 100% rename from jni/include/bento4/Ap4HmhdAtom.h rename to app/src/main/jni/include/bento4/Ap4HmhdAtom.h diff --git a/jni/include/bento4/Ap4HvccAtom.h b/app/src/main/jni/include/bento4/Ap4HvccAtom.h similarity index 100% rename from jni/include/bento4/Ap4HvccAtom.h rename to app/src/main/jni/include/bento4/Ap4HvccAtom.h diff --git a/jni/include/bento4/Ap4IkmsAtom.h b/app/src/main/jni/include/bento4/Ap4IkmsAtom.h similarity index 100% rename from jni/include/bento4/Ap4IkmsAtom.h rename to app/src/main/jni/include/bento4/Ap4IkmsAtom.h diff --git a/jni/include/bento4/Ap4Interfaces.h b/app/src/main/jni/include/bento4/Ap4Interfaces.h similarity index 100% rename from jni/include/bento4/Ap4Interfaces.h rename to app/src/main/jni/include/bento4/Ap4Interfaces.h diff --git a/jni/include/bento4/Ap4IodsAtom.h b/app/src/main/jni/include/bento4/Ap4IodsAtom.h similarity index 100% rename from jni/include/bento4/Ap4IodsAtom.h rename to app/src/main/jni/include/bento4/Ap4IodsAtom.h diff --git a/jni/include/bento4/Ap4Ipmp.h b/app/src/main/jni/include/bento4/Ap4Ipmp.h similarity index 100% rename from jni/include/bento4/Ap4Ipmp.h rename to app/src/main/jni/include/bento4/Ap4Ipmp.h diff --git a/jni/include/bento4/Ap4IproAtom.h b/app/src/main/jni/include/bento4/Ap4IproAtom.h similarity index 100% rename from jni/include/bento4/Ap4IproAtom.h rename to app/src/main/jni/include/bento4/Ap4IproAtom.h diff --git a/jni/include/bento4/Ap4IsfmAtom.h b/app/src/main/jni/include/bento4/Ap4IsfmAtom.h similarity index 100% rename from jni/include/bento4/Ap4IsfmAtom.h rename to app/src/main/jni/include/bento4/Ap4IsfmAtom.h diff --git a/jni/include/bento4/Ap4IsltAtom.h b/app/src/main/jni/include/bento4/Ap4IsltAtom.h similarity index 100% rename from jni/include/bento4/Ap4IsltAtom.h rename to app/src/main/jni/include/bento4/Ap4IsltAtom.h diff --git a/jni/include/bento4/Ap4IsmaCryp.h b/app/src/main/jni/include/bento4/Ap4IsmaCryp.h similarity index 100% rename from jni/include/bento4/Ap4IsmaCryp.h rename to app/src/main/jni/include/bento4/Ap4IsmaCryp.h diff --git a/jni/include/bento4/Ap4KeyWrap.h b/app/src/main/jni/include/bento4/Ap4KeyWrap.h similarity index 100% rename from jni/include/bento4/Ap4KeyWrap.h rename to app/src/main/jni/include/bento4/Ap4KeyWrap.h diff --git a/jni/include/bento4/Ap4LinearReader.h b/app/src/main/jni/include/bento4/Ap4LinearReader.h similarity index 100% rename from jni/include/bento4/Ap4LinearReader.h rename to app/src/main/jni/include/bento4/Ap4LinearReader.h diff --git a/jni/include/bento4/Ap4List.h b/app/src/main/jni/include/bento4/Ap4List.h similarity index 100% rename from jni/include/bento4/Ap4List.h rename to app/src/main/jni/include/bento4/Ap4List.h diff --git a/jni/include/bento4/Ap4Marlin.h b/app/src/main/jni/include/bento4/Ap4Marlin.h similarity index 100% rename from jni/include/bento4/Ap4Marlin.h rename to app/src/main/jni/include/bento4/Ap4Marlin.h diff --git a/jni/include/bento4/Ap4MdhdAtom.h b/app/src/main/jni/include/bento4/Ap4MdhdAtom.h similarity index 100% rename from jni/include/bento4/Ap4MdhdAtom.h rename to app/src/main/jni/include/bento4/Ap4MdhdAtom.h diff --git a/jni/include/bento4/Ap4MehdAtom.h b/app/src/main/jni/include/bento4/Ap4MehdAtom.h similarity index 100% rename from jni/include/bento4/Ap4MehdAtom.h rename to app/src/main/jni/include/bento4/Ap4MehdAtom.h diff --git a/jni/include/bento4/Ap4MetaData.h b/app/src/main/jni/include/bento4/Ap4MetaData.h similarity index 100% rename from jni/include/bento4/Ap4MetaData.h rename to app/src/main/jni/include/bento4/Ap4MetaData.h diff --git a/jni/include/bento4/Ap4MfhdAtom.h b/app/src/main/jni/include/bento4/Ap4MfhdAtom.h similarity index 100% rename from jni/include/bento4/Ap4MfhdAtom.h rename to app/src/main/jni/include/bento4/Ap4MfhdAtom.h diff --git a/jni/include/bento4/Ap4MfroAtom.h b/app/src/main/jni/include/bento4/Ap4MfroAtom.h similarity index 100% rename from jni/include/bento4/Ap4MfroAtom.h rename to app/src/main/jni/include/bento4/Ap4MfroAtom.h diff --git a/jni/include/bento4/Ap4MoovAtom.h b/app/src/main/jni/include/bento4/Ap4MoovAtom.h similarity index 100% rename from jni/include/bento4/Ap4MoovAtom.h rename to app/src/main/jni/include/bento4/Ap4MoovAtom.h diff --git a/jni/include/bento4/Ap4Movie.h b/app/src/main/jni/include/bento4/Ap4Movie.h similarity index 100% rename from jni/include/bento4/Ap4Movie.h rename to app/src/main/jni/include/bento4/Ap4Movie.h diff --git a/jni/include/bento4/Ap4MovieFragment.h b/app/src/main/jni/include/bento4/Ap4MovieFragment.h similarity index 100% rename from jni/include/bento4/Ap4MovieFragment.h rename to app/src/main/jni/include/bento4/Ap4MovieFragment.h diff --git a/jni/include/bento4/Ap4Mp4AudioInfo.h b/app/src/main/jni/include/bento4/Ap4Mp4AudioInfo.h similarity index 100% rename from jni/include/bento4/Ap4Mp4AudioInfo.h rename to app/src/main/jni/include/bento4/Ap4Mp4AudioInfo.h diff --git a/jni/include/bento4/Ap4Mpeg2Ts.h b/app/src/main/jni/include/bento4/Ap4Mpeg2Ts.h similarity index 100% rename from jni/include/bento4/Ap4Mpeg2Ts.h rename to app/src/main/jni/include/bento4/Ap4Mpeg2Ts.h diff --git a/jni/include/bento4/Ap4MvhdAtom.h b/app/src/main/jni/include/bento4/Ap4MvhdAtom.h similarity index 100% rename from jni/include/bento4/Ap4MvhdAtom.h rename to app/src/main/jni/include/bento4/Ap4MvhdAtom.h diff --git a/jni/include/bento4/Ap4NalParser.h b/app/src/main/jni/include/bento4/Ap4NalParser.h similarity index 100% rename from jni/include/bento4/Ap4NalParser.h rename to app/src/main/jni/include/bento4/Ap4NalParser.h diff --git a/jni/include/bento4/Ap4NeptuneAdapters.h b/app/src/main/jni/include/bento4/Ap4NeptuneAdapters.h similarity index 100% rename from jni/include/bento4/Ap4NeptuneAdapters.h rename to app/src/main/jni/include/bento4/Ap4NeptuneAdapters.h diff --git a/jni/include/bento4/Ap4NmhdAtom.h b/app/src/main/jni/include/bento4/Ap4NmhdAtom.h similarity index 100% rename from jni/include/bento4/Ap4NmhdAtom.h rename to app/src/main/jni/include/bento4/Ap4NmhdAtom.h diff --git a/jni/include/bento4/Ap4ObjectDescriptor.h b/app/src/main/jni/include/bento4/Ap4ObjectDescriptor.h similarity index 100% rename from jni/include/bento4/Ap4ObjectDescriptor.h rename to app/src/main/jni/include/bento4/Ap4ObjectDescriptor.h diff --git a/jni/include/bento4/Ap4OdafAtom.h b/app/src/main/jni/include/bento4/Ap4OdafAtom.h similarity index 100% rename from jni/include/bento4/Ap4OdafAtom.h rename to app/src/main/jni/include/bento4/Ap4OdafAtom.h diff --git a/jni/include/bento4/Ap4OddaAtom.h b/app/src/main/jni/include/bento4/Ap4OddaAtom.h similarity index 100% rename from jni/include/bento4/Ap4OddaAtom.h rename to app/src/main/jni/include/bento4/Ap4OddaAtom.h diff --git a/jni/include/bento4/Ap4OdheAtom.h b/app/src/main/jni/include/bento4/Ap4OdheAtom.h similarity index 100% rename from jni/include/bento4/Ap4OdheAtom.h rename to app/src/main/jni/include/bento4/Ap4OdheAtom.h diff --git a/jni/include/bento4/Ap4OhdrAtom.h b/app/src/main/jni/include/bento4/Ap4OhdrAtom.h similarity index 100% rename from jni/include/bento4/Ap4OhdrAtom.h rename to app/src/main/jni/include/bento4/Ap4OhdrAtom.h diff --git a/jni/include/bento4/Ap4OmaDcf.h b/app/src/main/jni/include/bento4/Ap4OmaDcf.h similarity index 100% rename from jni/include/bento4/Ap4OmaDcf.h rename to app/src/main/jni/include/bento4/Ap4OmaDcf.h diff --git a/jni/include/bento4/Ap4PdinAtom.h b/app/src/main/jni/include/bento4/Ap4PdinAtom.h similarity index 100% rename from jni/include/bento4/Ap4PdinAtom.h rename to app/src/main/jni/include/bento4/Ap4PdinAtom.h diff --git a/jni/include/bento4/Ap4Piff.h b/app/src/main/jni/include/bento4/Ap4Piff.h similarity index 100% rename from jni/include/bento4/Ap4Piff.h rename to app/src/main/jni/include/bento4/Ap4Piff.h diff --git a/jni/include/bento4/Ap4Processor.h b/app/src/main/jni/include/bento4/Ap4Processor.h similarity index 100% rename from jni/include/bento4/Ap4Processor.h rename to app/src/main/jni/include/bento4/Ap4Processor.h diff --git a/jni/include/bento4/Ap4Protection.h b/app/src/main/jni/include/bento4/Ap4Protection.h similarity index 100% rename from jni/include/bento4/Ap4Protection.h rename to app/src/main/jni/include/bento4/Ap4Protection.h diff --git a/jni/include/bento4/Ap4PsshAtom.h b/app/src/main/jni/include/bento4/Ap4PsshAtom.h similarity index 100% rename from jni/include/bento4/Ap4PsshAtom.h rename to app/src/main/jni/include/bento4/Ap4PsshAtom.h diff --git a/jni/include/bento4/Ap4Results.h b/app/src/main/jni/include/bento4/Ap4Results.h similarity index 100% rename from jni/include/bento4/Ap4Results.h rename to app/src/main/jni/include/bento4/Ap4Results.h diff --git a/jni/include/bento4/Ap4RtpAtom.h b/app/src/main/jni/include/bento4/Ap4RtpAtom.h similarity index 100% rename from jni/include/bento4/Ap4RtpAtom.h rename to app/src/main/jni/include/bento4/Ap4RtpAtom.h diff --git a/jni/include/bento4/Ap4RtpHint.h b/app/src/main/jni/include/bento4/Ap4RtpHint.h similarity index 100% rename from jni/include/bento4/Ap4RtpHint.h rename to app/src/main/jni/include/bento4/Ap4RtpHint.h diff --git a/jni/include/bento4/Ap4SLConfigDescriptor.h b/app/src/main/jni/include/bento4/Ap4SLConfigDescriptor.h similarity index 100% rename from jni/include/bento4/Ap4SLConfigDescriptor.h rename to app/src/main/jni/include/bento4/Ap4SLConfigDescriptor.h diff --git a/jni/include/bento4/Ap4SaioAtom.h b/app/src/main/jni/include/bento4/Ap4SaioAtom.h similarity index 100% rename from jni/include/bento4/Ap4SaioAtom.h rename to app/src/main/jni/include/bento4/Ap4SaioAtom.h diff --git a/jni/include/bento4/Ap4SaizAtom.h b/app/src/main/jni/include/bento4/Ap4SaizAtom.h similarity index 100% rename from jni/include/bento4/Ap4SaizAtom.h rename to app/src/main/jni/include/bento4/Ap4SaizAtom.h diff --git a/jni/include/bento4/Ap4Sample.h b/app/src/main/jni/include/bento4/Ap4Sample.h similarity index 100% rename from jni/include/bento4/Ap4Sample.h rename to app/src/main/jni/include/bento4/Ap4Sample.h diff --git a/jni/include/bento4/Ap4SampleDescription.h b/app/src/main/jni/include/bento4/Ap4SampleDescription.h similarity index 100% rename from jni/include/bento4/Ap4SampleDescription.h rename to app/src/main/jni/include/bento4/Ap4SampleDescription.h diff --git a/jni/include/bento4/Ap4SampleEntry.h b/app/src/main/jni/include/bento4/Ap4SampleEntry.h similarity index 100% rename from jni/include/bento4/Ap4SampleEntry.h rename to app/src/main/jni/include/bento4/Ap4SampleEntry.h diff --git a/jni/include/bento4/Ap4SampleSource.h b/app/src/main/jni/include/bento4/Ap4SampleSource.h similarity index 100% rename from jni/include/bento4/Ap4SampleSource.h rename to app/src/main/jni/include/bento4/Ap4SampleSource.h diff --git a/jni/include/bento4/Ap4SampleTable.h b/app/src/main/jni/include/bento4/Ap4SampleTable.h similarity index 100% rename from jni/include/bento4/Ap4SampleTable.h rename to app/src/main/jni/include/bento4/Ap4SampleTable.h diff --git a/jni/include/bento4/Ap4SbgpAtom.h b/app/src/main/jni/include/bento4/Ap4SbgpAtom.h similarity index 100% rename from jni/include/bento4/Ap4SbgpAtom.h rename to app/src/main/jni/include/bento4/Ap4SbgpAtom.h diff --git a/jni/include/bento4/Ap4SchmAtom.h b/app/src/main/jni/include/bento4/Ap4SchmAtom.h similarity index 100% rename from jni/include/bento4/Ap4SchmAtom.h rename to app/src/main/jni/include/bento4/Ap4SchmAtom.h diff --git a/jni/include/bento4/Ap4SdpAtom.h b/app/src/main/jni/include/bento4/Ap4SdpAtom.h similarity index 100% rename from jni/include/bento4/Ap4SdpAtom.h rename to app/src/main/jni/include/bento4/Ap4SdpAtom.h diff --git a/jni/include/bento4/Ap4SegmentBuilder.h b/app/src/main/jni/include/bento4/Ap4SegmentBuilder.h similarity index 100% rename from jni/include/bento4/Ap4SegmentBuilder.h rename to app/src/main/jni/include/bento4/Ap4SegmentBuilder.h diff --git a/jni/include/bento4/Ap4SencAtom.h b/app/src/main/jni/include/bento4/Ap4SencAtom.h similarity index 100% rename from jni/include/bento4/Ap4SencAtom.h rename to app/src/main/jni/include/bento4/Ap4SencAtom.h diff --git a/jni/include/bento4/Ap4SgpdAtom.h b/app/src/main/jni/include/bento4/Ap4SgpdAtom.h similarity index 100% rename from jni/include/bento4/Ap4SgpdAtom.h rename to app/src/main/jni/include/bento4/Ap4SgpdAtom.h diff --git a/jni/include/bento4/Ap4SidxAtom.h b/app/src/main/jni/include/bento4/Ap4SidxAtom.h similarity index 100% rename from jni/include/bento4/Ap4SidxAtom.h rename to app/src/main/jni/include/bento4/Ap4SidxAtom.h diff --git a/jni/include/bento4/Ap4SmhdAtom.h b/app/src/main/jni/include/bento4/Ap4SmhdAtom.h similarity index 100% rename from jni/include/bento4/Ap4SmhdAtom.h rename to app/src/main/jni/include/bento4/Ap4SmhdAtom.h diff --git a/jni/include/bento4/Ap4StcoAtom.h b/app/src/main/jni/include/bento4/Ap4StcoAtom.h similarity index 100% rename from jni/include/bento4/Ap4StcoAtom.h rename to app/src/main/jni/include/bento4/Ap4StcoAtom.h diff --git a/jni/include/bento4/Ap4SthdAtom.h b/app/src/main/jni/include/bento4/Ap4SthdAtom.h similarity index 100% rename from jni/include/bento4/Ap4SthdAtom.h rename to app/src/main/jni/include/bento4/Ap4SthdAtom.h diff --git a/jni/include/bento4/Ap4StreamCipher.h b/app/src/main/jni/include/bento4/Ap4StreamCipher.h similarity index 100% rename from jni/include/bento4/Ap4StreamCipher.h rename to app/src/main/jni/include/bento4/Ap4StreamCipher.h diff --git a/jni/include/bento4/Ap4String.h b/app/src/main/jni/include/bento4/Ap4String.h similarity index 100% rename from jni/include/bento4/Ap4String.h rename to app/src/main/jni/include/bento4/Ap4String.h diff --git a/jni/include/bento4/Ap4StscAtom.h b/app/src/main/jni/include/bento4/Ap4StscAtom.h similarity index 100% rename from jni/include/bento4/Ap4StscAtom.h rename to app/src/main/jni/include/bento4/Ap4StscAtom.h diff --git a/jni/include/bento4/Ap4StsdAtom.h b/app/src/main/jni/include/bento4/Ap4StsdAtom.h similarity index 100% rename from jni/include/bento4/Ap4StsdAtom.h rename to app/src/main/jni/include/bento4/Ap4StsdAtom.h diff --git a/jni/include/bento4/Ap4StssAtom.h b/app/src/main/jni/include/bento4/Ap4StssAtom.h similarity index 100% rename from jni/include/bento4/Ap4StssAtom.h rename to app/src/main/jni/include/bento4/Ap4StssAtom.h diff --git a/jni/include/bento4/Ap4StszAtom.h b/app/src/main/jni/include/bento4/Ap4StszAtom.h similarity index 100% rename from jni/include/bento4/Ap4StszAtom.h rename to app/src/main/jni/include/bento4/Ap4StszAtom.h diff --git a/jni/include/bento4/Ap4SttsAtom.h b/app/src/main/jni/include/bento4/Ap4SttsAtom.h similarity index 100% rename from jni/include/bento4/Ap4SttsAtom.h rename to app/src/main/jni/include/bento4/Ap4SttsAtom.h diff --git a/jni/include/bento4/Ap4Stz2Atom.h b/app/src/main/jni/include/bento4/Ap4Stz2Atom.h similarity index 100% rename from jni/include/bento4/Ap4Stz2Atom.h rename to app/src/main/jni/include/bento4/Ap4Stz2Atom.h diff --git a/jni/include/bento4/Ap4SyntheticSampleTable.h b/app/src/main/jni/include/bento4/Ap4SyntheticSampleTable.h similarity index 100% rename from jni/include/bento4/Ap4SyntheticSampleTable.h rename to app/src/main/jni/include/bento4/Ap4SyntheticSampleTable.h diff --git a/jni/include/bento4/Ap4TencAtom.h b/app/src/main/jni/include/bento4/Ap4TencAtom.h similarity index 100% rename from jni/include/bento4/Ap4TencAtom.h rename to app/src/main/jni/include/bento4/Ap4TencAtom.h diff --git a/jni/include/bento4/Ap4TfdtAtom.h b/app/src/main/jni/include/bento4/Ap4TfdtAtom.h similarity index 100% rename from jni/include/bento4/Ap4TfdtAtom.h rename to app/src/main/jni/include/bento4/Ap4TfdtAtom.h diff --git a/jni/include/bento4/Ap4TfhdAtom.h b/app/src/main/jni/include/bento4/Ap4TfhdAtom.h similarity index 100% rename from jni/include/bento4/Ap4TfhdAtom.h rename to app/src/main/jni/include/bento4/Ap4TfhdAtom.h diff --git a/jni/include/bento4/Ap4TfraAtom.h b/app/src/main/jni/include/bento4/Ap4TfraAtom.h similarity index 100% rename from jni/include/bento4/Ap4TfraAtom.h rename to app/src/main/jni/include/bento4/Ap4TfraAtom.h diff --git a/jni/include/bento4/Ap4TimsAtom.h b/app/src/main/jni/include/bento4/Ap4TimsAtom.h similarity index 100% rename from jni/include/bento4/Ap4TimsAtom.h rename to app/src/main/jni/include/bento4/Ap4TimsAtom.h diff --git a/jni/include/bento4/Ap4TkhdAtom.h b/app/src/main/jni/include/bento4/Ap4TkhdAtom.h similarity index 100% rename from jni/include/bento4/Ap4TkhdAtom.h rename to app/src/main/jni/include/bento4/Ap4TkhdAtom.h diff --git a/jni/include/bento4/Ap4Track.h b/app/src/main/jni/include/bento4/Ap4Track.h similarity index 100% rename from jni/include/bento4/Ap4Track.h rename to app/src/main/jni/include/bento4/Ap4Track.h diff --git a/jni/include/bento4/Ap4TrakAtom.h b/app/src/main/jni/include/bento4/Ap4TrakAtom.h similarity index 100% rename from jni/include/bento4/Ap4TrakAtom.h rename to app/src/main/jni/include/bento4/Ap4TrakAtom.h diff --git a/jni/include/bento4/Ap4TrefTypeAtom.h b/app/src/main/jni/include/bento4/Ap4TrefTypeAtom.h similarity index 100% rename from jni/include/bento4/Ap4TrefTypeAtom.h rename to app/src/main/jni/include/bento4/Ap4TrefTypeAtom.h diff --git a/jni/include/bento4/Ap4TrexAtom.h b/app/src/main/jni/include/bento4/Ap4TrexAtom.h similarity index 100% rename from jni/include/bento4/Ap4TrexAtom.h rename to app/src/main/jni/include/bento4/Ap4TrexAtom.h diff --git a/jni/include/bento4/Ap4TrunAtom.h b/app/src/main/jni/include/bento4/Ap4TrunAtom.h similarity index 100% rename from jni/include/bento4/Ap4TrunAtom.h rename to app/src/main/jni/include/bento4/Ap4TrunAtom.h diff --git a/jni/include/bento4/Ap4Types.h b/app/src/main/jni/include/bento4/Ap4Types.h similarity index 100% rename from jni/include/bento4/Ap4Types.h rename to app/src/main/jni/include/bento4/Ap4Types.h diff --git a/jni/include/bento4/Ap4UrlAtom.h b/app/src/main/jni/include/bento4/Ap4UrlAtom.h similarity index 100% rename from jni/include/bento4/Ap4UrlAtom.h rename to app/src/main/jni/include/bento4/Ap4UrlAtom.h diff --git a/jni/include/bento4/Ap4Utils.h b/app/src/main/jni/include/bento4/Ap4Utils.h similarity index 100% rename from jni/include/bento4/Ap4Utils.h rename to app/src/main/jni/include/bento4/Ap4Utils.h diff --git a/jni/include/bento4/Ap4UuidAtom.h b/app/src/main/jni/include/bento4/Ap4UuidAtom.h similarity index 100% rename from jni/include/bento4/Ap4UuidAtom.h rename to app/src/main/jni/include/bento4/Ap4UuidAtom.h diff --git a/jni/include/bento4/Ap4Version.h b/app/src/main/jni/include/bento4/Ap4Version.h similarity index 100% rename from jni/include/bento4/Ap4Version.h rename to app/src/main/jni/include/bento4/Ap4Version.h diff --git a/jni/include/bento4/Ap4VmhdAtom.h b/app/src/main/jni/include/bento4/Ap4VmhdAtom.h similarity index 100% rename from jni/include/bento4/Ap4VmhdAtom.h rename to app/src/main/jni/include/bento4/Ap4VmhdAtom.h diff --git a/jni/include/bento4/Bento4C.h b/app/src/main/jni/include/bento4/Bento4C.h similarity index 100% rename from jni/include/bento4/Bento4C.h rename to app/src/main/jni/include/bento4/Bento4C.h diff --git a/jni/include/libjpeg/jconfig.h b/app/src/main/jni/include/libjpeg/jconfig.h similarity index 100% rename from jni/include/libjpeg/jconfig.h rename to app/src/main/jni/include/libjpeg/jconfig.h diff --git a/jni/include/libjpeg/jdct.h b/app/src/main/jni/include/libjpeg/jdct.h similarity index 100% rename from jni/include/libjpeg/jdct.h rename to app/src/main/jni/include/libjpeg/jdct.h diff --git a/jni/include/libjpeg/jerror.h b/app/src/main/jni/include/libjpeg/jerror.h similarity index 100% rename from jni/include/libjpeg/jerror.h rename to app/src/main/jni/include/libjpeg/jerror.h diff --git a/jni/include/libjpeg/jinclude.h b/app/src/main/jni/include/libjpeg/jinclude.h similarity index 100% rename from jni/include/libjpeg/jinclude.h rename to app/src/main/jni/include/libjpeg/jinclude.h diff --git a/jni/include/libjpeg/jmemsys.h b/app/src/main/jni/include/libjpeg/jmemsys.h similarity index 100% rename from jni/include/libjpeg/jmemsys.h rename to app/src/main/jni/include/libjpeg/jmemsys.h diff --git a/jni/include/libjpeg/jmorecfg.h b/app/src/main/jni/include/libjpeg/jmorecfg.h similarity index 100% rename from jni/include/libjpeg/jmorecfg.h rename to app/src/main/jni/include/libjpeg/jmorecfg.h diff --git a/jni/include/libjpeg/jpegint.h b/app/src/main/jni/include/libjpeg/jpegint.h similarity index 100% rename from jni/include/libjpeg/jpegint.h rename to app/src/main/jni/include/libjpeg/jpegint.h diff --git a/jni/include/libjpeg/jpeglib.h b/app/src/main/jni/include/libjpeg/jpeglib.h similarity index 100% rename from jni/include/libjpeg/jpeglib.h rename to app/src/main/jni/include/libjpeg/jpeglib.h diff --git a/jni/include/libjpeg/jversion.h b/app/src/main/jni/include/libjpeg/jversion.h similarity index 100% rename from jni/include/libjpeg/jversion.h rename to app/src/main/jni/include/libjpeg/jversion.h diff --git a/jni/include/openmp/omp.h b/app/src/main/jni/include/openmp/omp.h similarity index 100% rename from jni/include/openmp/omp.h rename to app/src/main/jni/include/openmp/omp.h diff --git a/jni/movingobjects/Android.mk b/app/src/main/jni/movingobjects/Android.mk old mode 100755 new mode 100644 similarity index 100% rename from jni/movingobjects/Android.mk rename to app/src/main/jni/movingobjects/Android.mk diff --git a/jni/movingobjects/almashot-moving.cpp b/app/src/main/jni/movingobjects/almashot-moving.cpp old mode 100755 new mode 100644 similarity index 100% rename from jni/movingobjects/almashot-moving.cpp rename to app/src/main/jni/movingobjects/almashot-moving.cpp diff --git a/jni/nightprocessing/Android.mk b/app/src/main/jni/nightprocessing/Android.mk similarity index 100% rename from jni/nightprocessing/Android.mk rename to app/src/main/jni/nightprocessing/Android.mk diff --git a/jni/nightprocessing/almashot-night.cpp b/app/src/main/jni/nightprocessing/almashot-night.cpp similarity index 100% rename from jni/nightprocessing/almashot-night.cpp rename to app/src/main/jni/nightprocessing/almashot-night.cpp diff --git a/jni/objectremoval/Android.mk b/app/src/main/jni/objectremoval/Android.mk similarity index 100% rename from jni/objectremoval/Android.mk rename to app/src/main/jni/objectremoval/Android.mk diff --git a/jni/objectremoval/almashot-clr.cpp b/app/src/main/jni/objectremoval/almashot-clr.cpp similarity index 100% rename from jni/objectremoval/almashot-clr.cpp rename to app/src/main/jni/objectremoval/almashot-clr.cpp diff --git a/jni/panorama/Android.mk b/app/src/main/jni/panorama/Android.mk similarity index 100% rename from jni/panorama/Android.mk rename to app/src/main/jni/panorama/Android.mk diff --git a/jni/panorama/VFGyro-jni.cpp b/app/src/main/jni/panorama/VFGyro-jni.cpp similarity index 100% rename from jni/panorama/VFGyro-jni.cpp rename to app/src/main/jni/panorama/VFGyro-jni.cpp diff --git a/jni/panorama/almashot-pano.cpp b/app/src/main/jni/panorama/almashot-pano.cpp similarity index 100% rename from jni/panorama/almashot-pano.cpp rename to app/src/main/jni/panorama/almashot-pano.cpp diff --git a/jni/prebuilt/OpenCV/3rdparty/libs/armeabi-v7a/libtbb.a b/app/src/main/jni/prebuilt/OpenCV/3rdparty/libs/armeabi-v7a/libtbb.a similarity index 100% rename from jni/prebuilt/OpenCV/3rdparty/libs/armeabi-v7a/libtbb.a rename to app/src/main/jni/prebuilt/OpenCV/3rdparty/libs/armeabi-v7a/libtbb.a diff --git a/jni/prebuilt/OpenCV/3rdparty/libs/x86/libtbb.a b/app/src/main/jni/prebuilt/OpenCV/3rdparty/libs/x86/libtbb.a similarity index 100% rename from jni/prebuilt/OpenCV/3rdparty/libs/x86/libtbb.a rename to app/src/main/jni/prebuilt/OpenCV/3rdparty/libs/x86/libtbb.a diff --git a/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_calib3d.a b/app/src/main/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_calib3d.a similarity index 100% rename from jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_calib3d.a rename to app/src/main/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_calib3d.a diff --git a/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_core.a b/app/src/main/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_core.a similarity index 100% rename from jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_core.a rename to app/src/main/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_core.a diff --git a/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_features2d.a b/app/src/main/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_features2d.a similarity index 100% rename from jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_features2d.a rename to app/src/main/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_features2d.a diff --git a/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_flann.a b/app/src/main/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_flann.a similarity index 100% rename from jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_flann.a rename to app/src/main/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_flann.a diff --git a/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_imgproc.a b/app/src/main/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_imgproc.a similarity index 100% rename from jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_imgproc.a rename to app/src/main/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_imgproc.a diff --git a/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_video.a b/app/src/main/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_video.a similarity index 100% rename from jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_video.a rename to app/src/main/jni/prebuilt/OpenCV/libs/armeabi-v7a/libopencv_video.a diff --git a/jni/prebuilt/OpenCV/libs/x86/libopencv_calib3d.a b/app/src/main/jni/prebuilt/OpenCV/libs/x86/libopencv_calib3d.a similarity index 100% rename from jni/prebuilt/OpenCV/libs/x86/libopencv_calib3d.a rename to app/src/main/jni/prebuilt/OpenCV/libs/x86/libopencv_calib3d.a diff --git a/jni/prebuilt/OpenCV/libs/x86/libopencv_core.a b/app/src/main/jni/prebuilt/OpenCV/libs/x86/libopencv_core.a similarity index 100% rename from jni/prebuilt/OpenCV/libs/x86/libopencv_core.a rename to app/src/main/jni/prebuilt/OpenCV/libs/x86/libopencv_core.a diff --git a/jni/prebuilt/OpenCV/libs/x86/libopencv_features2d.a b/app/src/main/jni/prebuilt/OpenCV/libs/x86/libopencv_features2d.a similarity index 100% rename from jni/prebuilt/OpenCV/libs/x86/libopencv_features2d.a rename to app/src/main/jni/prebuilt/OpenCV/libs/x86/libopencv_features2d.a diff --git a/jni/prebuilt/OpenCV/libs/x86/libopencv_flann.a b/app/src/main/jni/prebuilt/OpenCV/libs/x86/libopencv_flann.a similarity index 100% rename from jni/prebuilt/OpenCV/libs/x86/libopencv_flann.a rename to app/src/main/jni/prebuilt/OpenCV/libs/x86/libopencv_flann.a diff --git a/jni/prebuilt/OpenCV/libs/x86/libopencv_imgproc.a b/app/src/main/jni/prebuilt/OpenCV/libs/x86/libopencv_imgproc.a similarity index 100% rename from jni/prebuilt/OpenCV/libs/x86/libopencv_imgproc.a rename to app/src/main/jni/prebuilt/OpenCV/libs/x86/libopencv_imgproc.a diff --git a/jni/prebuilt/OpenCV/libs/x86/libopencv_video.a b/app/src/main/jni/prebuilt/OpenCV/libs/x86/libopencv_video.a similarity index 100% rename from jni/prebuilt/OpenCV/libs/x86/libopencv_video.a rename to app/src/main/jni/prebuilt/OpenCV/libs/x86/libopencv_video.a diff --git a/jni/prebuilt/armeabi-v7a/libBento4.a b/app/src/main/jni/prebuilt/armeabi-v7a/libBento4.a similarity index 100% rename from jni/prebuilt/armeabi-v7a/libBento4.a rename to app/src/main/jni/prebuilt/armeabi-v7a/libBento4.a diff --git a/jni/prebuilt/armeabi-v7a/libandroid_runtime.so b/app/src/main/jni/prebuilt/armeabi-v7a/libandroid_runtime.so similarity index 100% rename from jni/prebuilt/armeabi-v7a/libandroid_runtime.so rename to app/src/main/jni/prebuilt/armeabi-v7a/libandroid_runtime.so diff --git a/jni/prebuilt/armeabi-v7a/libc.so b/app/src/main/jni/prebuilt/armeabi-v7a/libc.so similarity index 100% rename from jni/prebuilt/armeabi-v7a/libc.so rename to app/src/main/jni/prebuilt/armeabi-v7a/libc.so diff --git a/jni/prebuilt/armeabi-v7a/libexiv2.so b/app/src/main/jni/prebuilt/armeabi-v7a/libexiv2.so similarity index 100% rename from jni/prebuilt/armeabi-v7a/libexiv2.so rename to app/src/main/jni/prebuilt/armeabi-v7a/libexiv2.so diff --git a/jni/prebuilt/armeabi-v7a/libgomp.a b/app/src/main/jni/prebuilt/armeabi-v7a/libgomp.a similarity index 100% rename from jni/prebuilt/armeabi-v7a/libgomp.a rename to app/src/main/jni/prebuilt/armeabi-v7a/libgomp.a diff --git a/jni/prebuilt/armeabi-v7a/libjpeg.a b/app/src/main/jni/prebuilt/armeabi-v7a/libjpeg.a similarity index 100% rename from jni/prebuilt/armeabi-v7a/libjpeg.a rename to app/src/main/jni/prebuilt/armeabi-v7a/libjpeg.a diff --git a/jni/prebuilt/armeabi-v7a/libjpeg_neon.a b/app/src/main/jni/prebuilt/armeabi-v7a/libjpeg_neon.a similarity index 100% rename from jni/prebuilt/armeabi-v7a/libjpeg_neon.a rename to app/src/main/jni/prebuilt/armeabi-v7a/libjpeg_neon.a diff --git a/jni/prebuilt/x86/libBento4.a b/app/src/main/jni/prebuilt/x86/libBento4.a similarity index 100% rename from jni/prebuilt/x86/libBento4.a rename to app/src/main/jni/prebuilt/x86/libBento4.a diff --git a/jni/prebuilt/x86/libandroid_runtime.so b/app/src/main/jni/prebuilt/x86/libandroid_runtime.so similarity index 100% rename from jni/prebuilt/x86/libandroid_runtime.so rename to app/src/main/jni/prebuilt/x86/libandroid_runtime.so diff --git a/jni/prebuilt/x86/libc.so b/app/src/main/jni/prebuilt/x86/libc.so similarity index 100% rename from jni/prebuilt/x86/libc.so rename to app/src/main/jni/prebuilt/x86/libc.so diff --git a/jni/prebuilt/x86/libexiv2.so b/app/src/main/jni/prebuilt/x86/libexiv2.so similarity index 100% rename from jni/prebuilt/x86/libexiv2.so rename to app/src/main/jni/prebuilt/x86/libexiv2.so diff --git a/jni/prebuilt/x86/libgomp.a b/app/src/main/jni/prebuilt/x86/libgomp.a similarity index 100% rename from jni/prebuilt/x86/libgomp.a rename to app/src/main/jni/prebuilt/x86/libgomp.a diff --git a/jni/prebuilt/x86/libjpeg.a b/app/src/main/jni/prebuilt/x86/libjpeg.a similarity index 100% rename from jni/prebuilt/x86/libjpeg.a rename to app/src/main/jni/prebuilt/x86/libjpeg.a diff --git a/jni/prebuilt/x86/libutils.so b/app/src/main/jni/prebuilt/x86/libutils.so similarity index 100% rename from jni/prebuilt/x86/libutils.so rename to app/src/main/jni/prebuilt/x86/libutils.so diff --git a/jni/preshot/Android.mk b/app/src/main/jni/preshot/Android.mk similarity index 100% rename from jni/preshot/Android.mk rename to app/src/main/jni/preshot/Android.mk diff --git a/jni/preshot/preshot.cpp b/app/src/main/jni/preshot/preshot.cpp similarity index 100% rename from jni/preshot/preshot.cpp rename to app/src/main/jni/preshot/preshot.cpp diff --git a/jni/sequence/Android.mk b/app/src/main/jni/sequence/Android.mk similarity index 100% rename from jni/sequence/Android.mk rename to app/src/main/jni/sequence/Android.mk diff --git a/jni/sequence/almashot-sequence.cpp b/app/src/main/jni/sequence/almashot-sequence.cpp similarity index 100% rename from jni/sequence/almashot-sequence.cpp rename to app/src/main/jni/sequence/almashot-sequence.cpp diff --git a/jni/swapheap/Android.mk b/app/src/main/jni/swapheap/Android.mk similarity index 100% rename from jni/swapheap/Android.mk rename to app/src/main/jni/swapheap/Android.mk diff --git a/jni/swapheap/swapheap.cpp b/app/src/main/jni/swapheap/swapheap.cpp similarity index 100% rename from jni/swapheap/swapheap.cpp rename to app/src/main/jni/swapheap/swapheap.cpp diff --git a/jni/utils-jni/Android.mk b/app/src/main/jni/utils-jni/Android.mk similarity index 100% rename from jni/utils-jni/Android.mk rename to app/src/main/jni/utils-jni/Android.mk diff --git a/jni/utils-jni/ImageConversion.cpp b/app/src/main/jni/utils-jni/ImageConversion.cpp similarity index 100% rename from jni/utils-jni/ImageConversion.cpp rename to app/src/main/jni/utils-jni/ImageConversion.cpp diff --git a/jni/utils/Android.mk b/app/src/main/jni/utils/Android.mk similarity index 100% rename from jni/utils/Android.mk rename to app/src/main/jni/utils/Android.mk diff --git a/jni/utils/ImageConversionUtils.cpp b/app/src/main/jni/utils/ImageConversionUtils.cpp similarity index 100% rename from jni/utils/ImageConversionUtils.cpp rename to app/src/main/jni/utils/ImageConversionUtils.cpp diff --git a/jni/utils/ImageConversionUtils.h b/app/src/main/jni/utils/ImageConversionUtils.h similarity index 100% rename from jni/utils/ImageConversionUtils.h rename to app/src/main/jni/utils/ImageConversionUtils.h diff --git a/jni/video/Android.mk b/app/src/main/jni/video/Android.mk similarity index 100% rename from jni/video/Android.mk rename to app/src/main/jni/video/Android.mk diff --git a/jni/video/almalence-mp4editor.cpp b/app/src/main/jni/video/almalence-mp4editor.cpp similarity index 100% rename from jni/video/almalence-mp4editor.cpp rename to app/src/main/jni/video/almalence-mp4editor.cpp diff --git a/jni/yuvimage/Android.mk b/app/src/main/jni/yuvimage/Android.mk similarity index 100% rename from jni/yuvimage/Android.mk rename to app/src/main/jni/yuvimage/Android.mk diff --git a/jni/yuvimage/CreateJavaOutputStreamAdaptor.h b/app/src/main/jni/yuvimage/CreateJavaOutputStreamAdaptor.h similarity index 100% rename from jni/yuvimage/CreateJavaOutputStreamAdaptor.h rename to app/src/main/jni/yuvimage/CreateJavaOutputStreamAdaptor.h diff --git a/jni/yuvimage/YuvToJpegEncoder.h b/app/src/main/jni/yuvimage/YuvToJpegEncoder.h similarity index 100% rename from jni/yuvimage/YuvToJpegEncoder.h rename to app/src/main/jni/yuvimage/YuvToJpegEncoder.h diff --git a/jni/yuvimage/YuvToJpegEncoderMT.cpp b/app/src/main/jni/yuvimage/YuvToJpegEncoderMT.cpp similarity index 100% rename from jni/yuvimage/YuvToJpegEncoderMT.cpp rename to app/src/main/jni/yuvimage/YuvToJpegEncoderMT.cpp diff --git a/jni/yuvimage/YuvToJpegEncoderMT.h b/app/src/main/jni/yuvimage/YuvToJpegEncoderMT.h similarity index 100% rename from jni/yuvimage/YuvToJpegEncoderMT.h rename to app/src/main/jni/yuvimage/YuvToJpegEncoderMT.h diff --git a/jni/yuvimage/yuvimage.cpp b/app/src/main/jni/yuvimage/yuvimage.cpp similarity index 100% rename from jni/yuvimage/yuvimage.cpp rename to app/src/main/jni/yuvimage/yuvimage.cpp diff --git a/res/anim/gui_almalence_lefttoright_invisible.xml b/app/src/main/res/anim/gui_almalence_lefttoright_invisible.xml similarity index 100% rename from res/anim/gui_almalence_lefttoright_invisible.xml rename to app/src/main/res/anim/gui_almalence_lefttoright_invisible.xml diff --git a/res/anim/gui_almalence_lefttoright_visible.xml b/app/src/main/res/anim/gui_almalence_lefttoright_visible.xml similarity index 100% rename from res/anim/gui_almalence_lefttoright_visible.xml rename to app/src/main/res/anim/gui_almalence_lefttoright_visible.xml diff --git a/res/anim/gui_almalence_modelist_invisible.xml b/app/src/main/res/anim/gui_almalence_modelist_invisible.xml similarity index 100% rename from res/anim/gui_almalence_modelist_invisible.xml rename to app/src/main/res/anim/gui_almalence_modelist_invisible.xml diff --git a/res/anim/gui_almalence_modelist_visible.xml b/app/src/main/res/anim/gui_almalence_modelist_visible.xml similarity index 100% rename from res/anim/gui_almalence_modelist_visible.xml rename to app/src/main/res/anim/gui_almalence_modelist_visible.xml diff --git a/res/anim/gui_almalence_quickcontrols_invisible.xml b/app/src/main/res/anim/gui_almalence_quickcontrols_invisible.xml similarity index 100% rename from res/anim/gui_almalence_quickcontrols_invisible.xml rename to app/src/main/res/anim/gui_almalence_quickcontrols_invisible.xml diff --git a/res/anim/gui_almalence_quickcontrols_visible.xml b/app/src/main/res/anim/gui_almalence_quickcontrols_visible.xml similarity index 100% rename from res/anim/gui_almalence_quickcontrols_visible.xml rename to app/src/main/res/anim/gui_almalence_quickcontrols_visible.xml diff --git a/res/anim/gui_almalence_righttoleft_invisible.xml b/app/src/main/res/anim/gui_almalence_righttoleft_invisible.xml similarity index 100% rename from res/anim/gui_almalence_righttoleft_invisible.xml rename to app/src/main/res/anim/gui_almalence_righttoleft_invisible.xml diff --git a/res/anim/gui_almalence_righttoleft_visible.xml b/app/src/main/res/anim/gui_almalence_righttoleft_visible.xml similarity index 100% rename from res/anim/gui_almalence_righttoleft_visible.xml rename to app/src/main/res/anim/gui_almalence_righttoleft_visible.xml diff --git a/res/anim/gui_almalence_sharepopup_enter.xml b/app/src/main/res/anim/gui_almalence_sharepopup_enter.xml similarity index 100% rename from res/anim/gui_almalence_sharepopup_enter.xml rename to app/src/main/res/anim/gui_almalence_sharepopup_enter.xml diff --git a/res/anim/gui_almalence_sharepopup_exit.xml b/app/src/main/res/anim/gui_almalence_sharepopup_exit.xml similarity index 100% rename from res/anim/gui_almalence_sharepopup_exit.xml rename to app/src/main/res/anim/gui_almalence_sharepopup_exit.xml diff --git a/res/anim/gui_photoeditor_fade_in.xml b/app/src/main/res/anim/gui_photoeditor_fade_in.xml similarity index 100% rename from res/anim/gui_photoeditor_fade_in.xml rename to app/src/main/res/anim/gui_photoeditor_fade_in.xml diff --git a/res/anim/gui_photoeditor_fade_out.xml b/app/src/main/res/anim/gui_photoeditor_fade_out.xml similarity index 100% rename from res/anim/gui_photoeditor_fade_out.xml rename to app/src/main/res/anim/gui_photoeditor_fade_out.xml diff --git a/res/anim/plugin_capture_selftimer_countdown.xml b/app/src/main/res/anim/plugin_capture_selftimer_countdown.xml similarity index 100% rename from res/anim/plugin_capture_selftimer_countdown.xml rename to app/src/main/res/anim/plugin_capture_selftimer_countdown.xml diff --git a/res/anim/plugin_export_export_panel_visible.xml b/app/src/main/res/anim/plugin_export_export_panel_visible.xml similarity index 100% rename from res/anim/plugin_export_export_panel_visible.xml rename to app/src/main/res/anim/plugin_export_export_panel_visible.xml diff --git a/res/color/primary_text.xml b/app/src/main/res/color/primary_text.xml similarity index 100% rename from res/color/primary_text.xml rename to app/src/main/res/color/primary_text.xml diff --git a/res/drawable-hdpi/adjustments_contrast.png b/app/src/main/res/drawable-hdpi/adjustments_contrast.png similarity index 100% rename from res/drawable-hdpi/adjustments_contrast.png rename to app/src/main/res/drawable-hdpi/adjustments_contrast.png diff --git a/res/drawable-hdpi/adjustments_expo.png b/app/src/main/res/drawable-hdpi/adjustments_expo.png similarity index 100% rename from res/drawable-hdpi/adjustments_expo.png rename to app/src/main/res/drawable-hdpi/adjustments_expo.png diff --git a/res/drawable-hdpi/adjustments_microcontrast.png b/app/src/main/res/drawable-hdpi/adjustments_microcontrast.png similarity index 100% rename from res/drawable-hdpi/adjustments_microcontrast.png rename to app/src/main/res/drawable-hdpi/adjustments_microcontrast.png diff --git a/res/drawable-hdpi/adjustments_presetspinner_normal.9.png b/app/src/main/res/drawable-hdpi/adjustments_presetspinner_normal.9.png similarity index 100% rename from res/drawable-hdpi/adjustments_presetspinner_normal.9.png rename to app/src/main/res/drawable-hdpi/adjustments_presetspinner_normal.9.png diff --git a/res/drawable-hdpi/adjustments_presetspinner_pressed.9.png b/app/src/main/res/drawable-hdpi/adjustments_presetspinner_pressed.9.png similarity index 100% rename from res/drawable-hdpi/adjustments_presetspinner_pressed.9.png rename to app/src/main/res/drawable-hdpi/adjustments_presetspinner_pressed.9.png diff --git a/res/drawable-hdpi/adjustments_seekbar_bg.9.png b/app/src/main/res/drawable-hdpi/adjustments_seekbar_bg.9.png similarity index 100% rename from res/drawable-hdpi/adjustments_seekbar_bg.9.png rename to app/src/main/res/drawable-hdpi/adjustments_seekbar_bg.9.png diff --git a/res/drawable-hdpi/adjustments_seekbar_thumb_glow.9.png b/app/src/main/res/drawable-hdpi/adjustments_seekbar_thumb_glow.9.png similarity index 100% rename from res/drawable-hdpi/adjustments_seekbar_thumb_glow.9.png rename to app/src/main/res/drawable-hdpi/adjustments_seekbar_thumb_glow.9.png diff --git a/res/drawable-hdpi/adjustments_seekbar_thumb_normal.9.png b/app/src/main/res/drawable-hdpi/adjustments_seekbar_thumb_normal.9.png similarity index 100% rename from res/drawable-hdpi/adjustments_seekbar_thumb_normal.9.png rename to app/src/main/res/drawable-hdpi/adjustments_seekbar_thumb_normal.9.png diff --git a/res/drawable-hdpi/adjustments_selector.png b/app/src/main/res/drawable-hdpi/adjustments_selector.png similarity index 100% rename from res/drawable-hdpi/adjustments_selector.png rename to app/src/main/res/drawable-hdpi/adjustments_selector.png diff --git a/res/drawable-hdpi/adjustments_tab.9.png b/app/src/main/res/drawable-hdpi/adjustments_tab.9.png similarity index 100% rename from res/drawable-hdpi/adjustments_tab.9.png rename to app/src/main/res/drawable-hdpi/adjustments_tab.9.png diff --git a/res/drawable-hdpi/adjustments_tabhold.9.png b/app/src/main/res/drawable-hdpi/adjustments_tabhold.9.png similarity index 100% rename from res/drawable-hdpi/adjustments_tabhold.9.png rename to app/src/main/res/drawable-hdpi/adjustments_tabhold.9.png diff --git a/res/drawable-hdpi/adjustments_vividness.png b/app/src/main/res/drawable-hdpi/adjustments_vividness.png similarity index 100% rename from res/drawable-hdpi/adjustments_vividness.png rename to app/src/main/res/drawable-hdpi/adjustments_vividness.png diff --git a/res/drawable-hdpi/alert_dialog_icon.png b/app/src/main/res/drawable-hdpi/alert_dialog_icon.png similarity index 100% rename from res/drawable-hdpi/alert_dialog_icon.png rename to app/src/main/res/drawable-hdpi/alert_dialog_icon.png diff --git a/res/drawable-hdpi/almalence_gui_hint_background.png b/app/src/main/res/drawable-hdpi/almalence_gui_hint_background.png similarity index 100% rename from res/drawable-hdpi/almalence_gui_hint_background.png rename to app/src/main/res/drawable-hdpi/almalence_gui_hint_background.png diff --git a/res/drawable-hdpi/apptheme_scrubber_control_disabled_holo.png b/app/src/main/res/drawable-hdpi/apptheme_scrubber_control_disabled_holo.png similarity index 100% rename from res/drawable-hdpi/apptheme_scrubber_control_disabled_holo.png rename to app/src/main/res/drawable-hdpi/apptheme_scrubber_control_disabled_holo.png diff --git a/res/drawable-hdpi/apptheme_scrubber_control_focused_holo.png b/app/src/main/res/drawable-hdpi/apptheme_scrubber_control_focused_holo.png similarity index 100% rename from res/drawable-hdpi/apptheme_scrubber_control_focused_holo.png rename to app/src/main/res/drawable-hdpi/apptheme_scrubber_control_focused_holo.png diff --git a/res/drawable-hdpi/apptheme_scrubber_control_normal_holo.png b/app/src/main/res/drawable-hdpi/apptheme_scrubber_control_normal_holo.png similarity index 100% rename from res/drawable-hdpi/apptheme_scrubber_control_normal_holo.png rename to app/src/main/res/drawable-hdpi/apptheme_scrubber_control_normal_holo.png diff --git a/res/drawable-hdpi/apptheme_scrubber_control_pressed_holo.png b/app/src/main/res/drawable-hdpi/apptheme_scrubber_control_pressed_holo.png similarity index 100% rename from res/drawable-hdpi/apptheme_scrubber_control_pressed_holo.png rename to app/src/main/res/drawable-hdpi/apptheme_scrubber_control_pressed_holo.png diff --git a/res/drawable-hdpi/apptheme_scrubber_primary_holo.9.png b/app/src/main/res/drawable-hdpi/apptheme_scrubber_primary_holo.9.png similarity index 100% rename from res/drawable-hdpi/apptheme_scrubber_primary_holo.9.png rename to app/src/main/res/drawable-hdpi/apptheme_scrubber_primary_holo.9.png diff --git a/res/drawable-hdpi/apptheme_scrubber_secondary_holo.9.png b/app/src/main/res/drawable-hdpi/apptheme_scrubber_secondary_holo.9.png similarity index 100% rename from res/drawable-hdpi/apptheme_scrubber_secondary_holo.9.png rename to app/src/main/res/drawable-hdpi/apptheme_scrubber_secondary_holo.9.png diff --git a/res/drawable-hdpi/apptheme_scrubber_track_holo_light.9.png b/app/src/main/res/drawable-hdpi/apptheme_scrubber_track_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/apptheme_scrubber_track_holo_light.9.png rename to app/src/main/res/drawable-hdpi/apptheme_scrubber_track_holo_light.9.png diff --git a/res/drawable-hdpi/gui_almalence_aelock_off.png b/app/src/main/res/drawable-hdpi/gui_almalence_aelock_off.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_aelock_off.png rename to app/src/main/res/drawable-hdpi/gui_almalence_aelock_off.png diff --git a/res/drawable-hdpi/gui_almalence_aelock_on.png b/app/src/main/res/drawable-hdpi/gui_almalence_aelock_on.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_aelock_on.png rename to app/src/main/res/drawable-hdpi/gui_almalence_aelock_on.png diff --git a/res/drawable-hdpi/gui_almalence_awlock_off.png b/app/src/main/res/drawable-hdpi/gui_almalence_awlock_off.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_awlock_off.png rename to app/src/main/res/drawable-hdpi/gui_almalence_awlock_off.png diff --git a/res/drawable-hdpi/gui_almalence_awlock_on.png b/app/src/main/res/drawable-hdpi/gui_almalence_awlock_on.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_awlock_on.png rename to app/src/main/res/drawable-hdpi/gui_almalence_awlock_on.png diff --git a/res/drawable-hdpi/gui_almalence_histogram_luma.png b/app/src/main/res/drawable-hdpi/gui_almalence_histogram_luma.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_histogram_luma.png rename to app/src/main/res/drawable-hdpi/gui_almalence_histogram_luma.png diff --git a/res/drawable-hdpi/gui_almalence_histogram_off.png b/app/src/main/res/drawable-hdpi/gui_almalence_histogram_off.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_histogram_off.png rename to app/src/main/res/drawable-hdpi/gui_almalence_histogram_off.png diff --git a/res/drawable-hdpi/gui_almalence_histogram_rgb.png b/app/src/main/res/drawable-hdpi/gui_almalence_histogram_rgb.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_histogram_rgb.png rename to app/src/main/res/drawable-hdpi/gui_almalence_histogram_rgb.png diff --git a/res/drawable-hdpi/gui_almalence_mode_burst10.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_burst10.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_burst10.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_burst10.png diff --git a/res/drawable-hdpi/gui_almalence_mode_burst15.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_burst15.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_burst15.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_burst15.png diff --git a/res/drawable-hdpi/gui_almalence_mode_burst20.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_burst20.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_burst20.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_burst20.png diff --git a/res/drawable-hdpi/gui_almalence_mode_burst3.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_burst3.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_burst3.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_burst3.png diff --git a/res/drawable-hdpi/gui_almalence_mode_burst5.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_burst5.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_burst5.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_burst5.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer10.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer10.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer10.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer10.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer10_control.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer10_control.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer10_control.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer10_control.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer10_controlcative.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer10_controlcative.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer10_controlcative.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer10_controlcative.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer15.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer15.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer15.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer15.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer15_control.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer15_control.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer15_control.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer15_control.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer15_controlcative.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer15_controlcative.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer15_controlcative.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer15_controlcative.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer3.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer3.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer3.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer3.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer30.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer30.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer30.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer30.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer30_control.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer30_control.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer30_control.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer30_control.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer30_controlcative.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer30_controlcative.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer30_controlcative.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer30_controlcative.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer3_control.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer3_control.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer3_control.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer3_control.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer3_controlcative.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer3_controlcative.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer3_controlcative.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer3_controlcative.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer5.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer5.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer5.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer5.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer5_control.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer5_control.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer5_control.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer5_control.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer5_controlcative.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer5_controlcative.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer5_controlcative.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer5_controlcative.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer60.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer60.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer60.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer60.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer60_control.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer60_control.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer60_control.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer60_control.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer60_controlcative.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer60_controlcative.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer60_controlcative.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer60_controlcative.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer_control.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer_control.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer_control.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer_control.png diff --git a/res/drawable-hdpi/gui_almalence_mode_selftimer_controlcative.png b/app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer_controlcative.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_mode_selftimer_controlcative.png rename to app/src/main/res/drawable-hdpi/gui_almalence_mode_selftimer_controlcative.png diff --git a/res/drawable-hdpi/gui_almalence_select_mode.png b/app/src/main/res/drawable-hdpi/gui_almalence_select_mode.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_select_mode.png rename to app/src/main/res/drawable-hdpi/gui_almalence_select_mode.png diff --git a/res/drawable-hdpi/gui_almalence_settings_changecamera_back.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_changecamera_back.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_changecamera_back.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_changecamera_back.png diff --git a/res/drawable-hdpi/gui_almalence_settings_changecamera_front.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_changecamera_front.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_changecamera_front.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_changecamera_front.png diff --git a/res/drawable-hdpi/gui_almalence_settings_changecamera_sony.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_changecamera_sony.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_changecamera_sony.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_changecamera_sony.png diff --git a/res/drawable-hdpi/gui_almalence_settings_exposure.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_exposure.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_exposure.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_exposure.png diff --git a/res/drawable-hdpi/gui_almalence_settings_exposure_background.9.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_exposure_background.9.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_exposure_background.9.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_exposure_background.9.png diff --git a/res/drawable-hdpi/gui_almalence_settings_flash_auto.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_flash_auto.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_flash_auto.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_flash_auto.png diff --git a/res/drawable-hdpi/gui_almalence_settings_flash_off.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_flash_off.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_flash_off.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_flash_off.png diff --git a/res/drawable-hdpi/gui_almalence_settings_flash_on.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_flash_on.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_flash_on.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_flash_on.png diff --git a/res/drawable-hdpi/gui_almalence_settings_flash_redeye.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_flash_redeye.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_flash_redeye.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_flash_redeye.png diff --git a/res/drawable-hdpi/gui_almalence_settings_flash_torch.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_flash_torch.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_flash_torch.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_flash_torch.png diff --git a/res/drawable-hdpi/gui_almalence_settings_focus_aflock.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_aflock.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_focus_aflock.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_aflock.png diff --git a/res/drawable-hdpi/gui_almalence_settings_focus_auto.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_auto.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_focus_auto.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_auto.png diff --git a/res/drawable-hdpi/gui_almalence_settings_focus_continiuouspicture.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_continiuouspicture.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_focus_continiuouspicture.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_continiuouspicture.png diff --git a/res/drawable-hdpi/gui_almalence_settings_focus_continiuousvideo.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_continiuousvideo.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_focus_continiuousvideo.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_continiuousvideo.png diff --git a/res/drawable-hdpi/gui_almalence_settings_focus_edof.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_edof.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_focus_edof.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_edof.png diff --git a/res/drawable-hdpi/gui_almalence_settings_focus_fixed.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_fixed.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_focus_fixed.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_fixed.png diff --git a/res/drawable-hdpi/gui_almalence_settings_focus_infinity.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_infinity.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_focus_infinity.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_infinity.png diff --git a/res/drawable-hdpi/gui_almalence_settings_focus_macro.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_macro.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_focus_macro.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_macro.png diff --git a/res/drawable-hdpi/gui_almalence_settings_focus_manual.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_manual.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_focus_manual.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_manual.png diff --git a/res/drawable-hdpi/gui_almalence_settings_focus_normal.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_normal.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_focus_normal.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_focus_normal.png diff --git a/res/drawable-hdpi/gui_almalence_settings_iso_100.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_100.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_iso_100.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_100.png diff --git a/res/drawable-hdpi/gui_almalence_settings_iso_10000.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_10000.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_iso_10000.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_10000.png diff --git a/res/drawable-hdpi/gui_almalence_settings_iso_1600.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_1600.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_iso_1600.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_1600.png diff --git a/res/drawable-hdpi/gui_almalence_settings_iso_200.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_200.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_iso_200.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_200.png diff --git a/res/drawable-hdpi/gui_almalence_settings_iso_3200.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_3200.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_iso_3200.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_3200.png diff --git a/res/drawable-hdpi/gui_almalence_settings_iso_400.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_400.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_iso_400.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_400.png diff --git a/res/drawable-hdpi/gui_almalence_settings_iso_50.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_50.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_iso_50.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_50.png diff --git a/res/drawable-hdpi/gui_almalence_settings_iso_6400.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_6400.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_iso_6400.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_6400.png diff --git a/res/drawable-hdpi/gui_almalence_settings_iso_800.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_800.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_iso_800.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_800.png diff --git a/res/drawable-hdpi/gui_almalence_settings_iso_auto.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_auto.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_iso_auto.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_iso_auto.png diff --git a/res/drawable-hdpi/gui_almalence_settings_metering_auto.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_metering_auto.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_metering_auto.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_metering_auto.png diff --git a/res/drawable-hdpi/gui_almalence_settings_metering_center.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_metering_center.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_metering_center.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_metering_center.png diff --git a/res/drawable-hdpi/gui_almalence_settings_metering_matrix.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_metering_matrix.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_metering_matrix.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_metering_matrix.png diff --git a/res/drawable-hdpi/gui_almalence_settings_metering_spot.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_metering_spot.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_metering_spot.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_metering_spot.png diff --git a/res/drawable-hdpi/gui_almalence_settings_more_settings.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_more_settings.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_more_settings.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_more_settings.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_action.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_action.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_action.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_action.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_ar.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_ar.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_ar.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_ar.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_auto.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_auto.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_auto.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_auto.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_barcode.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_barcode.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_barcode.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_barcode.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_beach.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_beach.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_beach.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_beach.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_candlelight.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_candlelight.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_candlelight.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_candlelight.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_fireworks.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_fireworks.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_fireworks.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_fireworks.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_hdr.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_hdr.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_hdr.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_hdr.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_landscape.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_landscape.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_landscape.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_landscape.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_night.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_night.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_night.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_night.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_nightportrait.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_nightportrait.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_nightportrait.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_nightportrait.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_party.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_party.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_party.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_party.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_portrait.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_portrait.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_portrait.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_portrait.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_snow.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_snow.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_snow.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_snow.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_sports.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_sports.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_sports.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_sports.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_steadyphoto.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_steadyphoto.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_steadyphoto.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_steadyphoto.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_sunset.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_sunset.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_sunset.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_sunset.png diff --git a/res/drawable-hdpi/gui_almalence_settings_scene_theater.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_theater.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_scene_theater.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_scene_theater.png diff --git a/res/drawable-hdpi/gui_almalence_settings_shutter_speed_priority.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_shutter_speed_priority.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_shutter_speed_priority.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_shutter_speed_priority.png diff --git a/res/drawable-hdpi/gui_almalence_settings_wb_auto.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_auto.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_wb_auto.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_auto.png diff --git a/res/drawable-hdpi/gui_almalence_settings_wb_cloudydaylight.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_cloudydaylight.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_wb_cloudydaylight.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_cloudydaylight.png diff --git a/res/drawable-hdpi/gui_almalence_settings_wb_daylight.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_daylight.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_wb_daylight.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_daylight.png diff --git a/res/drawable-hdpi/gui_almalence_settings_wb_fluorescent.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_fluorescent.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_wb_fluorescent.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_fluorescent.png diff --git a/res/drawable-hdpi/gui_almalence_settings_wb_incandescent.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_incandescent.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_wb_incandescent.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_incandescent.png diff --git a/res/drawable-hdpi/gui_almalence_settings_wb_mwb.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_mwb.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_wb_mwb.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_mwb.png diff --git a/res/drawable-hdpi/gui_almalence_settings_wb_shade.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_shade.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_wb_shade.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_shade.png diff --git a/res/drawable-hdpi/gui_almalence_settings_wb_twilight.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_twilight.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_wb_twilight.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_twilight.png diff --git a/res/drawable-hdpi/gui_almalence_settings_wb_warmfluorescent.png b/app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_warmfluorescent.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_settings_wb_warmfluorescent.png rename to app/src/main/res/drawable-hdpi/gui_almalence_settings_wb_warmfluorescent.png diff --git a/res/drawable-hdpi/gui_almalence_shutter.png b/app/src/main/res/drawable-hdpi/gui_almalence_shutter.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_shutter.png rename to app/src/main/res/drawable-hdpi/gui_almalence_shutter.png diff --git a/res/drawable-hdpi/gui_almalence_shutter_pressed.png b/app/src/main/res/drawable-hdpi/gui_almalence_shutter_pressed.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_shutter_pressed.png rename to app/src/main/res/drawable-hdpi/gui_almalence_shutter_pressed.png diff --git a/res/drawable-hdpi/gui_almalence_shutter_selected.png b/app/src/main/res/drawable-hdpi/gui_almalence_shutter_selected.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_shutter_selected.png rename to app/src/main/res/drawable-hdpi/gui_almalence_shutter_selected.png diff --git a/res/drawable-hdpi/gui_almalence_shutter_switch_bg_1.png b/app/src/main/res/drawable-hdpi/gui_almalence_shutter_switch_bg_1.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_shutter_switch_bg_1.png rename to app/src/main/res/drawable-hdpi/gui_almalence_shutter_switch_bg_1.png diff --git a/res/drawable-hdpi/gui_almalence_shutter_switch_bg_2.png b/app/src/main/res/drawable-hdpi/gui_almalence_shutter_switch_bg_2.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_shutter_switch_bg_2.png rename to app/src/main/res/drawable-hdpi/gui_almalence_shutter_switch_bg_2.png diff --git a/res/drawable-hdpi/gui_almalence_shutter_video_off.png b/app/src/main/res/drawable-hdpi/gui_almalence_shutter_video_off.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_shutter_video_off.png rename to app/src/main/res/drawable-hdpi/gui_almalence_shutter_video_off.png diff --git a/res/drawable-hdpi/gui_almalence_video_1080.png b/app/src/main/res/drawable-hdpi/gui_almalence_video_1080.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_video_1080.png rename to app/src/main/res/drawable-hdpi/gui_almalence_video_1080.png diff --git a/res/drawable-hdpi/gui_almalence_video_2160.png b/app/src/main/res/drawable-hdpi/gui_almalence_video_2160.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_video_2160.png rename to app/src/main/res/drawable-hdpi/gui_almalence_video_2160.png diff --git a/res/drawable-hdpi/gui_almalence_video_4096.png b/app/src/main/res/drawable-hdpi/gui_almalence_video_4096.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_video_4096.png rename to app/src/main/res/drawable-hdpi/gui_almalence_video_4096.png diff --git a/res/drawable-hdpi/gui_almalence_video_480.png b/app/src/main/res/drawable-hdpi/gui_almalence_video_480.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_video_480.png rename to app/src/main/res/drawable-hdpi/gui_almalence_video_480.png diff --git a/res/drawable-hdpi/gui_almalence_video_720.png b/app/src/main/res/drawable-hdpi/gui_almalence_video_720.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_video_720.png rename to app/src/main/res/drawable-hdpi/gui_almalence_video_720.png diff --git a/res/drawable-hdpi/gui_almalence_video_cif.png b/app/src/main/res/drawable-hdpi/gui_almalence_video_cif.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_video_cif.png rename to app/src/main/res/drawable-hdpi/gui_almalence_video_cif.png diff --git a/res/drawable-hdpi/gui_almalence_video_qcif.png b/app/src/main/res/drawable-hdpi/gui_almalence_video_qcif.png similarity index 100% rename from res/drawable-hdpi/gui_almalence_video_qcif.png rename to app/src/main/res/drawable-hdpi/gui_almalence_video_qcif.png diff --git a/res/drawable-hdpi/horizon_indicator_aim.png b/app/src/main/res/drawable-hdpi/horizon_indicator_aim.png similarity index 100% rename from res/drawable-hdpi/horizon_indicator_aim.png rename to app/src/main/res/drawable-hdpi/horizon_indicator_aim.png diff --git a/res/drawable-hdpi/horizon_indicator_mark.png b/app/src/main/res/drawable-hdpi/horizon_indicator_mark.png similarity index 100% rename from res/drawable-hdpi/horizon_indicator_mark.png rename to app/src/main/res/drawable-hdpi/horizon_indicator_mark.png diff --git a/res/drawable-hdpi/ic_menu_save.png b/app/src/main/res/drawable-hdpi/ic_menu_save.png similarity index 100% rename from res/drawable-hdpi/ic_menu_save.png rename to app/src/main/res/drawable-hdpi/ic_menu_save.png diff --git a/res/drawable-hdpi/ic_menu_save_glow.png b/app/src/main/res/drawable-hdpi/ic_menu_save_glow.png similarity index 100% rename from res/drawable-hdpi/ic_menu_save_glow.png rename to app/src/main/res/drawable-hdpi/ic_menu_save_glow.png diff --git a/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from res/drawable-hdpi/icon.png rename to app/src/main/res/drawable-hdpi/icon.png diff --git a/res/drawable-hdpi/invis_qc.png b/app/src/main/res/drawable-hdpi/invis_qc.png similarity index 100% rename from res/drawable-hdpi/invis_qc.png rename to app/src/main/res/drawable-hdpi/invis_qc.png diff --git a/res/drawable-hdpi/plugin_capture_video_capture_image.png b/app/src/main/res/drawable-hdpi/plugin_capture_video_capture_image.png similarity index 100% rename from res/drawable-hdpi/plugin_capture_video_capture_image.png rename to app/src/main/res/drawable-hdpi/plugin_capture_video_capture_image.png diff --git a/res/drawable-hdpi/plugin_capture_video_capture_image_pressed.png b/app/src/main/res/drawable-hdpi/plugin_capture_video_capture_image_pressed.png similarity index 100% rename from res/drawable-hdpi/plugin_capture_video_capture_image_pressed.png rename to app/src/main/res/drawable-hdpi/plugin_capture_video_capture_image_pressed.png diff --git a/res/drawable-hdpi/plugin_capture_video_timelapse_active.png b/app/src/main/res/drawable-hdpi/plugin_capture_video_timelapse_active.png similarity index 100% rename from res/drawable-hdpi/plugin_capture_video_timelapse_active.png rename to app/src/main/res/drawable-hdpi/plugin_capture_video_timelapse_active.png diff --git a/res/drawable-hdpi/plugin_capture_video_timelapse_inactive.png b/app/src/main/res/drawable-hdpi/plugin_capture_video_timelapse_inactive.png similarity index 100% rename from res/drawable-hdpi/plugin_capture_video_timelapse_inactive.png rename to app/src/main/res/drawable-hdpi/plugin_capture_video_timelapse_inactive.png diff --git a/res/drawable-hdpi/plugin_vf_grid_golden16x9.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_golden16x9.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_golden16x9.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_golden16x9.png diff --git a/res/drawable-hdpi/plugin_vf_grid_golden3x2.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_golden3x2.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_golden3x2.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_golden3x2.png diff --git a/res/drawable-hdpi/plugin_vf_grid_golden4x3.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_golden4x3.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_golden4x3.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_golden4x3.png diff --git a/res/drawable-hdpi/plugin_vf_grid_golden_icon_bottom_left.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_golden_icon_bottom_left.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_golden_icon_bottom_left.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_golden_icon_bottom_left.png diff --git a/res/drawable-hdpi/plugin_vf_grid_golden_icon_bottom_right.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_golden_icon_bottom_right.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_golden_icon_bottom_right.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_golden_icon_bottom_right.png diff --git a/res/drawable-hdpi/plugin_vf_grid_golden_icon_top_left.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_golden_icon_top_left.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_golden_icon_top_left.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_golden_icon_top_left.png diff --git a/res/drawable-hdpi/plugin_vf_grid_golden_icon_top_right.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_golden_icon_top_right.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_golden_icon_top_right.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_golden_icon_top_right.png diff --git a/res/drawable-hdpi/plugin_vf_grid_thirds16x9.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_thirds16x9.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_thirds16x9.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_thirds16x9.png diff --git a/res/drawable-hdpi/plugin_vf_grid_thirds3x2.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_thirds3x2.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_thirds3x2.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_thirds3x2.png diff --git a/res/drawable-hdpi/plugin_vf_grid_thirds4x3.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_thirds4x3.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_thirds4x3.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_thirds4x3.png diff --git a/res/drawable-hdpi/plugin_vf_grid_thirds_icon.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_thirds_icon.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_thirds_icon.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_thirds_icon.png diff --git a/res/drawable-hdpi/plugin_vf_grid_trisec16x9.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_trisec16x9.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_trisec16x9.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_trisec16x9.png diff --git a/res/drawable-hdpi/plugin_vf_grid_trisec3x2.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_trisec3x2.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_trisec3x2.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_trisec3x2.png diff --git a/res/drawable-hdpi/plugin_vf_grid_trisec4x3.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_trisec4x3.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_trisec4x3.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_trisec4x3.png diff --git a/res/drawable-hdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png diff --git a/res/drawable-hdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png b/app/src/main/res/drawable-hdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png similarity index 100% rename from res/drawable-hdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png rename to app/src/main/res/drawable-hdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png diff --git a/res/drawable-hdpi/switch_bg_focused_holo_dark.9.png b/app/src/main/res/drawable-hdpi/switch_bg_focused_holo_dark.9.png similarity index 100% rename from res/drawable-hdpi/switch_bg_focused_holo_dark.9.png rename to app/src/main/res/drawable-hdpi/switch_bg_focused_holo_dark.9.png diff --git a/res/drawable-hdpi/switch_bg_focused_holo_light.9.png b/app/src/main/res/drawable-hdpi/switch_bg_focused_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/switch_bg_focused_holo_light.9.png rename to app/src/main/res/drawable-hdpi/switch_bg_focused_holo_light.9.png diff --git a/res/drawable-hdpi/switch_bg_holo_dark.9.png b/app/src/main/res/drawable-hdpi/switch_bg_holo_dark.9.png similarity index 100% rename from res/drawable-hdpi/switch_bg_holo_dark.9.png rename to app/src/main/res/drawable-hdpi/switch_bg_holo_dark.9.png diff --git a/res/drawable-hdpi/switch_bg_holo_light.9.png b/app/src/main/res/drawable-hdpi/switch_bg_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/switch_bg_holo_light.9.png rename to app/src/main/res/drawable-hdpi/switch_bg_holo_light.9.png diff --git a/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png b/app/src/main/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png similarity index 100% rename from res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png rename to app/src/main/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png diff --git a/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png b/app/src/main/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/switch_thumb_activated_holo_light.9.png rename to app/src/main/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png diff --git a/res/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png b/app/src/main/res/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png similarity index 100% rename from res/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png rename to app/src/main/res/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png diff --git a/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png b/app/src/main/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png rename to app/src/main/res/drawable-hdpi/switch_thumb_disabled_holo_light.9.png diff --git a/res/drawable-hdpi/switch_thumb_holo_dark.9.png b/app/src/main/res/drawable-hdpi/switch_thumb_holo_dark.9.png similarity index 100% rename from res/drawable-hdpi/switch_thumb_holo_dark.9.png rename to app/src/main/res/drawable-hdpi/switch_thumb_holo_dark.9.png diff --git a/res/drawable-hdpi/switch_thumb_holo_light.9.png b/app/src/main/res/drawable-hdpi/switch_thumb_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/switch_thumb_holo_light.9.png rename to app/src/main/res/drawable-hdpi/switch_thumb_holo_light.9.png diff --git a/res/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png b/app/src/main/res/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png similarity index 100% rename from res/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png rename to app/src/main/res/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png diff --git a/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png b/app/src/main/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png rename to app/src/main/res/drawable-hdpi/switch_thumb_pressed_holo_light.9.png diff --git a/res/drawable-hdpi/widget_full_solid_preview.png b/app/src/main/res/drawable-hdpi/widget_full_solid_preview.png similarity index 100% rename from res/drawable-hdpi/widget_full_solid_preview.png rename to app/src/main/res/drawable-hdpi/widget_full_solid_preview.png diff --git a/res/drawable-hdpi/widget_preview.png b/app/src/main/res/drawable-hdpi/widget_preview.png similarity index 100% rename from res/drawable-hdpi/widget_preview.png rename to app/src/main/res/drawable-hdpi/widget_preview.png diff --git a/res/drawable-hdpi/widget_solid_preview.png b/app/src/main/res/drawable-hdpi/widget_solid_preview.png similarity index 100% rename from res/drawable-hdpi/widget_solid_preview.png rename to app/src/main/res/drawable-hdpi/widget_solid_preview.png diff --git a/res/drawable-large-hdpi/almalence_gui_hint_background.png b/app/src/main/res/drawable-large-hdpi/almalence_gui_hint_background.png similarity index 100% rename from res/drawable-large-hdpi/almalence_gui_hint_background.png rename to app/src/main/res/drawable-large-hdpi/almalence_gui_hint_background.png diff --git a/res/drawable-large-hdpi/gui_almalence_aelock_off.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_aelock_off.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_aelock_off.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_aelock_off.png diff --git a/res/drawable-large-hdpi/gui_almalence_aelock_on.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_aelock_on.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_aelock_on.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_aelock_on.png diff --git a/res/drawable-large-hdpi/gui_almalence_awlock_off.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_awlock_off.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_awlock_off.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_awlock_off.png diff --git a/res/drawable-large-hdpi/gui_almalence_awlock_on.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_awlock_on.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_awlock_on.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_awlock_on.png diff --git a/res/drawable-large-hdpi/gui_almalence_histogram_luma.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_histogram_luma.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_histogram_luma.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_histogram_luma.png diff --git a/res/drawable-large-hdpi/gui_almalence_histogram_off.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_histogram_off.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_histogram_off.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_histogram_off.png diff --git a/res/drawable-large-hdpi/gui_almalence_histogram_rgb.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_histogram_rgb.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_histogram_rgb.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_histogram_rgb.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_burst10.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_burst10.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_burst10.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_burst10.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_burst15.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_burst15.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_burst15.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_burst15.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_burst20.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_burst20.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_burst20.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_burst20.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_burst3.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_burst3.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_burst3.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_burst3.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_burst5.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_burst5.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_burst5.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_burst5.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer10.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer10.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer10.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer10.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer10_control.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer10_control.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer10_control.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer10_control.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer10_controlcative.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer10_controlcative.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer10_controlcative.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer10_controlcative.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer15.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer15.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer15.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer15.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer15_control.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer15_control.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer15_control.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer15_control.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer15_controlcative.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer15_controlcative.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer15_controlcative.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer15_controlcative.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer3.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer3.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer3.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer3.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer30.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer30.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer30.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer30.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer30_control.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer30_control.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer30_control.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer30_control.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer30_controlcative.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer30_controlcative.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer30_controlcative.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer30_controlcative.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer3_control.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer3_control.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer3_control.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer3_control.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer3_controlcative.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer3_controlcative.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer3_controlcative.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer3_controlcative.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer5.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer5.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer5.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer5.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer5_control.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer5_control.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer5_control.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer5_control.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer5_controlcative.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer5_controlcative.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer5_controlcative.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer5_controlcative.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer60.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer60.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer60.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer60.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer60_control.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer60_control.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer60_control.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer60_control.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer60_controlcative.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer60_controlcative.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer60_controlcative.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer60_controlcative.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer_control.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer_control.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer_control.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer_control.png diff --git a/res/drawable-large-hdpi/gui_almalence_mode_selftimer_controlcative.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer_controlcative.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_mode_selftimer_controlcative.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_mode_selftimer_controlcative.png diff --git a/res/drawable-large-hdpi/gui_almalence_select_mode.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_select_mode.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_select_mode.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_select_mode.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_changecamera_back.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_changecamera_back.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_changecamera_back.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_changecamera_back.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_changecamera_front.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_changecamera_front.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_changecamera_front.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_changecamera_front.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_changecamera_sony.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_changecamera_sony.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_changecamera_sony.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_changecamera_sony.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_exposure.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_exposure.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_exposure.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_exposure.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_exposure_background.9.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_exposure_background.9.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_exposure_background.9.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_exposure_background.9.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_flash_auto.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_flash_auto.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_flash_auto.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_flash_auto.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_flash_off.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_flash_off.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_flash_off.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_flash_off.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_flash_on.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_flash_on.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_flash_on.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_flash_on.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_flash_redeye.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_flash_redeye.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_flash_redeye.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_flash_redeye.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_flash_torch.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_flash_torch.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_flash_torch.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_flash_torch.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_focus_aflock.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_aflock.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_focus_aflock.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_aflock.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_focus_auto.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_auto.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_focus_auto.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_auto.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_focus_continiuouspicture.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_continiuouspicture.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_focus_continiuouspicture.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_continiuouspicture.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_focus_continiuousvideo.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_continiuousvideo.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_focus_continiuousvideo.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_continiuousvideo.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_focus_edof.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_edof.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_focus_edof.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_edof.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_focus_fixed.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_fixed.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_focus_fixed.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_fixed.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_focus_infinity.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_infinity.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_focus_infinity.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_infinity.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_focus_macro.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_macro.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_focus_macro.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_macro.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_focus_manual.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_manual.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_focus_manual.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_manual.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_focus_normal.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_normal.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_focus_normal.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_focus_normal.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_iso_100.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_100.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_iso_100.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_100.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_iso_10000.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_10000.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_iso_10000.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_10000.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_iso_1600.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_1600.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_iso_1600.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_1600.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_iso_200.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_200.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_iso_200.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_200.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_iso_3200.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_3200.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_iso_3200.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_3200.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_iso_400.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_400.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_iso_400.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_400.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_iso_50.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_50.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_iso_50.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_50.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_iso_6400.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_6400.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_iso_6400.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_6400.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_iso_800.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_800.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_iso_800.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_800.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_iso_auto.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_auto.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_iso_auto.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_iso_auto.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_metering_auto.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_metering_auto.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_metering_auto.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_metering_auto.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_metering_center.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_metering_center.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_metering_center.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_metering_center.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_metering_matrix.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_metering_matrix.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_metering_matrix.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_metering_matrix.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_metering_spot.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_metering_spot.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_metering_spot.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_metering_spot.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_more_settings.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_more_settings.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_more_settings.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_more_settings.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_action.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_action.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_action.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_action.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_ar.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_ar.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_ar.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_ar.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_auto.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_auto.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_auto.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_auto.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_barcode.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_barcode.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_barcode.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_barcode.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_beach.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_beach.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_beach.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_beach.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_candlelight.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_candlelight.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_candlelight.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_candlelight.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_fireworks.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_fireworks.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_fireworks.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_fireworks.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_hdr.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_hdr.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_hdr.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_hdr.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_landscape.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_landscape.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_landscape.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_landscape.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_night.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_night.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_night.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_night.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_nightportrait.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_nightportrait.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_nightportrait.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_nightportrait.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_party.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_party.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_party.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_party.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_portrait.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_portrait.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_portrait.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_portrait.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_snow.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_snow.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_snow.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_snow.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_sports.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_sports.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_sports.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_sports.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_steadyphoto.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_steadyphoto.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_steadyphoto.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_steadyphoto.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_sunset.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_sunset.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_sunset.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_sunset.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_scene_theater.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_theater.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_scene_theater.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_scene_theater.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_shutter_speed_priority.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_shutter_speed_priority.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_shutter_speed_priority.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_shutter_speed_priority.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_wb_auto.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_auto.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_wb_auto.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_auto.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_wb_cloudydaylight.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_cloudydaylight.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_wb_cloudydaylight.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_cloudydaylight.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_wb_daylight.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_daylight.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_wb_daylight.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_daylight.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_wb_fluorescent.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_fluorescent.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_wb_fluorescent.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_fluorescent.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_wb_incandescent.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_incandescent.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_wb_incandescent.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_incandescent.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_wb_mwb.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_mwb.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_wb_mwb.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_mwb.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_wb_shade.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_shade.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_wb_shade.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_shade.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_wb_twilight.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_twilight.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_wb_twilight.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_twilight.png diff --git a/res/drawable-large-hdpi/gui_almalence_settings_wb_warmfluorescent.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_warmfluorescent.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_settings_wb_warmfluorescent.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_settings_wb_warmfluorescent.png diff --git a/res/drawable-large-hdpi/gui_almalence_shutter.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_shutter.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_shutter.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_shutter.png diff --git a/res/drawable-large-hdpi/gui_almalence_shutter_pressed.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_shutter_pressed.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_shutter_pressed.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_shutter_pressed.png diff --git a/res/drawable-large-hdpi/gui_almalence_shutter_selected.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_shutter_selected.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_shutter_selected.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_shutter_selected.png diff --git a/res/drawable-large-hdpi/gui_almalence_shutter_video_off.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_shutter_video_off.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_shutter_video_off.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_shutter_video_off.png diff --git a/res/drawable-large-hdpi/gui_almalence_video_1080.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_video_1080.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_video_1080.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_video_1080.png diff --git a/res/drawable-large-hdpi/gui_almalence_video_2160.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_video_2160.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_video_2160.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_video_2160.png diff --git a/res/drawable-large-hdpi/gui_almalence_video_4096.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_video_4096.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_video_4096.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_video_4096.png diff --git a/res/drawable-large-hdpi/gui_almalence_video_480.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_video_480.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_video_480.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_video_480.png diff --git a/res/drawable-large-hdpi/gui_almalence_video_720.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_video_720.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_video_720.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_video_720.png diff --git a/res/drawable-large-hdpi/gui_almalence_video_cif.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_video_cif.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_video_cif.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_video_cif.png diff --git a/res/drawable-large-hdpi/gui_almalence_video_qcif.png b/app/src/main/res/drawable-large-hdpi/gui_almalence_video_qcif.png similarity index 100% rename from res/drawable-large-hdpi/gui_almalence_video_qcif.png rename to app/src/main/res/drawable-large-hdpi/gui_almalence_video_qcif.png diff --git a/res/drawable-large-hdpi/ic_menu_save.png b/app/src/main/res/drawable-large-hdpi/ic_menu_save.png similarity index 100% rename from res/drawable-large-hdpi/ic_menu_save.png rename to app/src/main/res/drawable-large-hdpi/ic_menu_save.png diff --git a/res/drawable-large-hdpi/ic_menu_save_glow.png b/app/src/main/res/drawable-large-hdpi/ic_menu_save_glow.png similarity index 100% rename from res/drawable-large-hdpi/ic_menu_save_glow.png rename to app/src/main/res/drawable-large-hdpi/ic_menu_save_glow.png diff --git a/res/drawable-large-hdpi/icon.png b/app/src/main/res/drawable-large-hdpi/icon.png similarity index 100% rename from res/drawable-large-hdpi/icon.png rename to app/src/main/res/drawable-large-hdpi/icon.png diff --git a/res/drawable-large-hdpi/invis_qc.png b/app/src/main/res/drawable-large-hdpi/invis_qc.png similarity index 100% rename from res/drawable-large-hdpi/invis_qc.png rename to app/src/main/res/drawable-large-hdpi/invis_qc.png diff --git a/res/drawable-large-hdpi/plugin_capture_video_capture_image.png b/app/src/main/res/drawable-large-hdpi/plugin_capture_video_capture_image.png similarity index 100% rename from res/drawable-large-hdpi/plugin_capture_video_capture_image.png rename to app/src/main/res/drawable-large-hdpi/plugin_capture_video_capture_image.png diff --git a/res/drawable-large-hdpi/plugin_capture_video_capture_image_pressed.png b/app/src/main/res/drawable-large-hdpi/plugin_capture_video_capture_image_pressed.png similarity index 100% rename from res/drawable-large-hdpi/plugin_capture_video_capture_image_pressed.png rename to app/src/main/res/drawable-large-hdpi/plugin_capture_video_capture_image_pressed.png diff --git a/res/drawable-large-hdpi/plugin_capture_video_timelapse_active.png b/app/src/main/res/drawable-large-hdpi/plugin_capture_video_timelapse_active.png similarity index 100% rename from res/drawable-large-hdpi/plugin_capture_video_timelapse_active.png rename to app/src/main/res/drawable-large-hdpi/plugin_capture_video_timelapse_active.png diff --git a/res/drawable-large-hdpi/plugin_capture_video_timelapse_inactive.png b/app/src/main/res/drawable-large-hdpi/plugin_capture_video_timelapse_inactive.png similarity index 100% rename from res/drawable-large-hdpi/plugin_capture_video_timelapse_inactive.png rename to app/src/main/res/drawable-large-hdpi/plugin_capture_video_timelapse_inactive.png diff --git a/res/drawable-large-hdpi/plugin_processing_preshot_savethis.png b/app/src/main/res/drawable-large-hdpi/plugin_processing_preshot_savethis.png similarity index 100% rename from res/drawable-large-hdpi/plugin_processing_preshot_savethis.png rename to app/src/main/res/drawable-large-hdpi/plugin_processing_preshot_savethis.png diff --git a/res/drawable-large-hdpi/plugin_processing_preshot_savethis_glow.png b/app/src/main/res/drawable-large-hdpi/plugin_processing_preshot_savethis_glow.png similarity index 100% rename from res/drawable-large-hdpi/plugin_processing_preshot_savethis_glow.png rename to app/src/main/res/drawable-large-hdpi/plugin_processing_preshot_savethis_glow.png diff --git a/res/drawable-large-hdpi/plugin_vf_grid_golden16x9.png b/app/src/main/res/drawable-large-hdpi/plugin_vf_grid_golden16x9.png similarity index 100% rename from res/drawable-large-hdpi/plugin_vf_grid_golden16x9.png rename to app/src/main/res/drawable-large-hdpi/plugin_vf_grid_golden16x9.png diff --git a/res/drawable-large-hdpi/plugin_vf_grid_golden3x2.png b/app/src/main/res/drawable-large-hdpi/plugin_vf_grid_golden3x2.png similarity index 100% rename from res/drawable-large-hdpi/plugin_vf_grid_golden3x2.png rename to app/src/main/res/drawable-large-hdpi/plugin_vf_grid_golden3x2.png diff --git a/res/drawable-large-hdpi/plugin_vf_grid_golden4x3.png b/app/src/main/res/drawable-large-hdpi/plugin_vf_grid_golden4x3.png similarity index 100% rename from res/drawable-large-hdpi/plugin_vf_grid_golden4x3.png rename to app/src/main/res/drawable-large-hdpi/plugin_vf_grid_golden4x3.png diff --git a/res/drawable-large-hdpi/plugin_vf_grid_golden_icon_top_left.png b/app/src/main/res/drawable-large-hdpi/plugin_vf_grid_golden_icon_top_left.png similarity index 100% rename from res/drawable-large-hdpi/plugin_vf_grid_golden_icon_top_left.png rename to app/src/main/res/drawable-large-hdpi/plugin_vf_grid_golden_icon_top_left.png diff --git a/res/drawable-large-hdpi/plugin_vf_grid_thirds16x9.png b/app/src/main/res/drawable-large-hdpi/plugin_vf_grid_thirds16x9.png similarity index 100% rename from res/drawable-large-hdpi/plugin_vf_grid_thirds16x9.png rename to app/src/main/res/drawable-large-hdpi/plugin_vf_grid_thirds16x9.png diff --git a/res/drawable-large-hdpi/plugin_vf_grid_thirds3x2.png b/app/src/main/res/drawable-large-hdpi/plugin_vf_grid_thirds3x2.png similarity index 100% rename from res/drawable-large-hdpi/plugin_vf_grid_thirds3x2.png rename to app/src/main/res/drawable-large-hdpi/plugin_vf_grid_thirds3x2.png diff --git a/res/drawable-large-hdpi/plugin_vf_grid_thirds4x3.png b/app/src/main/res/drawable-large-hdpi/plugin_vf_grid_thirds4x3.png similarity index 100% rename from res/drawable-large-hdpi/plugin_vf_grid_thirds4x3.png rename to app/src/main/res/drawable-large-hdpi/plugin_vf_grid_thirds4x3.png diff --git a/res/drawable-large-hdpi/plugin_vf_grid_thirds_icon.png b/app/src/main/res/drawable-large-hdpi/plugin_vf_grid_thirds_icon.png similarity index 100% rename from res/drawable-large-hdpi/plugin_vf_grid_thirds_icon.png rename to app/src/main/res/drawable-large-hdpi/plugin_vf_grid_thirds_icon.png diff --git a/res/drawable-large-hdpi/plugin_vf_grid_trisec16x9.png b/app/src/main/res/drawable-large-hdpi/plugin_vf_grid_trisec16x9.png similarity index 100% rename from res/drawable-large-hdpi/plugin_vf_grid_trisec16x9.png rename to app/src/main/res/drawable-large-hdpi/plugin_vf_grid_trisec16x9.png diff --git a/res/drawable-large-hdpi/plugin_vf_grid_trisec3x2.png b/app/src/main/res/drawable-large-hdpi/plugin_vf_grid_trisec3x2.png similarity index 100% rename from res/drawable-large-hdpi/plugin_vf_grid_trisec3x2.png rename to app/src/main/res/drawable-large-hdpi/plugin_vf_grid_trisec3x2.png diff --git a/res/drawable-large-hdpi/plugin_vf_grid_trisec4x3.png b/app/src/main/res/drawable-large-hdpi/plugin_vf_grid_trisec4x3.png similarity index 100% rename from res/drawable-large-hdpi/plugin_vf_grid_trisec4x3.png rename to app/src/main/res/drawable-large-hdpi/plugin_vf_grid_trisec4x3.png diff --git a/res/drawable-large-hdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png b/app/src/main/res/drawable-large-hdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png similarity index 100% rename from res/drawable-large-hdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png rename to app/src/main/res/drawable-large-hdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png diff --git a/res/drawable-large-hdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png b/app/src/main/res/drawable-large-hdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png similarity index 100% rename from res/drawable-large-hdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png rename to app/src/main/res/drawable-large-hdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png diff --git a/res/drawable-large-hdpi/plugins_processing_hdr_adjustments_seekbar_bg.9.png b/app/src/main/res/drawable-large-hdpi/plugins_processing_hdr_adjustments_seekbar_bg.9.png similarity index 100% rename from res/drawable-large-hdpi/plugins_processing_hdr_adjustments_seekbar_bg.9.png rename to app/src/main/res/drawable-large-hdpi/plugins_processing_hdr_adjustments_seekbar_bg.9.png diff --git a/res/drawable-large-hdpi/switch_bg_focused_holo_dark.9.png b/app/src/main/res/drawable-large-hdpi/switch_bg_focused_holo_dark.9.png similarity index 100% rename from res/drawable-large-hdpi/switch_bg_focused_holo_dark.9.png rename to app/src/main/res/drawable-large-hdpi/switch_bg_focused_holo_dark.9.png diff --git a/res/drawable-large-hdpi/switch_bg_focused_holo_light.9.png b/app/src/main/res/drawable-large-hdpi/switch_bg_focused_holo_light.9.png similarity index 100% rename from res/drawable-large-hdpi/switch_bg_focused_holo_light.9.png rename to app/src/main/res/drawable-large-hdpi/switch_bg_focused_holo_light.9.png diff --git a/res/drawable-large-hdpi/switch_bg_holo_dark.9.png b/app/src/main/res/drawable-large-hdpi/switch_bg_holo_dark.9.png similarity index 100% rename from res/drawable-large-hdpi/switch_bg_holo_dark.9.png rename to app/src/main/res/drawable-large-hdpi/switch_bg_holo_dark.9.png diff --git a/res/drawable-large-hdpi/switch_bg_holo_light.9.png b/app/src/main/res/drawable-large-hdpi/switch_bg_holo_light.9.png similarity index 100% rename from res/drawable-large-hdpi/switch_bg_holo_light.9.png rename to app/src/main/res/drawable-large-hdpi/switch_bg_holo_light.9.png diff --git a/res/drawable-large-hdpi/switch_thumb_activated_holo_dark.9.png b/app/src/main/res/drawable-large-hdpi/switch_thumb_activated_holo_dark.9.png similarity index 100% rename from res/drawable-large-hdpi/switch_thumb_activated_holo_dark.9.png rename to app/src/main/res/drawable-large-hdpi/switch_thumb_activated_holo_dark.9.png diff --git a/res/drawable-large-hdpi/switch_thumb_activated_holo_light.9.png b/app/src/main/res/drawable-large-hdpi/switch_thumb_activated_holo_light.9.png similarity index 100% rename from res/drawable-large-hdpi/switch_thumb_activated_holo_light.9.png rename to app/src/main/res/drawable-large-hdpi/switch_thumb_activated_holo_light.9.png diff --git a/res/drawable-large-hdpi/switch_thumb_disabled_holo_dark.9.png b/app/src/main/res/drawable-large-hdpi/switch_thumb_disabled_holo_dark.9.png similarity index 100% rename from res/drawable-large-hdpi/switch_thumb_disabled_holo_dark.9.png rename to app/src/main/res/drawable-large-hdpi/switch_thumb_disabled_holo_dark.9.png diff --git a/res/drawable-large-hdpi/switch_thumb_disabled_holo_light.9.png b/app/src/main/res/drawable-large-hdpi/switch_thumb_disabled_holo_light.9.png similarity index 100% rename from res/drawable-large-hdpi/switch_thumb_disabled_holo_light.9.png rename to app/src/main/res/drawable-large-hdpi/switch_thumb_disabled_holo_light.9.png diff --git a/res/drawable-large-hdpi/switch_thumb_holo_dark.9.png b/app/src/main/res/drawable-large-hdpi/switch_thumb_holo_dark.9.png similarity index 100% rename from res/drawable-large-hdpi/switch_thumb_holo_dark.9.png rename to app/src/main/res/drawable-large-hdpi/switch_thumb_holo_dark.9.png diff --git a/res/drawable-large-hdpi/switch_thumb_holo_light.9.png b/app/src/main/res/drawable-large-hdpi/switch_thumb_holo_light.9.png similarity index 100% rename from res/drawable-large-hdpi/switch_thumb_holo_light.9.png rename to app/src/main/res/drawable-large-hdpi/switch_thumb_holo_light.9.png diff --git a/res/drawable-large-hdpi/switch_thumb_pressed_holo_dark.9.png b/app/src/main/res/drawable-large-hdpi/switch_thumb_pressed_holo_dark.9.png similarity index 100% rename from res/drawable-large-hdpi/switch_thumb_pressed_holo_dark.9.png rename to app/src/main/res/drawable-large-hdpi/switch_thumb_pressed_holo_dark.9.png diff --git a/res/drawable-large-hdpi/switch_thumb_pressed_holo_light.9.png b/app/src/main/res/drawable-large-hdpi/switch_thumb_pressed_holo_light.9.png similarity index 100% rename from res/drawable-large-hdpi/switch_thumb_pressed_holo_light.9.png rename to app/src/main/res/drawable-large-hdpi/switch_thumb_pressed_holo_light.9.png diff --git a/res/drawable-large-hdpi/widget_full_solid_preview.png b/app/src/main/res/drawable-large-hdpi/widget_full_solid_preview.png similarity index 100% rename from res/drawable-large-hdpi/widget_full_solid_preview.png rename to app/src/main/res/drawable-large-hdpi/widget_full_solid_preview.png diff --git a/res/drawable-large-hdpi/widget_preview.png b/app/src/main/res/drawable-large-hdpi/widget_preview.png similarity index 100% rename from res/drawable-large-hdpi/widget_preview.png rename to app/src/main/res/drawable-large-hdpi/widget_preview.png diff --git a/res/drawable-large-hdpi/widget_solid_preview.png b/app/src/main/res/drawable-large-hdpi/widget_solid_preview.png similarity index 100% rename from res/drawable-large-hdpi/widget_solid_preview.png rename to app/src/main/res/drawable-large-hdpi/widget_solid_preview.png diff --git a/res/drawable-large-hdpi/zoombar_background.9.png b/app/src/main/res/drawable-large-hdpi/zoombar_background.9.png similarity index 100% rename from res/drawable-large-hdpi/zoombar_background.9.png rename to app/src/main/res/drawable-large-hdpi/zoombar_background.9.png diff --git a/res/drawable-mdpi/alert_dialog_icon.png b/app/src/main/res/drawable-mdpi/alert_dialog_icon.png similarity index 100% rename from res/drawable-mdpi/alert_dialog_icon.png rename to app/src/main/res/drawable-mdpi/alert_dialog_icon.png diff --git a/res/drawable-mdpi/almalence_gui_hint_background.png b/app/src/main/res/drawable-mdpi/almalence_gui_hint_background.png similarity index 100% rename from res/drawable-mdpi/almalence_gui_hint_background.png rename to app/src/main/res/drawable-mdpi/almalence_gui_hint_background.png diff --git a/res/drawable-mdpi/apptheme_scrubber_control_disabled_holo.png b/app/src/main/res/drawable-mdpi/apptheme_scrubber_control_disabled_holo.png similarity index 100% rename from res/drawable-mdpi/apptheme_scrubber_control_disabled_holo.png rename to app/src/main/res/drawable-mdpi/apptheme_scrubber_control_disabled_holo.png diff --git a/res/drawable-mdpi/apptheme_scrubber_control_focused_holo.png b/app/src/main/res/drawable-mdpi/apptheme_scrubber_control_focused_holo.png similarity index 100% rename from res/drawable-mdpi/apptheme_scrubber_control_focused_holo.png rename to app/src/main/res/drawable-mdpi/apptheme_scrubber_control_focused_holo.png diff --git a/res/drawable-mdpi/apptheme_scrubber_control_normal_holo.png b/app/src/main/res/drawable-mdpi/apptheme_scrubber_control_normal_holo.png similarity index 100% rename from res/drawable-mdpi/apptheme_scrubber_control_normal_holo.png rename to app/src/main/res/drawable-mdpi/apptheme_scrubber_control_normal_holo.png diff --git a/res/drawable-mdpi/apptheme_scrubber_control_pressed_holo.png b/app/src/main/res/drawable-mdpi/apptheme_scrubber_control_pressed_holo.png similarity index 100% rename from res/drawable-mdpi/apptheme_scrubber_control_pressed_holo.png rename to app/src/main/res/drawable-mdpi/apptheme_scrubber_control_pressed_holo.png diff --git a/res/drawable-mdpi/apptheme_scrubber_primary_holo.9.png b/app/src/main/res/drawable-mdpi/apptheme_scrubber_primary_holo.9.png similarity index 100% rename from res/drawable-mdpi/apptheme_scrubber_primary_holo.9.png rename to app/src/main/res/drawable-mdpi/apptheme_scrubber_primary_holo.9.png diff --git a/res/drawable-mdpi/apptheme_scrubber_secondary_holo.9.png b/app/src/main/res/drawable-mdpi/apptheme_scrubber_secondary_holo.9.png similarity index 100% rename from res/drawable-mdpi/apptheme_scrubber_secondary_holo.9.png rename to app/src/main/res/drawable-mdpi/apptheme_scrubber_secondary_holo.9.png diff --git a/res/drawable-mdpi/apptheme_scrubber_track_holo_light.9.png b/app/src/main/res/drawable-mdpi/apptheme_scrubber_track_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/apptheme_scrubber_track_holo_light.9.png rename to app/src/main/res/drawable-mdpi/apptheme_scrubber_track_holo_light.9.png diff --git a/res/drawable-mdpi/gui_almalence_aelock_off.png b/app/src/main/res/drawable-mdpi/gui_almalence_aelock_off.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_aelock_off.png rename to app/src/main/res/drawable-mdpi/gui_almalence_aelock_off.png diff --git a/res/drawable-mdpi/gui_almalence_aelock_on.png b/app/src/main/res/drawable-mdpi/gui_almalence_aelock_on.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_aelock_on.png rename to app/src/main/res/drawable-mdpi/gui_almalence_aelock_on.png diff --git a/res/drawable-mdpi/gui_almalence_awlock_off.png b/app/src/main/res/drawable-mdpi/gui_almalence_awlock_off.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_awlock_off.png rename to app/src/main/res/drawable-mdpi/gui_almalence_awlock_off.png diff --git a/res/drawable-mdpi/gui_almalence_awlock_on.png b/app/src/main/res/drawable-mdpi/gui_almalence_awlock_on.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_awlock_on.png rename to app/src/main/res/drawable-mdpi/gui_almalence_awlock_on.png diff --git a/res/drawable-mdpi/gui_almalence_histogram_luma.png b/app/src/main/res/drawable-mdpi/gui_almalence_histogram_luma.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_histogram_luma.png rename to app/src/main/res/drawable-mdpi/gui_almalence_histogram_luma.png diff --git a/res/drawable-mdpi/gui_almalence_histogram_off.png b/app/src/main/res/drawable-mdpi/gui_almalence_histogram_off.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_histogram_off.png rename to app/src/main/res/drawable-mdpi/gui_almalence_histogram_off.png diff --git a/res/drawable-mdpi/gui_almalence_histogram_rgb.png b/app/src/main/res/drawable-mdpi/gui_almalence_histogram_rgb.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_histogram_rgb.png rename to app/src/main/res/drawable-mdpi/gui_almalence_histogram_rgb.png diff --git a/res/drawable-mdpi/gui_almalence_mode_burst10.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_burst10.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_burst10.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_burst10.png diff --git a/res/drawable-mdpi/gui_almalence_mode_burst15.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_burst15.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_burst15.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_burst15.png diff --git a/res/drawable-mdpi/gui_almalence_mode_burst20.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_burst20.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_burst20.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_burst20.png diff --git a/res/drawable-mdpi/gui_almalence_mode_burst3.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_burst3.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_burst3.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_burst3.png diff --git a/res/drawable-mdpi/gui_almalence_mode_burst5.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_burst5.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_burst5.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_burst5.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer10.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer10.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer10.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer10.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer10_control.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer10_control.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer10_control.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer10_control.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer10_controlcative.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer10_controlcative.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer10_controlcative.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer10_controlcative.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer15.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer15.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer15.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer15.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer15_control.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer15_control.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer15_control.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer15_control.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer15_controlcative.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer15_controlcative.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer15_controlcative.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer15_controlcative.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer3.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer3.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer3.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer3.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer30.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer30.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer30.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer30.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer30_control.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer30_control.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer30_control.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer30_control.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer30_controlcative.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer30_controlcative.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer30_controlcative.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer30_controlcative.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer3_control.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer3_control.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer3_control.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer3_control.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer3_controlcative.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer3_controlcative.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer3_controlcative.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer3_controlcative.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer5.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer5.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer5.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer5.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer5_control.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer5_control.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer5_control.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer5_control.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer5_controlcative.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer5_controlcative.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer5_controlcative.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer5_controlcative.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer60.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer60.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer60.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer60.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer60_control.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer60_control.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer60_control.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer60_control.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer60_controlcative.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer60_controlcative.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer60_controlcative.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer60_controlcative.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer_control.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer_control.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer_control.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer_control.png diff --git a/res/drawable-mdpi/gui_almalence_mode_selftimer_controlcative.png b/app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer_controlcative.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_mode_selftimer_controlcative.png rename to app/src/main/res/drawable-mdpi/gui_almalence_mode_selftimer_controlcative.png diff --git a/res/drawable-mdpi/gui_almalence_select_mode.png b/app/src/main/res/drawable-mdpi/gui_almalence_select_mode.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_select_mode.png rename to app/src/main/res/drawable-mdpi/gui_almalence_select_mode.png diff --git a/res/drawable-mdpi/gui_almalence_settings_changecamera_back.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_changecamera_back.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_changecamera_back.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_changecamera_back.png diff --git a/res/drawable-mdpi/gui_almalence_settings_changecamera_front.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_changecamera_front.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_changecamera_front.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_changecamera_front.png diff --git a/res/drawable-mdpi/gui_almalence_settings_changecamera_sony.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_changecamera_sony.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_changecamera_sony.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_changecamera_sony.png diff --git a/res/drawable-mdpi/gui_almalence_settings_exposure.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_exposure.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_exposure.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_exposure.png diff --git a/res/drawable-mdpi/gui_almalence_settings_flash_auto.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_flash_auto.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_flash_auto.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_flash_auto.png diff --git a/res/drawable-mdpi/gui_almalence_settings_flash_off.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_flash_off.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_flash_off.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_flash_off.png diff --git a/res/drawable-mdpi/gui_almalence_settings_flash_on.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_flash_on.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_flash_on.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_flash_on.png diff --git a/res/drawable-mdpi/gui_almalence_settings_flash_redeye.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_flash_redeye.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_flash_redeye.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_flash_redeye.png diff --git a/res/drawable-mdpi/gui_almalence_settings_flash_torch.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_flash_torch.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_flash_torch.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_flash_torch.png diff --git a/res/drawable-mdpi/gui_almalence_settings_focus_aflock.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_aflock.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_focus_aflock.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_aflock.png diff --git a/res/drawable-mdpi/gui_almalence_settings_focus_auto.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_auto.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_focus_auto.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_auto.png diff --git a/res/drawable-mdpi/gui_almalence_settings_focus_continiuouspicture.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_continiuouspicture.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_focus_continiuouspicture.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_continiuouspicture.png diff --git a/res/drawable-mdpi/gui_almalence_settings_focus_continiuousvideo.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_continiuousvideo.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_focus_continiuousvideo.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_continiuousvideo.png diff --git a/res/drawable-mdpi/gui_almalence_settings_focus_edof.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_edof.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_focus_edof.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_edof.png diff --git a/res/drawable-mdpi/gui_almalence_settings_focus_fixed.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_fixed.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_focus_fixed.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_fixed.png diff --git a/res/drawable-mdpi/gui_almalence_settings_focus_infinity.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_infinity.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_focus_infinity.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_infinity.png diff --git a/res/drawable-mdpi/gui_almalence_settings_focus_macro.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_macro.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_focus_macro.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_macro.png diff --git a/res/drawable-mdpi/gui_almalence_settings_focus_manual.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_manual.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_focus_manual.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_manual.png diff --git a/res/drawable-mdpi/gui_almalence_settings_focus_normal.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_normal.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_focus_normal.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_focus_normal.png diff --git a/res/drawable-mdpi/gui_almalence_settings_iso_100.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_100.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_iso_100.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_100.png diff --git a/res/drawable-mdpi/gui_almalence_settings_iso_10000.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_10000.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_iso_10000.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_10000.png diff --git a/res/drawable-mdpi/gui_almalence_settings_iso_1600.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_1600.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_iso_1600.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_1600.png diff --git a/res/drawable-mdpi/gui_almalence_settings_iso_200.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_200.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_iso_200.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_200.png diff --git a/res/drawable-mdpi/gui_almalence_settings_iso_3200.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_3200.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_iso_3200.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_3200.png diff --git a/res/drawable-mdpi/gui_almalence_settings_iso_400.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_400.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_iso_400.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_400.png diff --git a/res/drawable-mdpi/gui_almalence_settings_iso_50.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_50.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_iso_50.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_50.png diff --git a/res/drawable-mdpi/gui_almalence_settings_iso_6400.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_6400.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_iso_6400.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_6400.png diff --git a/res/drawable-mdpi/gui_almalence_settings_iso_800.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_800.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_iso_800.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_800.png diff --git a/res/drawable-mdpi/gui_almalence_settings_iso_auto.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_auto.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_iso_auto.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_iso_auto.png diff --git a/res/drawable-mdpi/gui_almalence_settings_metering_auto.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_metering_auto.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_metering_auto.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_metering_auto.png diff --git a/res/drawable-mdpi/gui_almalence_settings_metering_center.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_metering_center.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_metering_center.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_metering_center.png diff --git a/res/drawable-mdpi/gui_almalence_settings_metering_matrix.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_metering_matrix.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_metering_matrix.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_metering_matrix.png diff --git a/res/drawable-mdpi/gui_almalence_settings_metering_spot.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_metering_spot.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_metering_spot.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_metering_spot.png diff --git a/res/drawable-mdpi/gui_almalence_settings_more_settings.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_more_settings.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_more_settings.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_more_settings.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_action.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_action.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_action.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_action.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_ar.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_ar.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_ar.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_ar.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_auto.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_auto.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_auto.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_auto.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_barcode.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_barcode.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_barcode.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_barcode.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_beach.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_beach.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_beach.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_beach.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_candlelight.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_candlelight.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_candlelight.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_candlelight.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_fireworks.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_fireworks.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_fireworks.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_fireworks.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_hdr.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_hdr.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_hdr.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_hdr.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_landscape.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_landscape.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_landscape.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_landscape.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_night.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_night.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_night.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_night.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_nightportrait.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_nightportrait.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_nightportrait.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_nightportrait.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_party.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_party.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_party.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_party.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_portrait.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_portrait.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_portrait.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_portrait.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_snow.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_snow.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_snow.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_snow.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_sports.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_sports.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_sports.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_sports.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_steadyphoto.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_steadyphoto.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_steadyphoto.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_steadyphoto.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_sunset.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_sunset.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_sunset.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_sunset.png diff --git a/res/drawable-mdpi/gui_almalence_settings_scene_theater.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_theater.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_scene_theater.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_scene_theater.png diff --git a/res/drawable-mdpi/gui_almalence_settings_shutter_speed_priority.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_shutter_speed_priority.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_shutter_speed_priority.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_shutter_speed_priority.png diff --git a/res/drawable-mdpi/gui_almalence_settings_wb_auto.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_auto.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_wb_auto.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_auto.png diff --git a/res/drawable-mdpi/gui_almalence_settings_wb_cloudydaylight.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_cloudydaylight.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_wb_cloudydaylight.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_cloudydaylight.png diff --git a/res/drawable-mdpi/gui_almalence_settings_wb_daylight.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_daylight.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_wb_daylight.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_daylight.png diff --git a/res/drawable-mdpi/gui_almalence_settings_wb_fluorescent.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_fluorescent.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_wb_fluorescent.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_fluorescent.png diff --git a/res/drawable-mdpi/gui_almalence_settings_wb_incandescent.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_incandescent.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_wb_incandescent.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_incandescent.png diff --git a/res/drawable-mdpi/gui_almalence_settings_wb_mwb.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_mwb.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_wb_mwb.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_mwb.png diff --git a/res/drawable-mdpi/gui_almalence_settings_wb_shade.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_shade.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_wb_shade.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_shade.png diff --git a/res/drawable-mdpi/gui_almalence_settings_wb_twilight.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_twilight.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_wb_twilight.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_twilight.png diff --git a/res/drawable-mdpi/gui_almalence_settings_wb_warmfluorescent.png b/app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_warmfluorescent.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_settings_wb_warmfluorescent.png rename to app/src/main/res/drawable-mdpi/gui_almalence_settings_wb_warmfluorescent.png diff --git a/res/drawable-mdpi/gui_almalence_shutter.png b/app/src/main/res/drawable-mdpi/gui_almalence_shutter.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_shutter.png rename to app/src/main/res/drawable-mdpi/gui_almalence_shutter.png diff --git a/res/drawable-mdpi/gui_almalence_shutter_pressed.png b/app/src/main/res/drawable-mdpi/gui_almalence_shutter_pressed.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_shutter_pressed.png rename to app/src/main/res/drawable-mdpi/gui_almalence_shutter_pressed.png diff --git a/res/drawable-mdpi/gui_almalence_shutter_selected.png b/app/src/main/res/drawable-mdpi/gui_almalence_shutter_selected.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_shutter_selected.png rename to app/src/main/res/drawable-mdpi/gui_almalence_shutter_selected.png diff --git a/res/drawable-mdpi/gui_almalence_shutter_video_off.png b/app/src/main/res/drawable-mdpi/gui_almalence_shutter_video_off.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_shutter_video_off.png rename to app/src/main/res/drawable-mdpi/gui_almalence_shutter_video_off.png diff --git a/res/drawable-mdpi/gui_almalence_video_1080.png b/app/src/main/res/drawable-mdpi/gui_almalence_video_1080.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_video_1080.png rename to app/src/main/res/drawable-mdpi/gui_almalence_video_1080.png diff --git a/res/drawable-mdpi/gui_almalence_video_2160.png b/app/src/main/res/drawable-mdpi/gui_almalence_video_2160.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_video_2160.png rename to app/src/main/res/drawable-mdpi/gui_almalence_video_2160.png diff --git a/res/drawable-mdpi/gui_almalence_video_4096.png b/app/src/main/res/drawable-mdpi/gui_almalence_video_4096.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_video_4096.png rename to app/src/main/res/drawable-mdpi/gui_almalence_video_4096.png diff --git a/res/drawable-mdpi/gui_almalence_video_480.png b/app/src/main/res/drawable-mdpi/gui_almalence_video_480.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_video_480.png rename to app/src/main/res/drawable-mdpi/gui_almalence_video_480.png diff --git a/res/drawable-mdpi/gui_almalence_video_720.png b/app/src/main/res/drawable-mdpi/gui_almalence_video_720.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_video_720.png rename to app/src/main/res/drawable-mdpi/gui_almalence_video_720.png diff --git a/res/drawable-mdpi/gui_almalence_video_cif.png b/app/src/main/res/drawable-mdpi/gui_almalence_video_cif.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_video_cif.png rename to app/src/main/res/drawable-mdpi/gui_almalence_video_cif.png diff --git a/res/drawable-mdpi/gui_almalence_video_qcif.png b/app/src/main/res/drawable-mdpi/gui_almalence_video_qcif.png similarity index 100% rename from res/drawable-mdpi/gui_almalence_video_qcif.png rename to app/src/main/res/drawable-mdpi/gui_almalence_video_qcif.png diff --git a/res/drawable-mdpi/ic_menu_save.png b/app/src/main/res/drawable-mdpi/ic_menu_save.png similarity index 100% rename from res/drawable-mdpi/ic_menu_save.png rename to app/src/main/res/drawable-mdpi/ic_menu_save.png diff --git a/res/drawable-mdpi/ic_menu_save_glow.png b/app/src/main/res/drawable-mdpi/ic_menu_save_glow.png similarity index 100% rename from res/drawable-mdpi/ic_menu_save_glow.png rename to app/src/main/res/drawable-mdpi/ic_menu_save_glow.png diff --git a/res/drawable-mdpi/icon.png b/app/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from res/drawable-mdpi/icon.png rename to app/src/main/res/drawable-mdpi/icon.png diff --git a/res/drawable-mdpi/invis_qc.png b/app/src/main/res/drawable-mdpi/invis_qc.png similarity index 100% rename from res/drawable-mdpi/invis_qc.png rename to app/src/main/res/drawable-mdpi/invis_qc.png diff --git a/res/drawable-mdpi/plugin_capture_video_capture_image.png b/app/src/main/res/drawable-mdpi/plugin_capture_video_capture_image.png similarity index 100% rename from res/drawable-mdpi/plugin_capture_video_capture_image.png rename to app/src/main/res/drawable-mdpi/plugin_capture_video_capture_image.png diff --git a/res/drawable-mdpi/plugin_capture_video_capture_image_pressed.png b/app/src/main/res/drawable-mdpi/plugin_capture_video_capture_image_pressed.png similarity index 100% rename from res/drawable-mdpi/plugin_capture_video_capture_image_pressed.png rename to app/src/main/res/drawable-mdpi/plugin_capture_video_capture_image_pressed.png diff --git a/res/drawable-mdpi/plugin_capture_video_timelapse_active.png b/app/src/main/res/drawable-mdpi/plugin_capture_video_timelapse_active.png similarity index 100% rename from res/drawable-mdpi/plugin_capture_video_timelapse_active.png rename to app/src/main/res/drawable-mdpi/plugin_capture_video_timelapse_active.png diff --git a/res/drawable-mdpi/plugin_capture_video_timelapse_inactive.png b/app/src/main/res/drawable-mdpi/plugin_capture_video_timelapse_inactive.png similarity index 100% rename from res/drawable-mdpi/plugin_capture_video_timelapse_inactive.png rename to app/src/main/res/drawable-mdpi/plugin_capture_video_timelapse_inactive.png diff --git a/res/drawable-mdpi/plugin_vf_grid_golden16x9.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_golden16x9.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_golden16x9.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_golden16x9.png diff --git a/res/drawable-mdpi/plugin_vf_grid_golden3x2.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_golden3x2.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_golden3x2.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_golden3x2.png diff --git a/res/drawable-mdpi/plugin_vf_grid_golden4x3.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_golden4x3.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_golden4x3.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_golden4x3.png diff --git a/res/drawable-mdpi/plugin_vf_grid_golden_icon_bottom_left.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_golden_icon_bottom_left.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_golden_icon_bottom_left.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_golden_icon_bottom_left.png diff --git a/res/drawable-mdpi/plugin_vf_grid_golden_icon_bottom_right.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_golden_icon_bottom_right.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_golden_icon_bottom_right.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_golden_icon_bottom_right.png diff --git a/res/drawable-mdpi/plugin_vf_grid_golden_icon_top_left.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_golden_icon_top_left.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_golden_icon_top_left.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_golden_icon_top_left.png diff --git a/res/drawable-mdpi/plugin_vf_grid_golden_icon_top_right.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_golden_icon_top_right.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_golden_icon_top_right.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_golden_icon_top_right.png diff --git a/res/drawable-mdpi/plugin_vf_grid_thirds16x9.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_thirds16x9.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_thirds16x9.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_thirds16x9.png diff --git a/res/drawable-mdpi/plugin_vf_grid_thirds3x2.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_thirds3x2.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_thirds3x2.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_thirds3x2.png diff --git a/res/drawable-mdpi/plugin_vf_grid_thirds4x3.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_thirds4x3.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_thirds4x3.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_thirds4x3.png diff --git a/res/drawable-mdpi/plugin_vf_grid_thirds_icon.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_thirds_icon.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_thirds_icon.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_thirds_icon.png diff --git a/res/drawable-mdpi/plugin_vf_grid_trisec16x9.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_trisec16x9.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_trisec16x9.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_trisec16x9.png diff --git a/res/drawable-mdpi/plugin_vf_grid_trisec3x2.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_trisec3x2.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_trisec3x2.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_trisec3x2.png diff --git a/res/drawable-mdpi/plugin_vf_grid_trisec4x3.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_trisec4x3.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_trisec4x3.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_trisec4x3.png diff --git a/res/drawable-mdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png diff --git a/res/drawable-mdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png b/app/src/main/res/drawable-mdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png similarity index 100% rename from res/drawable-mdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png rename to app/src/main/res/drawable-mdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png diff --git a/res/drawable-mdpi/switch_bg_disabled_holo_dark.9.png b/app/src/main/res/drawable-mdpi/switch_bg_disabled_holo_dark.9.png similarity index 100% rename from res/drawable-mdpi/switch_bg_disabled_holo_dark.9.png rename to app/src/main/res/drawable-mdpi/switch_bg_disabled_holo_dark.9.png diff --git a/res/drawable-mdpi/switch_bg_disabled_holo_light.9.png b/app/src/main/res/drawable-mdpi/switch_bg_disabled_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/switch_bg_disabled_holo_light.9.png rename to app/src/main/res/drawable-mdpi/switch_bg_disabled_holo_light.9.png diff --git a/res/drawable-mdpi/switch_bg_focused_holo_dark.9.png b/app/src/main/res/drawable-mdpi/switch_bg_focused_holo_dark.9.png similarity index 100% rename from res/drawable-mdpi/switch_bg_focused_holo_dark.9.png rename to app/src/main/res/drawable-mdpi/switch_bg_focused_holo_dark.9.png diff --git a/res/drawable-mdpi/switch_bg_focused_holo_light.9.png b/app/src/main/res/drawable-mdpi/switch_bg_focused_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/switch_bg_focused_holo_light.9.png rename to app/src/main/res/drawable-mdpi/switch_bg_focused_holo_light.9.png diff --git a/res/drawable-mdpi/switch_bg_holo_dark.9.png b/app/src/main/res/drawable-mdpi/switch_bg_holo_dark.9.png similarity index 100% rename from res/drawable-mdpi/switch_bg_holo_dark.9.png rename to app/src/main/res/drawable-mdpi/switch_bg_holo_dark.9.png diff --git a/res/drawable-mdpi/switch_bg_holo_light.9.png b/app/src/main/res/drawable-mdpi/switch_bg_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/switch_bg_holo_light.9.png rename to app/src/main/res/drawable-mdpi/switch_bg_holo_light.9.png diff --git a/res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png b/app/src/main/res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png similarity index 100% rename from res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png rename to app/src/main/res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png diff --git a/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png b/app/src/main/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/switch_thumb_activated_holo_light.9.png rename to app/src/main/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png diff --git a/res/drawable-mdpi/switch_thumb_disabled_holo_dark.9.png b/app/src/main/res/drawable-mdpi/switch_thumb_disabled_holo_dark.9.png similarity index 100% rename from res/drawable-mdpi/switch_thumb_disabled_holo_dark.9.png rename to app/src/main/res/drawable-mdpi/switch_thumb_disabled_holo_dark.9.png diff --git a/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png b/app/src/main/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png rename to app/src/main/res/drawable-mdpi/switch_thumb_disabled_holo_light.9.png diff --git a/res/drawable-mdpi/switch_thumb_holo_dark.9.png b/app/src/main/res/drawable-mdpi/switch_thumb_holo_dark.9.png similarity index 100% rename from res/drawable-mdpi/switch_thumb_holo_dark.9.png rename to app/src/main/res/drawable-mdpi/switch_thumb_holo_dark.9.png diff --git a/res/drawable-mdpi/switch_thumb_holo_light.9.png b/app/src/main/res/drawable-mdpi/switch_thumb_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/switch_thumb_holo_light.9.png rename to app/src/main/res/drawable-mdpi/switch_thumb_holo_light.9.png diff --git a/res/drawable-mdpi/switch_thumb_pressed_holo_dark.9.png b/app/src/main/res/drawable-mdpi/switch_thumb_pressed_holo_dark.9.png similarity index 100% rename from res/drawable-mdpi/switch_thumb_pressed_holo_dark.9.png rename to app/src/main/res/drawable-mdpi/switch_thumb_pressed_holo_dark.9.png diff --git a/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png b/app/src/main/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png rename to app/src/main/res/drawable-mdpi/switch_thumb_pressed_holo_light.9.png diff --git a/res/drawable-mdpi/widget_full_solid_preview.png b/app/src/main/res/drawable-mdpi/widget_full_solid_preview.png similarity index 100% rename from res/drawable-mdpi/widget_full_solid_preview.png rename to app/src/main/res/drawable-mdpi/widget_full_solid_preview.png diff --git a/res/drawable-mdpi/widget_preview.png b/app/src/main/res/drawable-mdpi/widget_preview.png similarity index 100% rename from res/drawable-mdpi/widget_preview.png rename to app/src/main/res/drawable-mdpi/widget_preview.png diff --git a/res/drawable-mdpi/widget_solid_preview.png b/app/src/main/res/drawable-mdpi/widget_solid_preview.png similarity index 100% rename from res/drawable-mdpi/widget_solid_preview.png rename to app/src/main/res/drawable-mdpi/widget_solid_preview.png diff --git a/res/drawable-xhdpi/almalence_gui_hint_background.png b/app/src/main/res/drawable-xhdpi/almalence_gui_hint_background.png similarity index 100% rename from res/drawable-xhdpi/almalence_gui_hint_background.png rename to app/src/main/res/drawable-xhdpi/almalence_gui_hint_background.png diff --git a/res/drawable-xhdpi/apptheme_scrubber_control_disabled_holo.png b/app/src/main/res/drawable-xhdpi/apptheme_scrubber_control_disabled_holo.png similarity index 100% rename from res/drawable-xhdpi/apptheme_scrubber_control_disabled_holo.png rename to app/src/main/res/drawable-xhdpi/apptheme_scrubber_control_disabled_holo.png diff --git a/res/drawable-xhdpi/apptheme_scrubber_control_focused_holo.png b/app/src/main/res/drawable-xhdpi/apptheme_scrubber_control_focused_holo.png similarity index 100% rename from res/drawable-xhdpi/apptheme_scrubber_control_focused_holo.png rename to app/src/main/res/drawable-xhdpi/apptheme_scrubber_control_focused_holo.png diff --git a/res/drawable-xhdpi/apptheme_scrubber_control_normal_holo.png b/app/src/main/res/drawable-xhdpi/apptheme_scrubber_control_normal_holo.png similarity index 100% rename from res/drawable-xhdpi/apptheme_scrubber_control_normal_holo.png rename to app/src/main/res/drawable-xhdpi/apptheme_scrubber_control_normal_holo.png diff --git a/res/drawable-xhdpi/apptheme_scrubber_control_pressed_holo.png b/app/src/main/res/drawable-xhdpi/apptheme_scrubber_control_pressed_holo.png similarity index 100% rename from res/drawable-xhdpi/apptheme_scrubber_control_pressed_holo.png rename to app/src/main/res/drawable-xhdpi/apptheme_scrubber_control_pressed_holo.png diff --git a/res/drawable-xhdpi/apptheme_scrubber_primary_holo.9.png b/app/src/main/res/drawable-xhdpi/apptheme_scrubber_primary_holo.9.png similarity index 100% rename from res/drawable-xhdpi/apptheme_scrubber_primary_holo.9.png rename to app/src/main/res/drawable-xhdpi/apptheme_scrubber_primary_holo.9.png diff --git a/res/drawable-xhdpi/apptheme_scrubber_secondary_holo.9.png b/app/src/main/res/drawable-xhdpi/apptheme_scrubber_secondary_holo.9.png similarity index 100% rename from res/drawable-xhdpi/apptheme_scrubber_secondary_holo.9.png rename to app/src/main/res/drawable-xhdpi/apptheme_scrubber_secondary_holo.9.png diff --git a/res/drawable-xhdpi/apptheme_scrubber_track_holo_light.9.png b/app/src/main/res/drawable-xhdpi/apptheme_scrubber_track_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/apptheme_scrubber_track_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/apptheme_scrubber_track_holo_light.9.png diff --git a/res/drawable-xhdpi/gui_almalence_aelock_off.png b/app/src/main/res/drawable-xhdpi/gui_almalence_aelock_off.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_aelock_off.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_aelock_off.png diff --git a/res/drawable-xhdpi/gui_almalence_aelock_on.png b/app/src/main/res/drawable-xhdpi/gui_almalence_aelock_on.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_aelock_on.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_aelock_on.png diff --git a/res/drawable-xhdpi/gui_almalence_awlock_off.png b/app/src/main/res/drawable-xhdpi/gui_almalence_awlock_off.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_awlock_off.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_awlock_off.png diff --git a/res/drawable-xhdpi/gui_almalence_awlock_on.png b/app/src/main/res/drawable-xhdpi/gui_almalence_awlock_on.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_awlock_on.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_awlock_on.png diff --git a/res/drawable-xhdpi/gui_almalence_gallery.png b/app/src/main/res/drawable-xhdpi/gui_almalence_gallery.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_gallery.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_gallery.png diff --git a/res/drawable-xhdpi/gui_almalence_histogram_luma.png b/app/src/main/res/drawable-xhdpi/gui_almalence_histogram_luma.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_histogram_luma.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_histogram_luma.png diff --git a/res/drawable-xhdpi/gui_almalence_histogram_off.png b/app/src/main/res/drawable-xhdpi/gui_almalence_histogram_off.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_histogram_off.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_histogram_off.png diff --git a/res/drawable-xhdpi/gui_almalence_histogram_rgb.png b/app/src/main/res/drawable-xhdpi/gui_almalence_histogram_rgb.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_histogram_rgb.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_histogram_rgb.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_burst10.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_burst10.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_burst10.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_burst10.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_burst15.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_burst15.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_burst15.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_burst15.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_burst20.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_burst20.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_burst20.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_burst20.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_burst3.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_burst3.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_burst3.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_burst3.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_burst5.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_burst5.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_burst5.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_burst5.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer10.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer10.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer10.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer10.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer10_control.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer10_control.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer10_control.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer10_control.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer10_controlcative.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer10_controlcative.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer10_controlcative.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer10_controlcative.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer15.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer15.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer15.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer15.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer15_control.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer15_control.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer15_control.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer15_control.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer15_controlcative.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer15_controlcative.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer15_controlcative.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer15_controlcative.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer3.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer3.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer3.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer3.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer30.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer30.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer30.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer30.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer30_control.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer30_control.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer30_control.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer30_control.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer30_controlcative.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer30_controlcative.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer30_controlcative.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer30_controlcative.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer3_control.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer3_control.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer3_control.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer3_control.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer3_controlcative.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer3_controlcative.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer3_controlcative.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer3_controlcative.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer5.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer5.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer5.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer5.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer5_control.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer5_control.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer5_control.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer5_control.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer5_controlcative.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer5_controlcative.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer5_controlcative.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer5_controlcative.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer60.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer60.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer60.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer60.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer60_control.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer60_control.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer60_control.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer60_control.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer60_controlcative.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer60_controlcative.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer60_controlcative.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer60_controlcative.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer_control.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer_control.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer_control.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer_control.png diff --git a/res/drawable-xhdpi/gui_almalence_mode_selftimer_controlcative.png b/app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer_controlcative.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_mode_selftimer_controlcative.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_mode_selftimer_controlcative.png diff --git a/res/drawable-xhdpi/gui_almalence_select_mode.png b/app/src/main/res/drawable-xhdpi/gui_almalence_select_mode.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_select_mode.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_select_mode.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_changecamera_back.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_changecamera_back.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_changecamera_back.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_changecamera_back.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_changecamera_front.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_changecamera_front.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_changecamera_front.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_changecamera_front.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_changecamera_sony.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_changecamera_sony.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_changecamera_sony.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_changecamera_sony.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_exposure.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_exposure.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_exposure.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_exposure.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_exposure_background.9.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_exposure_background.9.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_exposure_background.9.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_exposure_background.9.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_flash_auto.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_flash_auto.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_flash_auto.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_flash_auto.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_flash_off.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_flash_off.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_flash_off.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_flash_off.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_flash_on.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_flash_on.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_flash_on.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_flash_on.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_flash_redeye.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_flash_redeye.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_flash_redeye.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_flash_redeye.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_flash_torch.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_flash_torch.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_flash_torch.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_flash_torch.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_focus_aflock.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_aflock.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_focus_aflock.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_aflock.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_focus_auto.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_auto.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_focus_auto.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_auto.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_focus_continiuouspicture.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_continiuouspicture.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_focus_continiuouspicture.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_continiuouspicture.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_focus_continiuousvideo.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_continiuousvideo.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_focus_continiuousvideo.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_continiuousvideo.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_focus_edof.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_edof.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_focus_edof.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_edof.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_focus_fixed.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_fixed.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_focus_fixed.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_fixed.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_focus_infinity.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_infinity.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_focus_infinity.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_infinity.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_focus_macro.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_macro.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_focus_macro.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_macro.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_focus_manual.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_manual.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_focus_manual.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_manual.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_focus_normal.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_normal.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_focus_normal.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_focus_normal.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_iso_100.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_100.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_iso_100.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_100.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_iso_10000.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_10000.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_iso_10000.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_10000.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_iso_1600.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_1600.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_iso_1600.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_1600.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_iso_200.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_200.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_iso_200.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_200.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_iso_3200.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_3200.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_iso_3200.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_3200.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_iso_400.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_400.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_iso_400.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_400.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_iso_50.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_50.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_iso_50.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_50.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_iso_6400.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_6400.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_iso_6400.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_6400.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_iso_800.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_800.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_iso_800.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_800.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_iso_auto.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_auto.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_iso_auto.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_iso_auto.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_metering_auto.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_metering_auto.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_metering_auto.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_metering_auto.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_metering_center.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_metering_center.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_metering_center.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_metering_center.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_metering_matrix.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_metering_matrix.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_metering_matrix.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_metering_matrix.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_metering_spot.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_metering_spot.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_metering_spot.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_metering_spot.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_more_settings.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_more_settings.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_more_settings.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_more_settings.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_action.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_action.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_action.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_action.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_ar.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_ar.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_ar.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_ar.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_auto.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_auto.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_auto.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_auto.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_barcode.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_barcode.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_barcode.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_barcode.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_beach.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_beach.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_beach.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_beach.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_candlelight.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_candlelight.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_candlelight.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_candlelight.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_fireworks.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_fireworks.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_fireworks.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_fireworks.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_hdr.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_hdr.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_hdr.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_hdr.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_landscape.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_landscape.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_landscape.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_landscape.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_night.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_night.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_night.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_night.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_nightportrait.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_nightportrait.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_nightportrait.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_nightportrait.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_party.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_party.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_party.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_party.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_portrait.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_portrait.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_portrait.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_portrait.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_snow.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_snow.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_snow.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_snow.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_sports.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_sports.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_sports.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_sports.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_steadyphoto.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_steadyphoto.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_steadyphoto.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_steadyphoto.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_sunset.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_sunset.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_sunset.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_sunset.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_scene_theater.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_theater.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_scene_theater.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_scene_theater.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_shutter_speed_priority.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_shutter_speed_priority.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_shutter_speed_priority.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_shutter_speed_priority.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_wb_auto.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_auto.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_wb_auto.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_auto.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_wb_cloudydaylight.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_cloudydaylight.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_wb_cloudydaylight.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_cloudydaylight.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_wb_daylight.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_daylight.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_wb_daylight.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_daylight.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_wb_fluorescent.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_fluorescent.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_wb_fluorescent.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_fluorescent.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_wb_incandescent.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_incandescent.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_wb_incandescent.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_incandescent.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_wb_mwb.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_mwb.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_wb_mwb.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_mwb.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_wb_shade.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_shade.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_wb_shade.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_shade.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_wb_twilight.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_twilight.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_wb_twilight.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_twilight.png diff --git a/res/drawable-xhdpi/gui_almalence_settings_wb_warmfluorescent.png b/app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_warmfluorescent.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_settings_wb_warmfluorescent.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_settings_wb_warmfluorescent.png diff --git a/res/drawable-xhdpi/gui_almalence_shutter.png b/app/src/main/res/drawable-xhdpi/gui_almalence_shutter.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_shutter.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_shutter.png diff --git a/res/drawable-xhdpi/gui_almalence_shutter_pressed.png b/app/src/main/res/drawable-xhdpi/gui_almalence_shutter_pressed.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_shutter_pressed.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_shutter_pressed.png diff --git a/res/drawable-xhdpi/gui_almalence_shutter_selected.png b/app/src/main/res/drawable-xhdpi/gui_almalence_shutter_selected.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_shutter_selected.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_shutter_selected.png diff --git a/res/drawable-xhdpi/gui_almalence_shutter_timelapse.png b/app/src/main/res/drawable-xhdpi/gui_almalence_shutter_timelapse.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_shutter_timelapse.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_shutter_timelapse.png diff --git a/res/drawable-xhdpi/gui_almalence_shutter_video_off.png b/app/src/main/res/drawable-xhdpi/gui_almalence_shutter_video_off.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_shutter_video_off.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_shutter_video_off.png diff --git a/res/drawable-xhdpi/gui_almalence_shutter_video_stop.png b/app/src/main/res/drawable-xhdpi/gui_almalence_shutter_video_stop.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_shutter_video_stop.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_shutter_video_stop.png diff --git a/res/drawable-xhdpi/gui_almalence_shutter_video_stop_red.png b/app/src/main/res/drawable-xhdpi/gui_almalence_shutter_video_stop_red.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_shutter_video_stop_red.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_shutter_video_stop_red.png diff --git a/res/drawable-xhdpi/gui_almalence_video_1080.png b/app/src/main/res/drawable-xhdpi/gui_almalence_video_1080.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_video_1080.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_video_1080.png diff --git a/res/drawable-xhdpi/gui_almalence_video_2160.png b/app/src/main/res/drawable-xhdpi/gui_almalence_video_2160.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_video_2160.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_video_2160.png diff --git a/res/drawable-xhdpi/gui_almalence_video_4096.png b/app/src/main/res/drawable-xhdpi/gui_almalence_video_4096.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_video_4096.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_video_4096.png diff --git a/res/drawable-xhdpi/gui_almalence_video_480.png b/app/src/main/res/drawable-xhdpi/gui_almalence_video_480.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_video_480.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_video_480.png diff --git a/res/drawable-xhdpi/gui_almalence_video_720.png b/app/src/main/res/drawable-xhdpi/gui_almalence_video_720.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_video_720.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_video_720.png diff --git a/res/drawable-xhdpi/gui_almalence_video_cif.png b/app/src/main/res/drawable-xhdpi/gui_almalence_video_cif.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_video_cif.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_video_cif.png diff --git a/res/drawable-xhdpi/gui_almalence_video_qcif.png b/app/src/main/res/drawable-xhdpi/gui_almalence_video_qcif.png similarity index 100% rename from res/drawable-xhdpi/gui_almalence_video_qcif.png rename to app/src/main/res/drawable-xhdpi/gui_almalence_video_qcif.png diff --git a/res/drawable-xhdpi/ic_menu_save.png b/app/src/main/res/drawable-xhdpi/ic_menu_save.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_save.png rename to app/src/main/res/drawable-xhdpi/ic_menu_save.png diff --git a/res/drawable-xhdpi/ic_menu_save_glow.png b/app/src/main/res/drawable-xhdpi/ic_menu_save_glow.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_save_glow.png rename to app/src/main/res/drawable-xhdpi/ic_menu_save_glow.png diff --git a/res/drawable-xhdpi/icon.png b/app/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from res/drawable-xhdpi/icon.png rename to app/src/main/res/drawable-xhdpi/icon.png diff --git a/res/drawable-xhdpi/invis_qc.png b/app/src/main/res/drawable-xhdpi/invis_qc.png similarity index 100% rename from res/drawable-xhdpi/invis_qc.png rename to app/src/main/res/drawable-xhdpi/invis_qc.png diff --git a/res/drawable-xhdpi/plugin_capture_night_nightvision_off.png b/app/src/main/res/drawable-xhdpi/plugin_capture_night_nightvision_off.png similarity index 100% rename from res/drawable-xhdpi/plugin_capture_night_nightvision_off.png rename to app/src/main/res/drawable-xhdpi/plugin_capture_night_nightvision_off.png diff --git a/res/drawable-xhdpi/plugin_capture_night_nightvision_on.png b/app/src/main/res/drawable-xhdpi/plugin_capture_night_nightvision_on.png similarity index 100% rename from res/drawable-xhdpi/plugin_capture_night_nightvision_on.png rename to app/src/main/res/drawable-xhdpi/plugin_capture_night_nightvision_on.png diff --git a/res/drawable-xhdpi/plugin_capture_video_capture_image.png b/app/src/main/res/drawable-xhdpi/plugin_capture_video_capture_image.png similarity index 100% rename from res/drawable-xhdpi/plugin_capture_video_capture_image.png rename to app/src/main/res/drawable-xhdpi/plugin_capture_video_capture_image.png diff --git a/res/drawable-xhdpi/plugin_capture_video_capture_image_pressed.png b/app/src/main/res/drawable-xhdpi/plugin_capture_video_capture_image_pressed.png similarity index 100% rename from res/drawable-xhdpi/plugin_capture_video_capture_image_pressed.png rename to app/src/main/res/drawable-xhdpi/plugin_capture_video_capture_image_pressed.png diff --git a/res/drawable-xhdpi/plugin_capture_video_resume.png b/app/src/main/res/drawable-xhdpi/plugin_capture_video_resume.png similarity index 100% rename from res/drawable-xhdpi/plugin_capture_video_resume.png rename to app/src/main/res/drawable-xhdpi/plugin_capture_video_resume.png diff --git a/res/drawable-xhdpi/plugin_capture_video_timelapse_active.png b/app/src/main/res/drawable-xhdpi/plugin_capture_video_timelapse_active.png similarity index 100% rename from res/drawable-xhdpi/plugin_capture_video_timelapse_active.png rename to app/src/main/res/drawable-xhdpi/plugin_capture_video_timelapse_active.png diff --git a/res/drawable-xhdpi/plugin_capture_video_timelapse_inactive.png b/app/src/main/res/drawable-xhdpi/plugin_capture_video_timelapse_inactive.png similarity index 100% rename from res/drawable-xhdpi/plugin_capture_video_timelapse_inactive.png rename to app/src/main/res/drawable-xhdpi/plugin_capture_video_timelapse_inactive.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_golden16x9.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden16x9.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_golden16x9.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden16x9.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_golden3x2.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden3x2.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_golden3x2.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden3x2.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_golden4x3.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden4x3.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_golden4x3.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden4x3.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_golden_icon_bottom_left.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden_icon_bottom_left.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_golden_icon_bottom_left.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden_icon_bottom_left.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_golden_icon_bottom_right.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden_icon_bottom_right.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_golden_icon_bottom_right.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden_icon_bottom_right.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_golden_icon_top_left.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden_icon_top_left.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_golden_icon_top_left.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden_icon_top_left.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_golden_icon_top_right.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden_icon_top_right.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_golden_icon_top_right.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_golden_icon_top_right.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_thirds16x9.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_thirds16x9.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_thirds16x9.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_thirds16x9.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_thirds3x2.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_thirds3x2.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_thirds3x2.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_thirds3x2.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_thirds4x3.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_thirds4x3.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_thirds4x3.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_thirds4x3.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_thirds_icon.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_thirds_icon.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_thirds_icon.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_thirds_icon.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_trisec16x9.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_trisec16x9.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_trisec16x9.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_trisec16x9.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_trisec3x2.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_trisec3x2.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_trisec3x2.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_trisec3x2.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_trisec4x3.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_trisec4x3.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_trisec4x3.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_trisec4x3.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png diff --git a/res/drawable-xhdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png b/app/src/main/res/drawable-xhdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png similarity index 100% rename from res/drawable-xhdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png rename to app/src/main/res/drawable-xhdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png diff --git a/res/drawable-xhdpi/switch_bg_disabled_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/switch_bg_disabled_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/switch_bg_disabled_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/switch_bg_disabled_holo_dark.9.png diff --git a/res/drawable-xhdpi/switch_bg_disabled_holo_light.9.png b/app/src/main/res/drawable-xhdpi/switch_bg_disabled_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/switch_bg_disabled_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/switch_bg_disabled_holo_light.9.png diff --git a/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png diff --git a/res/drawable-xhdpi/switch_bg_focused_holo_light.9.png b/app/src/main/res/drawable-xhdpi/switch_bg_focused_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/switch_bg_focused_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/switch_bg_focused_holo_light.9.png diff --git a/res/drawable-xhdpi/switch_bg_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/switch_bg_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/switch_bg_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/switch_bg_holo_dark.9.png diff --git a/res/drawable-xhdpi/switch_bg_holo_light.9.png b/app/src/main/res/drawable-xhdpi/switch_bg_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/switch_bg_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/switch_bg_holo_light.9.png diff --git a/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png diff --git a/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png b/app/src/main/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png diff --git a/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png diff --git a/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png b/app/src/main/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/switch_thumb_disabled_holo_light.9.png diff --git a/res/drawable-xhdpi/switch_thumb_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/switch_thumb_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/switch_thumb_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/switch_thumb_holo_dark.9.png diff --git a/res/drawable-xhdpi/switch_thumb_holo_light.9.png b/app/src/main/res/drawable-xhdpi/switch_thumb_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/switch_thumb_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/switch_thumb_holo_light.9.png diff --git a/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png diff --git a/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png b/app/src/main/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/switch_thumb_pressed_holo_light.9.png diff --git a/res/drawable-xhdpi/widget_full_solid_preview.png b/app/src/main/res/drawable-xhdpi/widget_full_solid_preview.png similarity index 100% rename from res/drawable-xhdpi/widget_full_solid_preview.png rename to app/src/main/res/drawable-xhdpi/widget_full_solid_preview.png diff --git a/res/drawable-xhdpi/widget_preview.png b/app/src/main/res/drawable-xhdpi/widget_preview.png similarity index 100% rename from res/drawable-xhdpi/widget_preview.png rename to app/src/main/res/drawable-xhdpi/widget_preview.png diff --git a/res/drawable-xhdpi/widget_solid_preview.png b/app/src/main/res/drawable-xhdpi/widget_solid_preview.png similarity index 100% rename from res/drawable-xhdpi/widget_solid_preview.png rename to app/src/main/res/drawable-xhdpi/widget_solid_preview.png diff --git a/res/drawable-xlarge-hdpi/almalence_gui_hint_background.png b/app/src/main/res/drawable-xlarge-hdpi/almalence_gui_hint_background.png similarity index 100% rename from res/drawable-xlarge-hdpi/almalence_gui_hint_background.png rename to app/src/main/res/drawable-xlarge-hdpi/almalence_gui_hint_background.png diff --git a/res/drawable-xlarge-hdpi/button_evminus.png b/app/src/main/res/drawable-xlarge-hdpi/button_evminus.png similarity index 100% rename from res/drawable-xlarge-hdpi/button_evminus.png rename to app/src/main/res/drawable-xlarge-hdpi/button_evminus.png diff --git a/res/drawable-xlarge-hdpi/button_evplus.png b/app/src/main/res/drawable-xlarge-hdpi/button_evplus.png similarity index 100% rename from res/drawable-xlarge-hdpi/button_evplus.png rename to app/src/main/res/drawable-xlarge-hdpi/button_evplus.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_aelock_off.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_aelock_off.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_aelock_off.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_aelock_off.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_aelock_on.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_aelock_on.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_aelock_on.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_aelock_on.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_awlock_off.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_awlock_off.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_awlock_off.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_awlock_off.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_awlock_on.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_awlock_on.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_awlock_on.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_awlock_on.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_gallery.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_gallery.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_gallery.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_gallery.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_histogram_luma.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_histogram_luma.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_histogram_luma.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_histogram_luma.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_histogram_off.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_histogram_off.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_histogram_off.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_histogram_off.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_histogram_rgb.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_histogram_rgb.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_histogram_rgb.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_histogram_rgb.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_backintime.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_backintime.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_backintime.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_backintime.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_bestshot.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_bestshot.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_bestshot.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_bestshot.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_burst.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_burst.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_burst.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_burst.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_burst10.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_burst10.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_burst10.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_burst10.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_burst15.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_burst15.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_burst15.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_burst15.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_burst20.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_burst20.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_burst20.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_burst20.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_burst3.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_burst3.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_burst3.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_burst3.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_burst5.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_burst5.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_burst5.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_burst5.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_expobracketing.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_expobracketing.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_expobracketing.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_expobracketing.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_groupshot.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_groupshot.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_groupshot.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_groupshot.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_hdr.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_hdr.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_hdr.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_hdr.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_moving.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_moving.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_moving.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_moving.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_night.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_night.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_night.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_night.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_panorama.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_panorama.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_panorama.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_panorama.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer10.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer10.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer10.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer10.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer10_control.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer10_control.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer10_control.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer10_control.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer10_controlcative.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer10_controlcative.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer10_controlcative.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer10_controlcative.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer15.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer15.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer15.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer15.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer15_control.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer15_control.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer15_control.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer15_control.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer15_controlcative.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer15_controlcative.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer15_controlcative.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer15_controlcative.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer3.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer3.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer3.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer3.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer30.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer30.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer30.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer30.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer30_control.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer30_control.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer30_control.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer30_control.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer30_controlcative.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer30_controlcative.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer30_controlcative.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer30_controlcative.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer3_control.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer3_control.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer3_control.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer3_control.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer3_controlcative.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer3_controlcative.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer3_controlcative.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer3_controlcative.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer5.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer5.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer5.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer5.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer5_control.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer5_control.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer5_control.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer5_control.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer5_controlcative.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer5_controlcative.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer5_controlcative.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer5_controlcative.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer60.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer60.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer60.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer60.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer60_control.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer60_control.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer60_control.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer60_control.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer60_controlcative.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer60_controlcative.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer60_controlcative.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer60_controlcative.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer_control.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer_control.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer_control.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer_control.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer_controlcative.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer_controlcative.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer_controlcative.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_selftimer_controlcative.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_sequence.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_sequence.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_sequence.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_sequence.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_single.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_single.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_single.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_single.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_mode_video.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_video.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_mode_video.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_mode_video.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_select_mode.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_select_mode.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_select_mode.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_select_mode.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_changecamera_back.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_changecamera_back.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_changecamera_back.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_changecamera_back.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_changecamera_front.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_changecamera_front.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_changecamera_front.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_changecamera_front.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_changecamera_sony.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_changecamera_sony.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_changecamera_sony.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_changecamera_sony.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_exposure.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_exposure.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_exposure.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_exposure.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_exposure_background.9.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_exposure_background.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_exposure_background.9.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_exposure_background.9.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_auto.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_auto.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_flash_auto.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_auto.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_off.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_off.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_flash_off.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_off.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_on.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_on.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_flash_on.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_on.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_redeye.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_redeye.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_flash_redeye.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_redeye.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_torch.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_torch.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_flash_torch.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_flash_torch.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_aflock.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_aflock.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_focus_aflock.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_aflock.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_auto.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_auto.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_focus_auto.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_auto.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_continiuouspicture.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_continiuouspicture.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_focus_continiuouspicture.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_continiuouspicture.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_continiuousvideo.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_continiuousvideo.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_focus_continiuousvideo.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_continiuousvideo.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_edof.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_edof.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_focus_edof.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_edof.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_fixed.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_fixed.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_focus_fixed.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_fixed.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_infinity.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_infinity.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_focus_infinity.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_infinity.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_macro.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_macro.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_focus_macro.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_macro.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_manual.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_manual.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_focus_manual.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_manual.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_normal.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_normal.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_focus_normal.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_focus_normal.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_100.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_100.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_iso_100.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_100.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_10000.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_10000.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_iso_10000.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_10000.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_1600.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_1600.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_iso_1600.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_1600.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_200.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_200.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_iso_200.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_200.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_3200.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_3200.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_iso_3200.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_3200.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_400.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_400.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_iso_400.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_400.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_50.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_50.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_iso_50.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_50.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_6400.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_6400.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_iso_6400.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_6400.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_800.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_800.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_iso_800.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_800.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_auto.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_auto.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_iso_auto.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_iso_auto.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_metering_auto.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_metering_auto.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_metering_auto.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_metering_auto.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_metering_center.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_metering_center.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_metering_center.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_metering_center.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_metering_matrix.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_metering_matrix.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_metering_matrix.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_metering_matrix.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_metering_spot.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_metering_spot.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_metering_spot.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_metering_spot.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_more_settings.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_more_settings.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_more_settings.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_more_settings.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_off_barcode_scanner.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_off_barcode_scanner.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_off_barcode_scanner.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_off_barcode_scanner.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_action.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_action.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_action.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_action.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_ar.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_ar.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_ar.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_ar.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_auto.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_auto.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_auto.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_auto.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_barcode.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_barcode.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_barcode.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_barcode.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_barcode_on.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_barcode_on.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_barcode_on.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_barcode_on.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_beach.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_beach.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_beach.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_beach.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_candlelight.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_candlelight.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_candlelight.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_candlelight.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_fireworks.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_fireworks.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_fireworks.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_fireworks.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_hdr.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_hdr.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_hdr.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_hdr.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_landscape.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_landscape.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_landscape.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_landscape.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_night.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_night.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_night.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_night.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_nightportrait.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_nightportrait.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_nightportrait.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_nightportrait.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_party.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_party.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_party.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_party.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_portrait.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_portrait.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_portrait.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_portrait.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_snow.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_snow.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_snow.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_snow.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_sports.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_sports.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_sports.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_sports.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_steadyphoto.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_steadyphoto.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_steadyphoto.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_steadyphoto.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_sunset.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_sunset.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_sunset.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_sunset.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_theater.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_theater.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_scene_theater.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_scene_theater.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_shutter_speed_priority.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_shutter_speed_priority.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_shutter_speed_priority.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_shutter_speed_priority.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_auto.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_auto.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_wb_auto.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_auto.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_cloudydaylight.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_cloudydaylight.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_wb_cloudydaylight.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_cloudydaylight.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_daylight.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_daylight.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_wb_daylight.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_daylight.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_fluorescent.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_fluorescent.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_wb_fluorescent.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_fluorescent.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_incandescent.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_incandescent.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_wb_incandescent.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_incandescent.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_mwb.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_mwb.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_wb_mwb.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_mwb.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_shade.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_shade.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_wb_shade.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_shade.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_twilight.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_twilight.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_wb_twilight.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_twilight.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_warmfluorescent.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_warmfluorescent.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_settings_wb_warmfluorescent.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_settings_wb_warmfluorescent.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_shutter.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_shutter.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_shutter.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_shutter.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_shutter_pressed.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_shutter_pressed.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_shutter_pressed.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_shutter_pressed.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_shutter_selected.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_shutter_selected.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_shutter_selected.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_shutter_selected.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_shutter_video_off.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_shutter_video_off.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_shutter_video_off.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_shutter_video_off.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_video_1080.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_1080.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_video_1080.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_1080.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_video_2160.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_2160.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_video_2160.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_2160.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_video_4096.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_4096.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_video_4096.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_4096.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_video_480.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_480.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_video_480.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_480.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_video_720.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_720.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_video_720.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_720.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_video_cif.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_cif.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_video_cif.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_cif.png diff --git a/res/drawable-xlarge-hdpi/gui_almalence_video_qcif.png b/app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_qcif.png similarity index 100% rename from res/drawable-xlarge-hdpi/gui_almalence_video_qcif.png rename to app/src/main/res/drawable-xlarge-hdpi/gui_almalence_video_qcif.png diff --git a/res/drawable-xlarge-hdpi/ic_menu_save.png b/app/src/main/res/drawable-xlarge-hdpi/ic_menu_save.png similarity index 100% rename from res/drawable-xlarge-hdpi/ic_menu_save.png rename to app/src/main/res/drawable-xlarge-hdpi/ic_menu_save.png diff --git a/res/drawable-xlarge-hdpi/ic_menu_save_glow.png b/app/src/main/res/drawable-xlarge-hdpi/ic_menu_save_glow.png similarity index 100% rename from res/drawable-xlarge-hdpi/ic_menu_save_glow.png rename to app/src/main/res/drawable-xlarge-hdpi/ic_menu_save_glow.png diff --git a/res/drawable-xlarge-hdpi/icon.png b/app/src/main/res/drawable-xlarge-hdpi/icon.png similarity index 100% rename from res/drawable-xlarge-hdpi/icon.png rename to app/src/main/res/drawable-xlarge-hdpi/icon.png diff --git a/res/drawable-xlarge-hdpi/invis_qc.png b/app/src/main/res/drawable-xlarge-hdpi/invis_qc.png similarity index 100% rename from res/drawable-xlarge-hdpi/invis_qc.png rename to app/src/main/res/drawable-xlarge-hdpi/invis_qc.png diff --git a/res/drawable-xlarge-hdpi/plugin_capture_video_capture_image.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_capture_video_capture_image.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_capture_video_capture_image.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_capture_video_capture_image.png diff --git a/res/drawable-xlarge-hdpi/plugin_capture_video_capture_image_pressed.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_capture_video_capture_image_pressed.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_capture_video_capture_image_pressed.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_capture_video_capture_image_pressed.png diff --git a/res/drawable-xlarge-hdpi/plugin_capture_video_timelapse_active.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_capture_video_timelapse_active.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_capture_video_timelapse_active.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_capture_video_timelapse_active.png diff --git a/res/drawable-xlarge-hdpi/plugin_capture_video_timelapse_inactive.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_capture_video_timelapse_inactive.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_capture_video_timelapse_inactive.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_capture_video_timelapse_inactive.png diff --git a/res/drawable-xlarge-hdpi/plugin_processing_preshot_savethis.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_processing_preshot_savethis.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_processing_preshot_savethis.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_processing_preshot_savethis.png diff --git a/res/drawable-xlarge-hdpi/plugin_processing_preshot_savethis_glow.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_processing_preshot_savethis_glow.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_processing_preshot_savethis_glow.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_processing_preshot_savethis_glow.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_golden16x9.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden16x9.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_golden16x9.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden16x9.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_golden3x2.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden3x2.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_golden3x2.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden3x2.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_golden4x3.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden4x3.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_golden4x3.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden4x3.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_bottom_left.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_bottom_left.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_bottom_left.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_bottom_left.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_bottom_right.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_bottom_right.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_bottom_right.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_bottom_right.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_top_left.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_top_left.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_top_left.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_top_left.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_top_right.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_top_right.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_top_right.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_golden_icon_top_right.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_thirds16x9.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_thirds16x9.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_thirds16x9.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_thirds16x9.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_thirds3x2.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_thirds3x2.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_thirds3x2.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_thirds3x2.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_thirds4x3.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_thirds4x3.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_thirds4x3.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_thirds4x3.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_thirds_icon.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_thirds_icon.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_thirds_icon.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_thirds_icon.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec16x9.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec16x9.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_trisec16x9.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec16x9.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec3x2.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec3x2.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_trisec3x2.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec3x2.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec4x3.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec4x3.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_trisec4x3.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec4x3.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec_icon_topleft_bottomright.png diff --git a/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png b/app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png similarity index 100% rename from res/drawable-xlarge-hdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png rename to app/src/main/res/drawable-xlarge-hdpi/plugin_vf_grid_trisec_icon_topright_bottomleft.png diff --git a/res/drawable-xlarge-hdpi/switch_bg_disabled_holo_dark.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_bg_disabled_holo_dark.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_bg_disabled_holo_dark.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_bg_disabled_holo_dark.9.png diff --git a/res/drawable-xlarge-hdpi/switch_bg_disabled_holo_light.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_bg_disabled_holo_light.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_bg_disabled_holo_light.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_bg_disabled_holo_light.9.png diff --git a/res/drawable-xlarge-hdpi/switch_bg_focused_holo_dark.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_bg_focused_holo_dark.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_bg_focused_holo_dark.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_bg_focused_holo_dark.9.png diff --git a/res/drawable-xlarge-hdpi/switch_bg_focused_holo_light.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_bg_focused_holo_light.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_bg_focused_holo_light.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_bg_focused_holo_light.9.png diff --git a/res/drawable-xlarge-hdpi/switch_bg_holo_dark.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_bg_holo_dark.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_bg_holo_dark.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_bg_holo_dark.9.png diff --git a/res/drawable-xlarge-hdpi/switch_bg_holo_light.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_bg_holo_light.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_bg_holo_light.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_bg_holo_light.9.png diff --git a/res/drawable-xlarge-hdpi/switch_thumb_activated_holo_dark.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_thumb_activated_holo_dark.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_thumb_activated_holo_dark.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_thumb_activated_holo_dark.9.png diff --git a/res/drawable-xlarge-hdpi/switch_thumb_activated_holo_light.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_thumb_activated_holo_light.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_thumb_activated_holo_light.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_thumb_activated_holo_light.9.png diff --git a/res/drawable-xlarge-hdpi/switch_thumb_disabled_holo_dark.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_thumb_disabled_holo_dark.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_thumb_disabled_holo_dark.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_thumb_disabled_holo_dark.9.png diff --git a/res/drawable-xlarge-hdpi/switch_thumb_disabled_holo_light.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_thumb_disabled_holo_light.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_thumb_disabled_holo_light.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_thumb_disabled_holo_light.9.png diff --git a/res/drawable-xlarge-hdpi/switch_thumb_holo_dark.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_thumb_holo_dark.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_thumb_holo_dark.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_thumb_holo_dark.9.png diff --git a/res/drawable-xlarge-hdpi/switch_thumb_holo_light.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_thumb_holo_light.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_thumb_holo_light.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_thumb_holo_light.9.png diff --git a/res/drawable-xlarge-hdpi/switch_thumb_pressed_holo_dark.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_thumb_pressed_holo_dark.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_thumb_pressed_holo_dark.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_thumb_pressed_holo_dark.9.png diff --git a/res/drawable-xlarge-hdpi/switch_thumb_pressed_holo_light.9.png b/app/src/main/res/drawable-xlarge-hdpi/switch_thumb_pressed_holo_light.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/switch_thumb_pressed_holo_light.9.png rename to app/src/main/res/drawable-xlarge-hdpi/switch_thumb_pressed_holo_light.9.png diff --git a/res/drawable-xlarge-hdpi/widget_full_solid_preview.png b/app/src/main/res/drawable-xlarge-hdpi/widget_full_solid_preview.png similarity index 100% rename from res/drawable-xlarge-hdpi/widget_full_solid_preview.png rename to app/src/main/res/drawable-xlarge-hdpi/widget_full_solid_preview.png diff --git a/res/drawable-xlarge-hdpi/widget_preview.png b/app/src/main/res/drawable-xlarge-hdpi/widget_preview.png similarity index 100% rename from res/drawable-xlarge-hdpi/widget_preview.png rename to app/src/main/res/drawable-xlarge-hdpi/widget_preview.png diff --git a/res/drawable-xlarge-hdpi/widget_solid_preview.png b/app/src/main/res/drawable-xlarge-hdpi/widget_solid_preview.png similarity index 100% rename from res/drawable-xlarge-hdpi/widget_solid_preview.png rename to app/src/main/res/drawable-xlarge-hdpi/widget_solid_preview.png diff --git a/res/drawable-xlarge-hdpi/zoombar_background.9.png b/app/src/main/res/drawable-xlarge-hdpi/zoombar_background.9.png similarity index 100% rename from res/drawable-xlarge-hdpi/zoombar_background.9.png rename to app/src/main/res/drawable-xlarge-hdpi/zoombar_background.9.png diff --git a/res/drawable-xxhdpi/apptheme_scrubber_control_disabled_holo.png b/app/src/main/res/drawable-xxhdpi/apptheme_scrubber_control_disabled_holo.png similarity index 100% rename from res/drawable-xxhdpi/apptheme_scrubber_control_disabled_holo.png rename to app/src/main/res/drawable-xxhdpi/apptheme_scrubber_control_disabled_holo.png diff --git a/res/drawable-xxhdpi/apptheme_scrubber_control_focused_holo.png b/app/src/main/res/drawable-xxhdpi/apptheme_scrubber_control_focused_holo.png similarity index 100% rename from res/drawable-xxhdpi/apptheme_scrubber_control_focused_holo.png rename to app/src/main/res/drawable-xxhdpi/apptheme_scrubber_control_focused_holo.png diff --git a/res/drawable-xxhdpi/apptheme_scrubber_control_normal_holo.png b/app/src/main/res/drawable-xxhdpi/apptheme_scrubber_control_normal_holo.png similarity index 100% rename from res/drawable-xxhdpi/apptheme_scrubber_control_normal_holo.png rename to app/src/main/res/drawable-xxhdpi/apptheme_scrubber_control_normal_holo.png diff --git a/res/drawable-xxhdpi/apptheme_scrubber_control_pressed_holo.png b/app/src/main/res/drawable-xxhdpi/apptheme_scrubber_control_pressed_holo.png similarity index 100% rename from res/drawable-xxhdpi/apptheme_scrubber_control_pressed_holo.png rename to app/src/main/res/drawable-xxhdpi/apptheme_scrubber_control_pressed_holo.png diff --git a/res/drawable-xxhdpi/apptheme_scrubber_primary_holo.9.png b/app/src/main/res/drawable-xxhdpi/apptheme_scrubber_primary_holo.9.png similarity index 100% rename from res/drawable-xxhdpi/apptheme_scrubber_primary_holo.9.png rename to app/src/main/res/drawable-xxhdpi/apptheme_scrubber_primary_holo.9.png diff --git a/res/drawable-xxhdpi/apptheme_scrubber_secondary_holo.9.png b/app/src/main/res/drawable-xxhdpi/apptheme_scrubber_secondary_holo.9.png similarity index 100% rename from res/drawable-xxhdpi/apptheme_scrubber_secondary_holo.9.png rename to app/src/main/res/drawable-xxhdpi/apptheme_scrubber_secondary_holo.9.png diff --git a/res/drawable-xxhdpi/apptheme_scrubber_track_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/apptheme_scrubber_track_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/apptheme_scrubber_track_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/apptheme_scrubber_track_holo_light.9.png diff --git a/res/drawable/.DS_Store b/app/src/main/res/drawable/.DS_Store similarity index 100% rename from res/drawable/.DS_Store rename to app/src/main/res/drawable/.DS_Store diff --git a/res/drawable/adjustments_gridview_selector.xml b/app/src/main/res/drawable/adjustments_gridview_selector.xml similarity index 100% rename from res/drawable/adjustments_gridview_selector.xml rename to app/src/main/res/drawable/adjustments_gridview_selector.xml diff --git a/res/drawable/adjustments_seekbar.xml b/app/src/main/res/drawable/adjustments_seekbar.xml similarity index 100% rename from res/drawable/adjustments_seekbar.xml rename to app/src/main/res/drawable/adjustments_seekbar.xml diff --git a/res/drawable/adjustments_seekbar_thumb.xml b/app/src/main/res/drawable/adjustments_seekbar_thumb.xml similarity index 100% rename from res/drawable/adjustments_seekbar_thumb.xml rename to app/src/main/res/drawable/adjustments_seekbar_thumb.xml diff --git a/res/drawable/adjustments_tab.9.png b/app/src/main/res/drawable/adjustments_tab.9.png similarity index 100% rename from res/drawable/adjustments_tab.9.png rename to app/src/main/res/drawable/adjustments_tab.9.png diff --git a/res/drawable/adjustments_tabhold.9.png b/app/src/main/res/drawable/adjustments_tabhold.9.png similarity index 100% rename from res/drawable/adjustments_tabhold.9.png rename to app/src/main/res/drawable/adjustments_tabhold.9.png diff --git a/res/drawable/almalence_gui_button_background.xml b/app/src/main/res/drawable/almalence_gui_button_background.xml similarity index 100% rename from res/drawable/almalence_gui_button_background.xml rename to app/src/main/res/drawable/almalence_gui_button_background.xml diff --git a/res/drawable/almalence_gui_button_background_default.xml b/app/src/main/res/drawable/almalence_gui_button_background_default.xml similarity index 100% rename from res/drawable/almalence_gui_button_background_default.xml rename to app/src/main/res/drawable/almalence_gui_button_background_default.xml diff --git a/res/drawable/almalence_gui_button_background_pressed.xml b/app/src/main/res/drawable/almalence_gui_button_background_pressed.xml similarity index 100% rename from res/drawable/almalence_gui_button_background_pressed.xml rename to app/src/main/res/drawable/almalence_gui_button_background_pressed.xml diff --git a/res/drawable/almalence_gui_grid_elem_background.xml b/app/src/main/res/drawable/almalence_gui_grid_elem_background.xml similarity index 100% rename from res/drawable/almalence_gui_grid_elem_background.xml rename to app/src/main/res/drawable/almalence_gui_grid_elem_background.xml diff --git a/res/drawable/almalence_gui_grid_elem_background_default.xml b/app/src/main/res/drawable/almalence_gui_grid_elem_background_default.xml similarity index 100% rename from res/drawable/almalence_gui_grid_elem_background_default.xml rename to app/src/main/res/drawable/almalence_gui_grid_elem_background_default.xml diff --git a/res/drawable/almalence_gui_grid_elem_background_pressed.xml b/app/src/main/res/drawable/almalence_gui_grid_elem_background_pressed.xml similarity index 100% rename from res/drawable/almalence_gui_grid_elem_background_pressed.xml rename to app/src/main/res/drawable/almalence_gui_grid_elem_background_pressed.xml diff --git a/res/drawable/almalence_gui_processing_scanner.png b/app/src/main/res/drawable/almalence_gui_processing_scanner.png similarity index 100% rename from res/drawable/almalence_gui_processing_scanner.png rename to app/src/main/res/drawable/almalence_gui_processing_scanner.png diff --git a/res/drawable/almalence_gui_toast_background.xml b/app/src/main/res/drawable/almalence_gui_toast_background.xml similarity index 100% rename from res/drawable/almalence_gui_toast_background.xml rename to app/src/main/res/drawable/almalence_gui_toast_background.xml diff --git a/res/drawable/almalence_upgrade_market.png b/app/src/main/res/drawable/almalence_upgrade_market.png similarity index 100% rename from res/drawable/almalence_upgrade_market.png rename to app/src/main/res/drawable/almalence_upgrade_market.png diff --git a/res/drawable/almalence_upgrade_tips.png b/app/src/main/res/drawable/almalence_upgrade_tips.png similarity index 100% rename from res/drawable/almalence_upgrade_tips.png rename to app/src/main/res/drawable/almalence_upgrade_tips.png diff --git a/res/drawable/almalence_upgrade_whatsnew.png b/app/src/main/res/drawable/almalence_upgrade_whatsnew.png similarity index 100% rename from res/drawable/almalence_upgrade_whatsnew.png rename to app/src/main/res/drawable/almalence_upgrade_whatsnew.png diff --git a/res/drawable/almalence_upgrade_whatsnew_previous.png b/app/src/main/res/drawable/almalence_upgrade_whatsnew_previous.png similarity index 100% rename from res/drawable/almalence_upgrade_whatsnew_previous.png rename to app/src/main/res/drawable/almalence_upgrade_whatsnew_previous.png diff --git a/res/drawable/apptheme_scrubber_control_selector_holo_light.xml b/app/src/main/res/drawable/apptheme_scrubber_control_selector_holo_light.xml similarity index 100% rename from res/drawable/apptheme_scrubber_control_selector_holo_light.xml rename to app/src/main/res/drawable/apptheme_scrubber_control_selector_holo_light.xml diff --git a/res/drawable/apptheme_scrubber_progress_horizontal_holo_light.xml b/app/src/main/res/drawable/apptheme_scrubber_progress_horizontal_holo_light.xml similarity index 100% rename from res/drawable/apptheme_scrubber_progress_horizontal_holo_light.xml rename to app/src/main/res/drawable/apptheme_scrubber_progress_horizontal_holo_light.xml diff --git a/res/drawable/ayout_border_panel_pressed.xml b/app/src/main/res/drawable/ayout_border_panel_pressed.xml similarity index 100% rename from res/drawable/ayout_border_panel_pressed.xml rename to app/src/main/res/drawable/ayout_border_panel_pressed.xml diff --git a/res/drawable/backintimeprocessing_button_next.xml b/app/src/main/res/drawable/backintimeprocessing_button_next.xml similarity index 100% rename from res/drawable/backintimeprocessing_button_next.xml rename to app/src/main/res/drawable/backintimeprocessing_button_next.xml diff --git a/res/drawable/backintimeprocessing_button_prev.xml b/app/src/main/res/drawable/backintimeprocessing_button_prev.xml similarity index 100% rename from res/drawable/backintimeprocessing_button_prev.xml rename to app/src/main/res/drawable/backintimeprocessing_button_prev.xml diff --git a/res/drawable/battery_10.png b/app/src/main/res/drawable/battery_10.png similarity index 100% rename from res/drawable/battery_10.png rename to app/src/main/res/drawable/battery_10.png diff --git a/res/drawable/battery_25.png b/app/src/main/res/drawable/battery_25.png similarity index 100% rename from res/drawable/battery_25.png rename to app/src/main/res/drawable/battery_25.png diff --git a/res/drawable/battery_50.png b/app/src/main/res/drawable/battery_50.png similarity index 100% rename from res/drawable/battery_50.png rename to app/src/main/res/drawable/battery_50.png diff --git a/res/drawable/battery_75.png b/app/src/main/res/drawable/battery_75.png similarity index 100% rename from res/drawable/battery_75.png rename to app/src/main/res/drawable/battery_75.png diff --git a/res/drawable/battery_charging.png b/app/src/main/res/drawable/battery_charging.png similarity index 100% rename from res/drawable/battery_charging.png rename to app/src/main/res/drawable/battery_charging.png diff --git a/res/drawable/battery_empty.png b/app/src/main/res/drawable/battery_empty.png similarity index 100% rename from res/drawable/battery_empty.png rename to app/src/main/res/drawable/battery_empty.png diff --git a/res/drawable/battery_full.png b/app/src/main/res/drawable/battery_full.png similarity index 100% rename from res/drawable/battery_full.png rename to app/src/main/res/drawable/battery_full.png diff --git a/res/drawable/bg_text_on_preview.xml b/app/src/main/res/drawable/bg_text_on_preview.xml similarity index 100% rename from res/drawable/bg_text_on_preview.xml rename to app/src/main/res/drawable/bg_text_on_preview.xml diff --git a/res/drawable/blacktransparentlayerbottom.png b/app/src/main/res/drawable/blacktransparentlayerbottom.png similarity index 100% rename from res/drawable/blacktransparentlayerbottom.png rename to app/src/main/res/drawable/blacktransparentlayerbottom.png diff --git a/res/drawable/blacktransparentlayerpulldownmenu.png b/app/src/main/res/drawable/blacktransparentlayerpulldownmenu.png similarity index 100% rename from res/drawable/blacktransparentlayerpulldownmenu.png rename to app/src/main/res/drawable/blacktransparentlayerpulldownmenu.png diff --git a/res/drawable/blacktransparentlayersettings.png b/app/src/main/res/drawable/blacktransparentlayersettings.png similarity index 100% rename from res/drawable/blacktransparentlayersettings.png rename to app/src/main/res/drawable/blacktransparentlayersettings.png diff --git a/res/drawable/blacktransparentlayersettings_.png b/app/src/main/res/drawable/blacktransparentlayersettings_.png similarity index 100% rename from res/drawable/blacktransparentlayersettings_.png rename to app/src/main/res/drawable/blacktransparentlayersettings_.png diff --git a/res/drawable/blacktransparentlayertop.png b/app/src/main/res/drawable/blacktransparentlayertop.png similarity index 100% rename from res/drawable/blacktransparentlayertop.png rename to app/src/main/res/drawable/blacktransparentlayertop.png diff --git a/res/drawable/button_evminus.png b/app/src/main/res/drawable/button_evminus.png similarity index 100% rename from res/drawable/button_evminus.png rename to app/src/main/res/drawable/button_evminus.png diff --git a/res/drawable/button_evplus.png b/app/src/main/res/drawable/button_evplus.png similarity index 100% rename from res/drawable/button_evplus.png rename to app/src/main/res/drawable/button_evplus.png diff --git a/res/drawable/button_prev.xml b/app/src/main/res/drawable/button_prev.xml similarity index 100% rename from res/drawable/button_prev.xml rename to app/src/main/res/drawable/button_prev.xml diff --git a/res/drawable/button_save_background.xml b/app/src/main/res/drawable/button_save_background.xml similarity index 100% rename from res/drawable/button_save_background.xml rename to app/src/main/res/drawable/button_save_background.xml diff --git a/res/drawable/button_selectmode.xml b/app/src/main/res/drawable/button_selectmode.xml similarity index 100% rename from res/drawable/button_selectmode.xml rename to app/src/main/res/drawable/button_selectmode.xml diff --git a/res/drawable/button_shutter.xml b/app/src/main/res/drawable/button_shutter.xml similarity index 100% rename from res/drawable/button_shutter.xml rename to app/src/main/res/drawable/button_shutter.xml diff --git a/res/drawable/drawer_pattern.png b/app/src/main/res/drawable/drawer_pattern.png similarity index 100% rename from res/drawable/drawer_pattern.png rename to app/src/main/res/drawable/drawer_pattern.png diff --git a/res/drawable/editor_adv.png b/app/src/main/res/drawable/editor_adv.png similarity index 100% rename from res/drawable/editor_adv.png rename to app/src/main/res/drawable/editor_adv.png diff --git a/res/drawable/empty.png b/app/src/main/res/drawable/empty.png similarity index 100% rename from res/drawable/empty.png rename to app/src/main/res/drawable/empty.png diff --git a/res/drawable/ev_background.xml b/app/src/main/res/drawable/ev_background.xml similarity index 100% rename from res/drawable/ev_background.xml rename to app/src/main/res/drawable/ev_background.xml diff --git a/res/drawable/ev_bar.xml b/app/src/main/res/drawable/ev_bar.xml similarity index 100% rename from res/drawable/ev_bar.xml rename to app/src/main/res/drawable/ev_bar.xml diff --git a/res/drawable/expo_expobar.xml b/app/src/main/res/drawable/expo_expobar.xml similarity index 100% rename from res/drawable/expo_expobar.xml rename to app/src/main/res/drawable/expo_expobar.xml diff --git a/res/drawable/fb.png b/app/src/main/res/drawable/fb.png similarity index 100% rename from res/drawable/fb.png rename to app/src/main/res/drawable/fb.png diff --git a/res/drawable/gallery_background.xml b/app/src/main/res/drawable/gallery_background.xml similarity index 100% rename from res/drawable/gallery_background.xml rename to app/src/main/res/drawable/gallery_background.xml diff --git a/res/drawable/gallery_background_pressed.xml b/app/src/main/res/drawable/gallery_background_pressed.xml similarity index 100% rename from res/drawable/gallery_background_pressed.xml rename to app/src/main/res/drawable/gallery_background_pressed.xml diff --git a/res/drawable/gallery_background_unpressed.xml b/app/src/main/res/drawable/gallery_background_unpressed.xml similarity index 100% rename from res/drawable/gallery_background_unpressed.xml rename to app/src/main/res/drawable/gallery_background_unpressed.xml diff --git a/res/drawable/gplus.png b/app/src/main/res/drawable/gplus.png similarity index 100% rename from res/drawable/gplus.png rename to app/src/main/res/drawable/gplus.png diff --git a/res/drawable/gps_found.png b/app/src/main/res/drawable/gps_found.png similarity index 100% rename from res/drawable/gps_found.png rename to app/src/main/res/drawable/gps_found.png diff --git a/res/drawable/gps_off.png b/app/src/main/res/drawable/gps_off.png similarity index 100% rename from res/drawable/gps_off.png rename to app/src/main/res/drawable/gps_off.png diff --git a/res/drawable/gps_search.png b/app/src/main/res/drawable/gps_search.png similarity index 100% rename from res/drawable/gps_search.png rename to app/src/main/res/drawable/gps_search.png diff --git a/res/drawable/gui_almalence_alert_dialog_icon.png b/app/src/main/res/drawable/gui_almalence_alert_dialog_icon.png similarity index 100% rename from res/drawable/gui_almalence_alert_dialog_icon.png rename to app/src/main/res/drawable/gui_almalence_alert_dialog_icon.png diff --git a/res/drawable/gui_almalence_gallery.png b/app/src/main/res/drawable/gui_almalence_gallery.png similarity index 100% rename from res/drawable/gui_almalence_gallery.png rename to app/src/main/res/drawable/gui_almalence_gallery.png diff --git a/res/drawable/gui_almalence_handle_down.png b/app/src/main/res/drawable/gui_almalence_handle_down.png similarity index 100% rename from res/drawable/gui_almalence_handle_down.png rename to app/src/main/res/drawable/gui_almalence_handle_down.png diff --git a/res/drawable/gui_almalence_handle_up.png b/app/src/main/res/drawable/gui_almalence_handle_up.png similarity index 100% rename from res/drawable/gui_almalence_handle_up.png rename to app/src/main/res/drawable/gui_almalence_handle_up.png diff --git a/res/drawable/gui_almalence_hint_arrowdown.png b/app/src/main/res/drawable/gui_almalence_hint_arrowdown.png similarity index 100% rename from res/drawable/gui_almalence_hint_arrowdown.png rename to app/src/main/res/drawable/gui_almalence_hint_arrowdown.png diff --git a/res/drawable/gui_almalence_hint_arrowpull.png b/app/src/main/res/drawable/gui_almalence_hint_arrowpull.png similarity index 100% rename from res/drawable/gui_almalence_hint_arrowpull.png rename to app/src/main/res/drawable/gui_almalence_hint_arrowpull.png diff --git a/res/drawable/gui_almalence_hint_arrowtoleft.png b/app/src/main/res/drawable/gui_almalence_hint_arrowtoleft.png similarity index 100% rename from res/drawable/gui_almalence_hint_arrowtoleft.png rename to app/src/main/res/drawable/gui_almalence_hint_arrowtoleft.png diff --git a/res/drawable/gui_almalence_hint_arrowtoright.png b/app/src/main/res/drawable/gui_almalence_hint_arrowtoright.png similarity index 100% rename from res/drawable/gui_almalence_hint_arrowtoright.png rename to app/src/main/res/drawable/gui_almalence_hint_arrowtoright.png diff --git a/res/drawable/gui_almalence_hint_arrowup.png b/app/src/main/res/drawable/gui_almalence_hint_arrowup.png similarity index 100% rename from res/drawable/gui_almalence_hint_arrowup.png rename to app/src/main/res/drawable/gui_almalence_hint_arrowup.png diff --git a/res/drawable/gui_almalence_manual_expand.png b/app/src/main/res/drawable/gui_almalence_manual_expand.png similarity index 100% rename from res/drawable/gui_almalence_manual_expand.png rename to app/src/main/res/drawable/gui_almalence_manual_expand.png diff --git a/res/drawable/gui_almalence_mode_backintime.png b/app/src/main/res/drawable/gui_almalence_mode_backintime.png similarity index 100% rename from res/drawable/gui_almalence_mode_backintime.png rename to app/src/main/res/drawable/gui_almalence_mode_backintime.png diff --git a/res/drawable/gui_almalence_mode_bestshot.png b/app/src/main/res/drawable/gui_almalence_mode_bestshot.png similarity index 100% rename from res/drawable/gui_almalence_mode_bestshot.png rename to app/src/main/res/drawable/gui_almalence_mode_bestshot.png diff --git a/res/drawable/gui_almalence_mode_burst.png b/app/src/main/res/drawable/gui_almalence_mode_burst.png similarity index 100% rename from res/drawable/gui_almalence_mode_burst.png rename to app/src/main/res/drawable/gui_almalence_mode_burst.png diff --git a/res/drawable/gui_almalence_mode_color_effects.png b/app/src/main/res/drawable/gui_almalence_mode_color_effects.png similarity index 100% rename from res/drawable/gui_almalence_mode_color_effects.png rename to app/src/main/res/drawable/gui_almalence_mode_color_effects.png diff --git a/res/drawable/gui_almalence_mode_expobracketing.png b/app/src/main/res/drawable/gui_almalence_mode_expobracketing.png similarity index 100% rename from res/drawable/gui_almalence_mode_expobracketing.png rename to app/src/main/res/drawable/gui_almalence_mode_expobracketing.png diff --git a/res/drawable/gui_almalence_mode_groupshot.png b/app/src/main/res/drawable/gui_almalence_mode_groupshot.png similarity index 100% rename from res/drawable/gui_almalence_mode_groupshot.png rename to app/src/main/res/drawable/gui_almalence_mode_groupshot.png diff --git a/res/drawable/gui_almalence_mode_hdr.png b/app/src/main/res/drawable/gui_almalence_mode_hdr.png similarity index 100% rename from res/drawable/gui_almalence_mode_hdr.png rename to app/src/main/res/drawable/gui_almalence_mode_hdr.png diff --git a/res/drawable/gui_almalence_mode_image_sizes.png b/app/src/main/res/drawable/gui_almalence_mode_image_sizes.png similarity index 100% rename from res/drawable/gui_almalence_mode_image_sizes.png rename to app/src/main/res/drawable/gui_almalence_mode_image_sizes.png diff --git a/res/drawable/gui_almalence_mode_moving.png b/app/src/main/res/drawable/gui_almalence_mode_moving.png similarity index 100% rename from res/drawable/gui_almalence_mode_moving.png rename to app/src/main/res/drawable/gui_almalence_mode_moving.png diff --git a/res/drawable/gui_almalence_mode_night.png b/app/src/main/res/drawable/gui_almalence_mode_night.png similarity index 100% rename from res/drawable/gui_almalence_mode_night.png rename to app/src/main/res/drawable/gui_almalence_mode_night.png diff --git a/res/drawable/gui_almalence_mode_panorama.png b/app/src/main/res/drawable/gui_almalence_mode_panorama.png similarity index 100% rename from res/drawable/gui_almalence_mode_panorama.png rename to app/src/main/res/drawable/gui_almalence_mode_panorama.png diff --git a/res/drawable/gui_almalence_mode_selftimer.png b/app/src/main/res/drawable/gui_almalence_mode_selftimer.png similarity index 100% rename from res/drawable/gui_almalence_mode_selftimer.png rename to app/src/main/res/drawable/gui_almalence_mode_selftimer.png diff --git a/res/drawable/gui_almalence_mode_selftimer_control_ative.png b/app/src/main/res/drawable/gui_almalence_mode_selftimer_control_ative.png similarity index 100% rename from res/drawable/gui_almalence_mode_selftimer_control_ative.png rename to app/src/main/res/drawable/gui_almalence_mode_selftimer_control_ative.png diff --git a/res/drawable/gui_almalence_mode_selftimer_control_off.png b/app/src/main/res/drawable/gui_almalence_mode_selftimer_control_off.png similarity index 100% rename from res/drawable/gui_almalence_mode_selftimer_control_off.png rename to app/src/main/res/drawable/gui_almalence_mode_selftimer_control_off.png diff --git a/res/drawable/gui_almalence_mode_sequence.png b/app/src/main/res/drawable/gui_almalence_mode_sequence.png similarity index 100% rename from res/drawable/gui_almalence_mode_sequence.png rename to app/src/main/res/drawable/gui_almalence_mode_sequence.png diff --git a/res/drawable/gui_almalence_mode_single.png b/app/src/main/res/drawable/gui_almalence_mode_single.png similarity index 100% rename from res/drawable/gui_almalence_mode_single.png rename to app/src/main/res/drawable/gui_almalence_mode_single.png diff --git a/res/drawable/gui_almalence_mode_super.png b/app/src/main/res/drawable/gui_almalence_mode_super.png similarity index 100% rename from res/drawable/gui_almalence_mode_super.png rename to app/src/main/res/drawable/gui_almalence_mode_super.png diff --git a/res/drawable/gui_almalence_mode_video.png b/app/src/main/res/drawable/gui_almalence_mode_video.png similarity index 100% rename from res/drawable/gui_almalence_mode_video.png rename to app/src/main/res/drawable/gui_almalence_mode_video.png diff --git a/res/drawable/gui_almalence_rotatedevice.png b/app/src/main/res/drawable/gui_almalence_rotatedevice.png similarity index 100% rename from res/drawable/gui_almalence_rotatedevice.png rename to app/src/main/res/drawable/gui_almalence_rotatedevice.png diff --git a/res/drawable/gui_almalence_rotatedevice_inner.png b/app/src/main/res/drawable/gui_almalence_rotatedevice_inner.png similarity index 100% rename from res/drawable/gui_almalence_rotatedevice_inner.png rename to app/src/main/res/drawable/gui_almalence_rotatedevice_inner.png diff --git a/res/drawable/gui_almalence_select_mode.png b/app/src/main/res/drawable/gui_almalence_select_mode.png similarity index 100% rename from res/drawable/gui_almalence_select_mode.png rename to app/src/main/res/drawable/gui_almalence_select_mode.png diff --git a/res/drawable/gui_almalence_settings_gyro.png b/app/src/main/res/drawable/gui_almalence_settings_gyro.png similarity index 100% rename from res/drawable/gui_almalence_settings_gyro.png rename to app/src/main/res/drawable/gui_almalence_settings_gyro.png diff --git a/res/drawable/gui_almalence_settings_gyro_off.png b/app/src/main/res/drawable/gui_almalence_settings_gyro_off.png similarity index 100% rename from res/drawable/gui_almalence_settings_gyro_off.png rename to app/src/main/res/drawable/gui_almalence_settings_gyro_off.png diff --git a/res/drawable/gui_almalence_settings_off_barcode_scanner.png b/app/src/main/res/drawable/gui_almalence_settings_off_barcode_scanner.png similarity index 100% rename from res/drawable/gui_almalence_settings_off_barcode_scanner.png rename to app/src/main/res/drawable/gui_almalence_settings_off_barcode_scanner.png diff --git a/res/drawable/gui_almalence_settings_scene_barcode_on.png b/app/src/main/res/drawable/gui_almalence_settings_scene_barcode_on.png similarity index 100% rename from res/drawable/gui_almalence_settings_scene_barcode_on.png rename to app/src/main/res/drawable/gui_almalence_settings_scene_barcode_on.png diff --git a/res/drawable/hint_background.xml b/app/src/main/res/drawable/hint_background.xml similarity index 100% rename from res/drawable/hint_background.xml rename to app/src/main/res/drawable/hint_background.xml diff --git a/res/drawable/ic_exposure.png b/app/src/main/res/drawable/ic_exposure.png similarity index 100% rename from res/drawable/ic_exposure.png rename to app/src/main/res/drawable/ic_exposure.png diff --git a/res/drawable/ic_focus_failed.png b/app/src/main/res/drawable/ic_focus_failed.png similarity index 100% rename from res/drawable/ic_focus_failed.png rename to app/src/main/res/drawable/ic_focus_failed.png diff --git a/res/drawable/ic_focus_focused.png b/app/src/main/res/drawable/ic_focus_focused.png similarity index 100% rename from res/drawable/ic_focus_focused.png rename to app/src/main/res/drawable/ic_focus_focused.png diff --git a/res/drawable/ic_focus_focusing.png b/app/src/main/res/drawable/ic_focus_focusing.png similarity index 100% rename from res/drawable/ic_focus_focusing.png rename to app/src/main/res/drawable/ic_focus_focusing.png diff --git a/res/drawable/ic_menu_archive.png b/app/src/main/res/drawable/ic_menu_archive.png similarity index 100% rename from res/drawable/ic_menu_archive.png rename to app/src/main/res/drawable/ic_menu_archive.png diff --git a/res/drawable/ic_menu_back.png b/app/src/main/res/drawable/ic_menu_back.png similarity index 100% rename from res/drawable/ic_menu_back.png rename to app/src/main/res/drawable/ic_menu_back.png diff --git a/res/drawable/ic_menu_next.png b/app/src/main/res/drawable/ic_menu_next.png similarity index 100% rename from res/drawable/ic_menu_next.png rename to app/src/main/res/drawable/ic_menu_next.png diff --git a/res/drawable/ic_menu_next_pressed.png b/app/src/main/res/drawable/ic_menu_next_pressed.png similarity index 100% rename from res/drawable/ic_menu_next_pressed.png rename to app/src/main/res/drawable/ic_menu_next_pressed.png diff --git a/res/drawable/ic_menu_prev.png b/app/src/main/res/drawable/ic_menu_prev.png similarity index 100% rename from res/drawable/ic_menu_prev.png rename to app/src/main/res/drawable/ic_menu_prev.png diff --git a/res/drawable/ic_menu_prev_pressed.png b/app/src/main/res/drawable/ic_menu_prev_pressed.png similarity index 100% rename from res/drawable/ic_menu_prev_pressed.png rename to app/src/main/res/drawable/ic_menu_prev_pressed.png diff --git a/res/drawable/ic_recording_indicator.png b/app/src/main/res/drawable/ic_recording_indicator.png similarity index 100% rename from res/drawable/ic_recording_indicator.png rename to app/src/main/res/drawable/ic_recording_indicator.png diff --git a/res/drawable/icon.png b/app/src/main/res/drawable/icon.png similarity index 100% rename from res/drawable/icon.png rename to app/src/main/res/drawable/icon.png diff --git a/res/drawable/infounderlayer.png b/app/src/main/res/drawable/infounderlayer.png similarity index 100% rename from res/drawable/infounderlayer.png rename to app/src/main/res/drawable/infounderlayer.png diff --git a/res/drawable/layout_background_disabled.xml b/app/src/main/res/drawable/layout_background_disabled.xml similarity index 100% rename from res/drawable/layout_background_disabled.xml rename to app/src/main/res/drawable/layout_background_disabled.xml diff --git a/res/drawable/layout_border.xml b/app/src/main/res/drawable/layout_border.xml similarity index 100% rename from res/drawable/layout_border.xml rename to app/src/main/res/drawable/layout_border.xml diff --git a/res/drawable/layout_border_multishot_option.xml b/app/src/main/res/drawable/layout_border_multishot_option.xml similarity index 100% rename from res/drawable/layout_border_multishot_option.xml rename to app/src/main/res/drawable/layout_border_multishot_option.xml diff --git a/res/drawable/layout_border_panel.xml b/app/src/main/res/drawable/layout_border_panel.xml similarity index 100% rename from res/drawable/layout_border_panel.xml rename to app/src/main/res/drawable/layout_border_panel.xml diff --git a/res/drawable/layout_border_panel_default.xml b/app/src/main/res/drawable/layout_border_panel_default.xml similarity index 100% rename from res/drawable/layout_border_panel_default.xml rename to app/src/main/res/drawable/layout_border_panel_default.xml diff --git a/res/drawable/layout_border_panel_pressed.xml b/app/src/main/res/drawable/layout_border_panel_pressed.xml similarity index 100% rename from res/drawable/layout_border_panel_pressed.xml rename to app/src/main/res/drawable/layout_border_panel_pressed.xml diff --git a/res/drawable/layout_border_panel_selected.xml b/app/src/main/res/drawable/layout_border_panel_selected.xml similarity index 100% rename from res/drawable/layout_border_panel_selected.xml rename to app/src/main/res/drawable/layout_border_panel_selected.xml diff --git a/res/drawable/layout_border_qc.xml b/app/src/main/res/drawable/layout_border_qc.xml similarity index 100% rename from res/drawable/layout_border_qc.xml rename to app/src/main/res/drawable/layout_border_qc.xml diff --git a/res/drawable/layout_border_qc_button.xml b/app/src/main/res/drawable/layout_border_qc_button.xml similarity index 100% rename from res/drawable/layout_border_qc_button.xml rename to app/src/main/res/drawable/layout_border_qc_button.xml diff --git a/res/drawable/plugin_capture_video_pause.png b/app/src/main/res/drawable/plugin_capture_video_pause.png similarity index 100% rename from res/drawable/plugin_capture_video_pause.png rename to app/src/main/res/drawable/plugin_capture_video_pause.png diff --git a/res/drawable/plugin_capture_video_pause_transparent.png b/app/src/main/res/drawable/plugin_capture_video_pause_transparent.png similarity index 100% rename from res/drawable/plugin_capture_video_pause_transparent.png rename to app/src/main/res/drawable/plugin_capture_video_pause_transparent.png diff --git a/res/drawable/plugin_capture_video_stop_square.png b/app/src/main/res/drawable/plugin_capture_video_stop_square.png similarity index 100% rename from res/drawable/plugin_capture_video_stop_square.png rename to app/src/main/res/drawable/plugin_capture_video_stop_square.png diff --git a/res/drawable/plugin_capture_video_stop_square_red.png b/app/src/main/res/drawable/plugin_capture_video_stop_square_red.png similarity index 100% rename from res/drawable/plugin_capture_video_stop_square_red.png rename to app/src/main/res/drawable/plugin_capture_video_stop_square_red.png diff --git a/res/drawable/plugin_capture_video_takeimage.xml b/app/src/main/res/drawable/plugin_capture_video_takeimage.xml similarity index 100% rename from res/drawable/plugin_capture_video_takeimage.xml rename to app/src/main/res/drawable/plugin_capture_video_takeimage.xml diff --git a/res/drawable/plugin_export_multishot_saveall.png b/app/src/main/res/drawable/plugin_export_multishot_saveall.png similarity index 100% rename from res/drawable/plugin_export_multishot_saveall.png rename to app/src/main/res/drawable/plugin_export_multishot_saveall.png diff --git a/res/drawable/plugin_export_multishot_saveall_background.xml b/app/src/main/res/drawable/plugin_export_multishot_saveall_background.xml similarity index 100% rename from res/drawable/plugin_export_multishot_saveall_background.xml rename to app/src/main/res/drawable/plugin_export_multishot_saveall_background.xml diff --git a/res/drawable/plugin_export_multishot_saveall_glow.png b/app/src/main/res/drawable/plugin_export_multishot_saveall_glow.png similarity index 100% rename from res/drawable/plugin_export_multishot_saveall_glow.png rename to app/src/main/res/drawable/plugin_export_multishot_saveall_glow.png diff --git a/res/drawable/plugin_help_bestshot.jpg b/app/src/main/res/drawable/plugin_help_bestshot.jpg similarity index 100% rename from res/drawable/plugin_help_bestshot.jpg rename to app/src/main/res/drawable/plugin_help_bestshot.jpg diff --git a/res/drawable/plugin_help_dro.jpg b/app/src/main/res/drawable/plugin_help_dro.jpg similarity index 100% rename from res/drawable/plugin_help_dro.jpg rename to app/src/main/res/drawable/plugin_help_dro.jpg diff --git a/res/drawable/plugin_help_groupshot.png b/app/src/main/res/drawable/plugin_help_groupshot.png similarity index 100% rename from res/drawable/plugin_help_groupshot.png rename to app/src/main/res/drawable/plugin_help_groupshot.png diff --git a/res/drawable/plugin_help_multishot.jpg b/app/src/main/res/drawable/plugin_help_multishot.jpg similarity index 100% rename from res/drawable/plugin_help_multishot.jpg rename to app/src/main/res/drawable/plugin_help_multishot.jpg diff --git a/res/drawable/plugin_help_object.png b/app/src/main/res/drawable/plugin_help_object.png similarity index 100% rename from res/drawable/plugin_help_object.png rename to app/src/main/res/drawable/plugin_help_object.png diff --git a/res/drawable/plugin_help_panorama.png b/app/src/main/res/drawable/plugin_help_panorama.png similarity index 100% rename from res/drawable/plugin_help_panorama.png rename to app/src/main/res/drawable/plugin_help_panorama.png diff --git a/res/drawable/plugin_help_sequence.png b/app/src/main/res/drawable/plugin_help_sequence.png similarity index 100% rename from res/drawable/plugin_help_sequence.png rename to app/src/main/res/drawable/plugin_help_sequence.png diff --git a/res/drawable/plugin_processing_preshot_back.png b/app/src/main/res/drawable/plugin_processing_preshot_back.png similarity index 100% rename from res/drawable/plugin_processing_preshot_back.png rename to app/src/main/res/drawable/plugin_processing_preshot_back.png diff --git a/res/drawable/plugin_processing_preshot_back_background.xml b/app/src/main/res/drawable/plugin_processing_preshot_back_background.xml similarity index 100% rename from res/drawable/plugin_processing_preshot_back_background.xml rename to app/src/main/res/drawable/plugin_processing_preshot_back_background.xml diff --git a/res/drawable/plugin_processing_preshot_back_glow.png b/app/src/main/res/drawable/plugin_processing_preshot_back_glow.png similarity index 100% rename from res/drawable/plugin_processing_preshot_back_glow.png rename to app/src/main/res/drawable/plugin_processing_preshot_back_glow.png diff --git a/res/drawable/plugin_processing_preshot_saveall.png b/app/src/main/res/drawable/plugin_processing_preshot_saveall.png similarity index 100% rename from res/drawable/plugin_processing_preshot_saveall.png rename to app/src/main/res/drawable/plugin_processing_preshot_saveall.png diff --git a/res/drawable/plugin_processing_preshot_saveall_background.xml b/app/src/main/res/drawable/plugin_processing_preshot_saveall_background.xml similarity index 100% rename from res/drawable/plugin_processing_preshot_saveall_background.xml rename to app/src/main/res/drawable/plugin_processing_preshot_saveall_background.xml diff --git a/res/drawable/plugin_processing_preshot_saveall_glow.png b/app/src/main/res/drawable/plugin_processing_preshot_saveall_glow.png similarity index 100% rename from res/drawable/plugin_processing_preshot_saveall_glow.png rename to app/src/main/res/drawable/plugin_processing_preshot_saveall_glow.png diff --git a/res/drawable/plugin_processing_preshot_savethis.png b/app/src/main/res/drawable/plugin_processing_preshot_savethis.png similarity index 100% rename from res/drawable/plugin_processing_preshot_savethis.png rename to app/src/main/res/drawable/plugin_processing_preshot_savethis.png diff --git a/res/drawable/plugin_processing_preshot_savethis_background.xml b/app/src/main/res/drawable/plugin_processing_preshot_savethis_background.xml similarity index 100% rename from res/drawable/plugin_processing_preshot_savethis_background.xml rename to app/src/main/res/drawable/plugin_processing_preshot_savethis_background.xml diff --git a/res/drawable/plugin_processing_preshot_savethis_glow.png b/app/src/main/res/drawable/plugin_processing_preshot_savethis_glow.png similarity index 100% rename from res/drawable/plugin_processing_preshot_savethis_glow.png rename to app/src/main/res/drawable/plugin_processing_preshot_savethis_glow.png diff --git a/res/drawable/plugin_vf_clearbutton_bg.xml b/app/src/main/res/drawable/plugin_vf_clearbutton_bg.xml similarity index 100% rename from res/drawable/plugin_vf_clearbutton_bg.xml rename to app/src/main/res/drawable/plugin_vf_clearbutton_bg.xml diff --git a/res/drawable/plugin_vf_grid_none.png b/app/src/main/res/drawable/plugin_vf_grid_none.png similarity index 100% rename from res/drawable/plugin_vf_grid_none.png rename to app/src/main/res/drawable/plugin_vf_grid_none.png diff --git a/res/drawable/plugin_vf_grid_none_img.png b/app/src/main/res/drawable/plugin_vf_grid_none_img.png similarity index 100% rename from res/drawable/plugin_vf_grid_none_img.png rename to app/src/main/res/drawable/plugin_vf_grid_none_img.png diff --git a/res/drawable/plugin_vf_gyro_level_circle.png b/app/src/main/res/drawable/plugin_vf_gyro_level_circle.png similarity index 100% rename from res/drawable/plugin_vf_gyro_level_circle.png rename to app/src/main/res/drawable/plugin_vf_gyro_level_circle.png diff --git a/res/drawable/plugin_vf_gyro_level_circle_vertical.png b/app/src/main/res/drawable/plugin_vf_gyro_level_circle_vertical.png similarity index 100% rename from res/drawable/plugin_vf_gyro_level_circle_vertical.png rename to app/src/main/res/drawable/plugin_vf_gyro_level_circle_vertical.png diff --git a/res/drawable/plugin_vf_gyro_level_side_fourth_strips.png b/app/src/main/res/drawable/plugin_vf_gyro_level_side_fourth_strips.png similarity index 100% rename from res/drawable/plugin_vf_gyro_level_side_fourth_strips.png rename to app/src/main/res/drawable/plugin_vf_gyro_level_side_fourth_strips.png diff --git a/res/drawable/plugin_vf_gyro_level_side_strips.png b/app/src/main/res/drawable/plugin_vf_gyro_level_side_strips.png similarity index 100% rename from res/drawable/plugin_vf_gyro_level_side_strips.png rename to app/src/main/res/drawable/plugin_vf_gyro_level_side_strips.png diff --git a/res/drawable/plugin_vf_gyro_level_strip.png b/app/src/main/res/drawable/plugin_vf_gyro_level_strip.png similarity index 100% rename from res/drawable/plugin_vf_gyro_level_strip.png rename to app/src/main/res/drawable/plugin_vf_gyro_level_strip.png diff --git a/res/drawable/preshot.jpg b/app/src/main/res/drawable/preshot.jpg similarity index 100% rename from res/drawable/preshot.jpg rename to app/src/main/res/drawable/preshot.jpg diff --git a/res/drawable/processing_progressbar.xml b/app/src/main/res/drawable/processing_progressbar.xml similarity index 100% rename from res/drawable/processing_progressbar.xml rename to app/src/main/res/drawable/processing_progressbar.xml diff --git a/res/drawable/qctoppanel_background.xml b/app/src/main/res/drawable/qctoppanel_background.xml similarity index 100% rename from res/drawable/qctoppanel_background.xml rename to app/src/main/res/drawable/qctoppanel_background.xml diff --git a/res/drawable/qctoppanel_background_default.xml b/app/src/main/res/drawable/qctoppanel_background_default.xml similarity index 100% rename from res/drawable/qctoppanel_background_default.xml rename to app/src/main/res/drawable/qctoppanel_background_default.xml diff --git a/res/drawable/qctoppanel_background_disabled.xml b/app/src/main/res/drawable/qctoppanel_background_disabled.xml similarity index 100% rename from res/drawable/qctoppanel_background_disabled.xml rename to app/src/main/res/drawable/qctoppanel_background_disabled.xml diff --git a/res/drawable/qctoppanel_background_pressed.xml b/app/src/main/res/drawable/qctoppanel_background_pressed.xml similarity index 100% rename from res/drawable/qctoppanel_background_pressed.xml rename to app/src/main/res/drawable/qctoppanel_background_pressed.xml diff --git a/res/drawable/qctoppanel_background_selected.xml b/app/src/main/res/drawable/qctoppanel_background_selected.xml similarity index 100% rename from res/drawable/qctoppanel_background_selected.xml rename to app/src/main/res/drawable/qctoppanel_background_selected.xml diff --git a/res/drawable/scrubber_control_pressed_holo.png b/app/src/main/res/drawable/scrubber_control_pressed_holo.png similarity index 100% rename from res/drawable/scrubber_control_pressed_holo.png rename to app/src/main/res/drawable/scrubber_control_pressed_holo.png diff --git a/res/drawable/scrubber_control_selector_holo_light.xml b/app/src/main/res/drawable/scrubber_control_selector_holo_light.xml similarity index 100% rename from res/drawable/scrubber_control_selector_holo_light.xml rename to app/src/main/res/drawable/scrubber_control_selector_holo_light.xml diff --git a/res/drawable/scrubber_secondary_holo.9.png b/app/src/main/res/drawable/scrubber_secondary_holo.9.png similarity index 100% rename from res/drawable/scrubber_secondary_holo.9.png rename to app/src/main/res/drawable/scrubber_secondary_holo.9.png diff --git a/res/drawable/store_all.png b/app/src/main/res/drawable/store_all.png similarity index 100% rename from res/drawable/store_all.png rename to app/src/main/res/drawable/store_all.png diff --git a/res/drawable/store_background.png b/app/src/main/res/drawable/store_background.png similarity index 100% rename from res/drawable/store_background.png rename to app/src/main/res/drawable/store_background.png diff --git a/res/drawable/store_element.png b/app/src/main/res/drawable/store_element.png similarity index 100% rename from res/drawable/store_element.png rename to app/src/main/res/drawable/store_element.png diff --git a/res/drawable/store_groupshot.png b/app/src/main/res/drawable/store_groupshot.png similarity index 100% rename from res/drawable/store_groupshot.png rename to app/src/main/res/drawable/store_groupshot.png diff --git a/res/drawable/store_hdr.png b/app/src/main/res/drawable/store_hdr.png similarity index 100% rename from res/drawable/store_hdr.png rename to app/src/main/res/drawable/store_hdr.png diff --git a/res/drawable/store_header.png b/app/src/main/res/drawable/store_header.png similarity index 100% rename from res/drawable/store_header.png rename to app/src/main/res/drawable/store_header.png diff --git a/res/drawable/store_header_large.png b/app/src/main/res/drawable/store_header_large.png similarity index 100% rename from res/drawable/store_header_large.png rename to app/src/main/res/drawable/store_header_large.png diff --git a/res/drawable/store_moving.png b/app/src/main/res/drawable/store_moving.png similarity index 100% rename from res/drawable/store_moving.png rename to app/src/main/res/drawable/store_moving.png diff --git a/res/drawable/store_panorama.png b/app/src/main/res/drawable/store_panorama.png similarity index 100% rename from res/drawable/store_panorama.png rename to app/src/main/res/drawable/store_panorama.png diff --git a/res/drawable/store_promo.png b/app/src/main/res/drawable/store_promo.png similarity index 100% rename from res/drawable/store_promo.png rename to app/src/main/res/drawable/store_promo.png diff --git a/res/drawable/store_sale.png b/app/src/main/res/drawable/store_sale.png similarity index 100% rename from res/drawable/store_sale.png rename to app/src/main/res/drawable/store_sale.png diff --git a/res/drawable/store_subscription.png b/app/src/main/res/drawable/store_subscription.png similarity index 100% rename from res/drawable/store_subscription.png rename to app/src/main/res/drawable/store_subscription.png diff --git a/res/drawable/store_super.png b/app/src/main/res/drawable/store_super.png similarity index 100% rename from res/drawable/store_super.png rename to app/src/main/res/drawable/store_super.png diff --git a/res/drawable/switch_inner_holo_dark.xml b/app/src/main/res/drawable/switch_inner_holo_dark.xml similarity index 100% rename from res/drawable/switch_inner_holo_dark.xml rename to app/src/main/res/drawable/switch_inner_holo_dark.xml diff --git a/res/drawable/switch_inner_holo_dark_dro.xml b/app/src/main/res/drawable/switch_inner_holo_dark_dro.xml similarity index 100% rename from res/drawable/switch_inner_holo_dark_dro.xml rename to app/src/main/res/drawable/switch_inner_holo_dark_dro.xml diff --git a/res/drawable/switch_inner_holo_light.xml b/app/src/main/res/drawable/switch_inner_holo_light.xml similarity index 100% rename from res/drawable/switch_inner_holo_light.xml rename to app/src/main/res/drawable/switch_inner_holo_light.xml diff --git a/res/drawable/switch_track_holo_dark.xml b/app/src/main/res/drawable/switch_track_holo_dark.xml similarity index 100% rename from res/drawable/switch_track_holo_dark.xml rename to app/src/main/res/drawable/switch_track_holo_dark.xml diff --git a/res/drawable/switch_track_holo_light.xml b/app/src/main/res/drawable/switch_track_holo_light.xml similarity index 100% rename from res/drawable/switch_track_holo_light.xml rename to app/src/main/res/drawable/switch_track_holo_light.xml diff --git a/res/drawable/thumbnail_background.xml b/app/src/main/res/drawable/thumbnail_background.xml similarity index 100% rename from res/drawable/thumbnail_background.xml rename to app/src/main/res/drawable/thumbnail_background.xml diff --git a/res/drawable/thumbnail_background_default.xml b/app/src/main/res/drawable/thumbnail_background_default.xml similarity index 100% rename from res/drawable/thumbnail_background_default.xml rename to app/src/main/res/drawable/thumbnail_background_default.xml diff --git a/res/drawable/thumbnail_background_default_slider.xml b/app/src/main/res/drawable/thumbnail_background_default_slider.xml similarity index 100% rename from res/drawable/thumbnail_background_default_slider.xml rename to app/src/main/res/drawable/thumbnail_background_default_slider.xml diff --git a/res/drawable/thumbnail_background_disabled.xml b/app/src/main/res/drawable/thumbnail_background_disabled.xml similarity index 100% rename from res/drawable/thumbnail_background_disabled.xml rename to app/src/main/res/drawable/thumbnail_background_disabled.xml diff --git a/res/drawable/thumbnail_background_inner.xml b/app/src/main/res/drawable/thumbnail_background_inner.xml similarity index 100% rename from res/drawable/thumbnail_background_inner.xml rename to app/src/main/res/drawable/thumbnail_background_inner.xml diff --git a/res/drawable/thumbnail_background_pressed.xml b/app/src/main/res/drawable/thumbnail_background_pressed.xml similarity index 100% rename from res/drawable/thumbnail_background_pressed.xml rename to app/src/main/res/drawable/thumbnail_background_pressed.xml diff --git a/res/drawable/thumbnail_background_selected.xml b/app/src/main/res/drawable/thumbnail_background_selected.xml similarity index 100% rename from res/drawable/thumbnail_background_selected.xml rename to app/src/main/res/drawable/thumbnail_background_selected.xml diff --git a/res/drawable/thumbnail_background_selected_inner.xml b/app/src/main/res/drawable/thumbnail_background_selected_inner.xml similarity index 100% rename from res/drawable/thumbnail_background_selected_inner.xml rename to app/src/main/res/drawable/thumbnail_background_selected_inner.xml diff --git a/res/drawable/thumbnail_background_slider.xml b/app/src/main/res/drawable/thumbnail_background_slider.xml similarity index 100% rename from res/drawable/thumbnail_background_slider.xml rename to app/src/main/res/drawable/thumbnail_background_slider.xml diff --git a/res/drawable/top_button.xml b/app/src/main/res/drawable/top_button.xml similarity index 100% rename from res/drawable/top_button.xml rename to app/src/main/res/drawable/top_button.xml diff --git a/res/drawable/topmenu_background.xml b/app/src/main/res/drawable/topmenu_background.xml similarity index 100% rename from res/drawable/topmenu_background.xml rename to app/src/main/res/drawable/topmenu_background.xml diff --git a/res/drawable/topmenu_background_qc.xml b/app/src/main/res/drawable/topmenu_background_qc.xml similarity index 100% rename from res/drawable/topmenu_background_qc.xml rename to app/src/main/res/drawable/topmenu_background_qc.xml diff --git a/res/drawable/transparent_background.xml b/app/src/main/res/drawable/transparent_background.xml similarity index 100% rename from res/drawable/transparent_background.xml rename to app/src/main/res/drawable/transparent_background.xml diff --git a/res/drawable/underlayer.png b/app/src/main/res/drawable/underlayer.png similarity index 100% rename from res/drawable/underlayer.png rename to app/src/main/res/drawable/underlayer.png diff --git a/res/drawable/unlock.png b/app/src/main/res/drawable/unlock.png similarity index 100% rename from res/drawable/unlock.png rename to app/src/main/res/drawable/unlock.png diff --git a/res/drawable/unlock_gray.png b/app/src/main/res/drawable/unlock_gray.png similarity index 100% rename from res/drawable/unlock_gray.png rename to app/src/main/res/drawable/unlock_gray.png diff --git a/res/drawable/unlock_sale.png b/app/src/main/res/drawable/unlock_sale.png similarity index 100% rename from res/drawable/unlock_sale.png rename to app/src/main/res/drawable/unlock_sale.png diff --git a/res/drawable/widget_adv.png b/app/src/main/res/drawable/widget_adv.png similarity index 100% rename from res/drawable/widget_adv.png rename to app/src/main/res/drawable/widget_adv.png diff --git a/res/drawable/widget_bg_button_black.xml b/app/src/main/res/drawable/widget_bg_button_black.xml similarity index 100% rename from res/drawable/widget_bg_button_black.xml rename to app/src/main/res/drawable/widget_bg_button_black.xml diff --git a/res/drawable/widget_bg_button_black_default.xml b/app/src/main/res/drawable/widget_bg_button_black_default.xml similarity index 100% rename from res/drawable/widget_bg_button_black_default.xml rename to app/src/main/res/drawable/widget_bg_button_black_default.xml diff --git a/res/drawable/widget_bg_button_black_pressed.xml b/app/src/main/res/drawable/widget_bg_button_black_pressed.xml similarity index 100% rename from res/drawable/widget_bg_button_black_pressed.xml rename to app/src/main/res/drawable/widget_bg_button_black_pressed.xml diff --git a/res/drawable/widget_bg_button_black_selected.xml b/app/src/main/res/drawable/widget_bg_button_black_selected.xml similarity index 100% rename from res/drawable/widget_bg_button_black_selected.xml rename to app/src/main/res/drawable/widget_bg_button_black_selected.xml diff --git a/res/drawable/widget_bg_button_red.xml b/app/src/main/res/drawable/widget_bg_button_red.xml similarity index 100% rename from res/drawable/widget_bg_button_red.xml rename to app/src/main/res/drawable/widget_bg_button_red.xml diff --git a/res/drawable/widget_bg_button_red_default.xml b/app/src/main/res/drawable/widget_bg_button_red_default.xml similarity index 100% rename from res/drawable/widget_bg_button_red_default.xml rename to app/src/main/res/drawable/widget_bg_button_red_default.xml diff --git a/res/drawable/widget_bg_button_red_pressed.xml b/app/src/main/res/drawable/widget_bg_button_red_pressed.xml similarity index 100% rename from res/drawable/widget_bg_button_red_pressed.xml rename to app/src/main/res/drawable/widget_bg_button_red_pressed.xml diff --git a/res/drawable/widget_bg_button_red_selected.xml b/app/src/main/res/drawable/widget_bg_button_red_selected.xml similarity index 100% rename from res/drawable/widget_bg_button_red_selected.xml rename to app/src/main/res/drawable/widget_bg_button_red_selected.xml diff --git a/res/drawable/widget_bg_button_translucent.xml b/app/src/main/res/drawable/widget_bg_button_translucent.xml similarity index 100% rename from res/drawable/widget_bg_button_translucent.xml rename to app/src/main/res/drawable/widget_bg_button_translucent.xml diff --git a/res/drawable/widget_bg_button_translucent_default.xml b/app/src/main/res/drawable/widget_bg_button_translucent_default.xml similarity index 100% rename from res/drawable/widget_bg_button_translucent_default.xml rename to app/src/main/res/drawable/widget_bg_button_translucent_default.xml diff --git a/res/drawable/widget_bg_button_translucent_pressed.xml b/app/src/main/res/drawable/widget_bg_button_translucent_pressed.xml similarity index 100% rename from res/drawable/widget_bg_button_translucent_pressed.xml rename to app/src/main/res/drawable/widget_bg_button_translucent_pressed.xml diff --git a/res/drawable/widget_bg_button_translucent_selected.xml b/app/src/main/res/drawable/widget_bg_button_translucent_selected.xml similarity index 100% rename from res/drawable/widget_bg_button_translucent_selected.xml rename to app/src/main/res/drawable/widget_bg_button_translucent_selected.xml diff --git a/res/drawable/widget_bg_button_transparent.xml b/app/src/main/res/drawable/widget_bg_button_transparent.xml similarity index 100% rename from res/drawable/widget_bg_button_transparent.xml rename to app/src/main/res/drawable/widget_bg_button_transparent.xml diff --git a/res/drawable/widget_bg_button_transparent_default.xml b/app/src/main/res/drawable/widget_bg_button_transparent_default.xml similarity index 100% rename from res/drawable/widget_bg_button_transparent_default.xml rename to app/src/main/res/drawable/widget_bg_button_transparent_default.xml diff --git a/res/drawable/widget_bg_button_transparent_pressed.xml b/app/src/main/res/drawable/widget_bg_button_transparent_pressed.xml similarity index 100% rename from res/drawable/widget_bg_button_transparent_pressed.xml rename to app/src/main/res/drawable/widget_bg_button_transparent_pressed.xml diff --git a/res/drawable/widget_bg_button_transparent_selected.xml b/app/src/main/res/drawable/widget_bg_button_transparent_selected.xml similarity index 100% rename from res/drawable/widget_bg_button_transparent_selected.xml rename to app/src/main/res/drawable/widget_bg_button_transparent_selected.xml diff --git a/res/drawable/widget_configuration_button_background.xml b/app/src/main/res/drawable/widget_configuration_button_background.xml similarity index 100% rename from res/drawable/widget_configuration_button_background.xml rename to app/src/main/res/drawable/widget_configuration_button_background.xml diff --git a/res/drawable/widget_configuration_button_background_default.xml b/app/src/main/res/drawable/widget_configuration_button_background_default.xml similarity index 100% rename from res/drawable/widget_configuration_button_background_default.xml rename to app/src/main/res/drawable/widget_configuration_button_background_default.xml diff --git a/res/drawable/widget_configuration_button_background_pressed.xml b/app/src/main/res/drawable/widget_configuration_button_background_pressed.xml similarity index 100% rename from res/drawable/widget_configuration_button_background_pressed.xml rename to app/src/main/res/drawable/widget_configuration_button_background_pressed.xml diff --git a/res/drawable/widget_configuration_button_background_selected.xml b/app/src/main/res/drawable/widget_configuration_button_background_selected.xml similarity index 100% rename from res/drawable/widget_configuration_button_background_selected.xml rename to app/src/main/res/drawable/widget_configuration_button_background_selected.xml diff --git a/res/drawable/widget_full_solid_grid_element_background.xml b/app/src/main/res/drawable/widget_full_solid_grid_element_background.xml similarity index 100% rename from res/drawable/widget_full_solid_grid_element_background.xml rename to app/src/main/res/drawable/widget_full_solid_grid_element_background.xml diff --git a/res/drawable/widget_mode_grid_button_background.xml b/app/src/main/res/drawable/widget_mode_grid_button_background.xml similarity index 100% rename from res/drawable/widget_mode_grid_button_background.xml rename to app/src/main/res/drawable/widget_mode_grid_button_background.xml diff --git a/res/drawable/widget_mode_grid_button_background_default.xml b/app/src/main/res/drawable/widget_mode_grid_button_background_default.xml similarity index 100% rename from res/drawable/widget_mode_grid_button_background_default.xml rename to app/src/main/res/drawable/widget_mode_grid_button_background_default.xml diff --git a/res/drawable/widget_mode_grid_button_background_pressed.xml b/app/src/main/res/drawable/widget_mode_grid_button_background_pressed.xml similarity index 100% rename from res/drawable/widget_mode_grid_button_background_pressed.xml rename to app/src/main/res/drawable/widget_mode_grid_button_background_pressed.xml diff --git a/res/drawable/widget_mode_grid_button_background_selected.xml b/app/src/main/res/drawable/widget_mode_grid_button_background_selected.xml similarity index 100% rename from res/drawable/widget_mode_grid_button_background_selected.xml rename to app/src/main/res/drawable/widget_mode_grid_button_background_selected.xml diff --git a/res/drawable/widget_mode_grid_button_layout_background.xml b/app/src/main/res/drawable/widget_mode_grid_button_layout_background.xml similarity index 100% rename from res/drawable/widget_mode_grid_button_layout_background.xml rename to app/src/main/res/drawable/widget_mode_grid_button_layout_background.xml diff --git a/res/drawable/widget_mode_grid_button_layout_background_default.xml b/app/src/main/res/drawable/widget_mode_grid_button_layout_background_default.xml similarity index 100% rename from res/drawable/widget_mode_grid_button_layout_background_default.xml rename to app/src/main/res/drawable/widget_mode_grid_button_layout_background_default.xml diff --git a/res/drawable/widget_mode_grid_button_layout_background_pressed.xml b/app/src/main/res/drawable/widget_mode_grid_button_layout_background_pressed.xml similarity index 100% rename from res/drawable/widget_mode_grid_button_layout_background_pressed.xml rename to app/src/main/res/drawable/widget_mode_grid_button_layout_background_pressed.xml diff --git a/res/drawable/widget_mode_grid_button_layout_background_selected.xml b/app/src/main/res/drawable/widget_mode_grid_button_layout_background_selected.xml similarity index 100% rename from res/drawable/widget_mode_grid_button_layout_background_selected.xml rename to app/src/main/res/drawable/widget_mode_grid_button_layout_background_selected.xml diff --git a/res/drawable/widget_mode_list_button_background.xml b/app/src/main/res/drawable/widget_mode_list_button_background.xml similarity index 100% rename from res/drawable/widget_mode_list_button_background.xml rename to app/src/main/res/drawable/widget_mode_list_button_background.xml diff --git a/res/drawable/widget_mode_list_button_background_default.xml b/app/src/main/res/drawable/widget_mode_list_button_background_default.xml similarity index 100% rename from res/drawable/widget_mode_list_button_background_default.xml rename to app/src/main/res/drawable/widget_mode_list_button_background_default.xml diff --git a/res/drawable/widget_mode_list_button_background_pressed.xml b/app/src/main/res/drawable/widget_mode_list_button_background_pressed.xml similarity index 100% rename from res/drawable/widget_mode_list_button_background_pressed.xml rename to app/src/main/res/drawable/widget_mode_list_button_background_pressed.xml diff --git a/res/drawable/widget_mode_list_button_background_selected.xml b/app/src/main/res/drawable/widget_mode_list_button_background_selected.xml similarity index 100% rename from res/drawable/widget_mode_list_button_background_selected.xml rename to app/src/main/res/drawable/widget_mode_list_button_background_selected.xml diff --git a/res/drawable/widget_modelist_background.xml b/app/src/main/res/drawable/widget_modelist_background.xml similarity index 100% rename from res/drawable/widget_modelist_background.xml rename to app/src/main/res/drawable/widget_modelist_background.xml diff --git a/res/drawable/widget_solid_background.xml b/app/src/main/res/drawable/widget_solid_background.xml similarity index 100% rename from res/drawable/widget_solid_background.xml rename to app/src/main/res/drawable/widget_solid_background.xml diff --git a/res/drawable/widget_solid_grid_element_background.xml b/app/src/main/res/drawable/widget_solid_grid_element_background.xml similarity index 100% rename from res/drawable/widget_solid_grid_element_background.xml rename to app/src/main/res/drawable/widget_solid_grid_element_background.xml diff --git a/res/drawable/widget_solid_grid_element_red_background.xml b/app/src/main/res/drawable/widget_solid_grid_element_red_background.xml similarity index 100% rename from res/drawable/widget_solid_grid_element_red_background.xml rename to app/src/main/res/drawable/widget_solid_grid_element_red_background.xml diff --git a/res/drawable/widget_solid_grid_element_translucent_background.xml b/app/src/main/res/drawable/widget_solid_grid_element_translucent_background.xml similarity index 100% rename from res/drawable/widget_solid_grid_element_translucent_background.xml rename to app/src/main/res/drawable/widget_solid_grid_element_translucent_background.xml diff --git a/res/drawable/widget_solid_grid_element_transparent_background.xml b/app/src/main/res/drawable/widget_solid_grid_element_transparent_background.xml similarity index 100% rename from res/drawable/widget_solid_grid_element_transparent_background.xml rename to app/src/main/res/drawable/widget_solid_grid_element_transparent_background.xml diff --git a/res/drawable/youtube.png b/app/src/main/res/drawable/youtube.png similarity index 100% rename from res/drawable/youtube.png rename to app/src/main/res/drawable/youtube.png diff --git a/res/layout-large/gui_almalence_layout.xml b/app/src/main/res/layout-large/gui_almalence_layout.xml similarity index 100% rename from res/layout-large/gui_almalence_layout.xml rename to app/src/main/res/layout-large/gui_almalence_layout.xml diff --git a/res/layout-large/gui_almalence_panel.xml b/app/src/main/res/layout-large/gui_almalence_panel.xml similarity index 100% rename from res/layout-large/gui_almalence_panel.xml rename to app/src/main/res/layout-large/gui_almalence_panel.xml diff --git a/res/layout-large/gui_almalence_quick_control_grid_element.xml b/app/src/main/res/layout-large/gui_almalence_quick_control_grid_element.xml similarity index 100% rename from res/layout-large/gui_almalence_quick_control_grid_element.xml rename to app/src/main/res/layout-large/gui_almalence_quick_control_grid_element.xml diff --git a/res/layout-large/gui_almalence_select_mode_grid_element.xml b/app/src/main/res/layout-large/gui_almalence_select_mode_grid_element.xml similarity index 100% rename from res/layout-large/gui_almalence_select_mode_grid_element.xml rename to app/src/main/res/layout-large/gui_almalence_select_mode_grid_element.xml diff --git a/res/layout-large/gui_almalence_store_grid_element.xml b/app/src/main/res/layout-large/gui_almalence_store_grid_element.xml similarity index 100% rename from res/layout-large/gui_almalence_store_grid_element.xml rename to app/src/main/res/layout-large/gui_almalence_store_grid_element.xml diff --git a/res/layout-xlarge/gui_almalence_layout.xml b/app/src/main/res/layout-xlarge/gui_almalence_layout.xml similarity index 100% rename from res/layout-xlarge/gui_almalence_layout.xml rename to app/src/main/res/layout-xlarge/gui_almalence_layout.xml diff --git a/res/layout-xlarge/gui_almalence_panel.xml b/app/src/main/res/layout-xlarge/gui_almalence_panel.xml similarity index 100% rename from res/layout-xlarge/gui_almalence_panel.xml rename to app/src/main/res/layout-xlarge/gui_almalence_panel.xml diff --git a/res/layout-xlarge/gui_almalence_quick_control_grid_element.xml b/app/src/main/res/layout-xlarge/gui_almalence_quick_control_grid_element.xml similarity index 100% rename from res/layout-xlarge/gui_almalence_quick_control_grid_element.xml rename to app/src/main/res/layout-xlarge/gui_almalence_quick_control_grid_element.xml diff --git a/res/layout-xlarge/gui_almalence_select_mode_grid_element.xml b/app/src/main/res/layout-xlarge/gui_almalence_select_mode_grid_element.xml similarity index 100% rename from res/layout-xlarge/gui_almalence_select_mode_grid_element.xml rename to app/src/main/res/layout-xlarge/gui_almalence_select_mode_grid_element.xml diff --git a/res/layout-xlarge/gui_almalence_store_grid_element.xml b/app/src/main/res/layout-xlarge/gui_almalence_store_grid_element.xml similarity index 100% rename from res/layout-xlarge/gui_almalence_store_grid_element.xml rename to app/src/main/res/layout-xlarge/gui_almalence_store_grid_element.xml diff --git a/res/layout/about_dialog.xml b/app/src/main/res/layout/about_dialog.xml similarity index 100% rename from res/layout/about_dialog.xml rename to app/src/main/res/layout/about_dialog.xml diff --git a/res/layout/folderpicker.xml b/app/src/main/res/layout/folderpicker.xml similarity index 100% rename from res/layout/folderpicker.xml rename to app/src/main/res/layout/folderpicker.xml diff --git a/res/layout/folderpicker_cell.xml b/app/src/main/res/layout/folderpicker_cell.xml similarity index 100% rename from res/layout/folderpicker_cell.xml rename to app/src/main/res/layout/folderpicker_cell.xml diff --git a/res/layout/gui_almalence_device_list_item.xml b/app/src/main/res/layout/gui_almalence_device_list_item.xml similarity index 100% rename from res/layout/gui_almalence_device_list_item.xml rename to app/src/main/res/layout/gui_almalence_device_list_item.xml diff --git a/res/layout/gui_almalence_ev_dialog.xml b/app/src/main/res/layout/gui_almalence_ev_dialog.xml similarity index 100% rename from res/layout/gui_almalence_ev_dialog.xml rename to app/src/main/res/layout/gui_almalence_ev_dialog.xml diff --git a/res/layout/gui_almalence_features.xml b/app/src/main/res/layout/gui_almalence_features.xml similarity index 100% rename from res/layout/gui_almalence_features.xml rename to app/src/main/res/layout/gui_almalence_features.xml diff --git a/res/layout/gui_almalence_invisible_button.xml b/app/src/main/res/layout/gui_almalence_invisible_button.xml similarity index 100% rename from res/layout/gui_almalence_invisible_button.xml rename to app/src/main/res/layout/gui_almalence_invisible_button.xml diff --git a/res/layout/gui_almalence_layout.xml b/app/src/main/res/layout/gui_almalence_layout.xml similarity index 100% rename from res/layout/gui_almalence_layout.xml rename to app/src/main/res/layout/gui_almalence_layout.xml diff --git a/res/layout/gui_almalence_pager_fragment.xml b/app/src/main/res/layout/gui_almalence_pager_fragment.xml similarity index 100% rename from res/layout/gui_almalence_pager_fragment.xml rename to app/src/main/res/layout/gui_almalence_pager_fragment.xml diff --git a/res/layout/gui_almalence_panel.xml b/app/src/main/res/layout/gui_almalence_panel.xml similarity index 100% rename from res/layout/gui_almalence_panel.xml rename to app/src/main/res/layout/gui_almalence_panel.xml diff --git a/res/layout/gui_almalence_quick_control_button.xml b/app/src/main/res/layout/gui_almalence_quick_control_button.xml similarity index 100% rename from res/layout/gui_almalence_quick_control_button.xml rename to app/src/main/res/layout/gui_almalence_quick_control_button.xml diff --git a/res/layout/gui_almalence_quick_control_grid_element.xml b/app/src/main/res/layout/gui_almalence_quick_control_grid_element.xml similarity index 100% rename from res/layout/gui_almalence_quick_control_grid_element.xml rename to app/src/main/res/layout/gui_almalence_quick_control_grid_element.xml diff --git a/res/layout/gui_almalence_select_mode_grid_element.xml b/app/src/main/res/layout/gui_almalence_select_mode_grid_element.xml similarity index 100% rename from res/layout/gui_almalence_select_mode_grid_element.xml rename to app/src/main/res/layout/gui_almalence_select_mode_grid_element.xml diff --git a/res/layout/gui_almalence_store.xml b/app/src/main/res/layout/gui_almalence_store.xml similarity index 100% rename from res/layout/gui_almalence_store.xml rename to app/src/main/res/layout/gui_almalence_store.xml diff --git a/res/layout/gui_almalence_store_grid_element.xml b/app/src/main/res/layout/gui_almalence_store_grid_element.xml similarity index 100% rename from res/layout/gui_almalence_store_grid_element.xml rename to app/src/main/res/layout/gui_almalence_store_grid_element.xml diff --git a/res/layout/gui_almalence_tips.xml b/app/src/main/res/layout/gui_almalence_tips.xml similarity index 100% rename from res/layout/gui_almalence_tips.xml rename to app/src/main/res/layout/gui_almalence_tips.xml diff --git a/res/layout/gui_almalence_whatsnew.xml b/app/src/main/res/layout/gui_almalence_whatsnew.xml similarity index 100% rename from res/layout/gui_almalence_whatsnew.xml rename to app/src/main/res/layout/gui_almalence_whatsnew.xml diff --git a/res/layout/opencamera_main_layout.xml b/app/src/main/res/layout/opencamera_main_layout.xml similarity index 100% rename from res/layout/opencamera_main_layout.xml rename to app/src/main/res/layout/opencamera_main_layout.xml diff --git a/res/layout/opencamera_processing_layout.xml b/app/src/main/res/layout/opencamera_processing_layout.xml similarity index 100% rename from res/layout/opencamera_processing_layout.xml rename to app/src/main/res/layout/opencamera_processing_layout.xml diff --git a/res/layout/opencamera_sony_device_discovery.xml b/app/src/main/res/layout/opencamera_sony_device_discovery.xml similarity index 100% rename from res/layout/opencamera_sony_device_discovery.xml rename to app/src/main/res/layout/opencamera_sony_device_discovery.xml diff --git a/res/layout/phototimelapse_dialog.xml b/app/src/main/res/layout/phototimelapse_dialog.xml similarity index 100% rename from res/layout/phototimelapse_dialog.xml rename to app/src/main/res/layout/phototimelapse_dialog.xml diff --git a/res/layout/plugin_capture_night_modeswitcher.xml b/app/src/main/res/layout/plugin_capture_night_modeswitcher.xml similarity index 100% rename from res/layout/plugin_capture_night_modeswitcher.xml rename to app/src/main/res/layout/plugin_capture_night_modeswitcher.xml diff --git a/res/layout/plugin_capture_photo_timelapse_layout.xml b/app/src/main/res/layout/plugin_capture_photo_timelapse_layout.xml similarity index 100% rename from res/layout/plugin_capture_photo_timelapse_layout.xml rename to app/src/main/res/layout/plugin_capture_photo_timelapse_layout.xml diff --git a/res/layout/plugin_capture_preshot_modeswitcher.xml b/app/src/main/res/layout/plugin_capture_preshot_modeswitcher.xml similarity index 100% rename from res/layout/plugin_capture_preshot_modeswitcher.xml rename to app/src/main/res/layout/plugin_capture_preshot_modeswitcher.xml diff --git a/res/layout/plugin_capture_selftimer_layout.xml b/app/src/main/res/layout/plugin_capture_selftimer_layout.xml similarity index 100% rename from res/layout/plugin_capture_selftimer_layout.xml rename to app/src/main/res/layout/plugin_capture_selftimer_layout.xml diff --git a/res/layout/plugin_capture_standard_modeswitcher.xml b/app/src/main/res/layout/plugin_capture_standard_modeswitcher.xml similarity index 100% rename from res/layout/plugin_capture_standard_modeswitcher.xml rename to app/src/main/res/layout/plugin_capture_standard_modeswitcher.xml diff --git a/res/layout/plugin_capture_video_lanscaperotate_layout.xml b/app/src/main/res/layout/plugin_capture_video_lanscaperotate_layout.xml similarity index 100% rename from res/layout/plugin_capture_video_lanscaperotate_layout.xml rename to app/src/main/res/layout/plugin_capture_video_lanscaperotate_layout.xml diff --git a/res/layout/plugin_capture_video_layout.xml b/app/src/main/res/layout/plugin_capture_video_layout.xml similarity index 100% rename from res/layout/plugin_capture_video_layout.xml rename to app/src/main/res/layout/plugin_capture_video_layout.xml diff --git a/res/layout/plugin_capture_video_timelapse_dialog.xml b/app/src/main/res/layout/plugin_capture_video_timelapse_dialog.xml similarity index 100% rename from res/layout/plugin_capture_video_timelapse_dialog.xml rename to app/src/main/res/layout/plugin_capture_video_timelapse_dialog.xml diff --git a/res/layout/plugin_export_gps.xml b/app/src/main/res/layout/plugin_export_gps.xml similarity index 100% rename from res/layout/plugin_export_gps.xml rename to app/src/main/res/layout/plugin_export_gps.xml diff --git a/res/layout/plugin_processing_backintime_layout.xml b/app/src/main/res/layout/plugin_processing_backintime_layout.xml similarity index 100% rename from res/layout/plugin_processing_backintime_layout.xml rename to app/src/main/res/layout/plugin_processing_backintime_layout.xml diff --git a/res/layout/plugin_processing_groupshot_postprocessing.xml b/app/src/main/res/layout/plugin_processing_groupshot_postprocessing.xml similarity index 100% rename from res/layout/plugin_processing_groupshot_postprocessing.xml rename to app/src/main/res/layout/plugin_processing_groupshot_postprocessing.xml diff --git a/res/layout/plugin_processing_hdr_adjustments.xml b/app/src/main/res/layout/plugin_processing_hdr_adjustments.xml similarity index 100% rename from res/layout/plugin_processing_hdr_adjustments.xml rename to app/src/main/res/layout/plugin_processing_hdr_adjustments.xml diff --git a/res/layout/plugin_processing_hdr_adjustments_preset_cell.xml b/app/src/main/res/layout/plugin_processing_hdr_adjustments_preset_cell.xml similarity index 100% rename from res/layout/plugin_processing_hdr_adjustments_preset_cell.xml rename to app/src/main/res/layout/plugin_processing_hdr_adjustments_preset_cell.xml diff --git a/res/layout/plugin_processing_multishot_options_layout.xml b/app/src/main/res/layout/plugin_processing_multishot_options_layout.xml similarity index 100% rename from res/layout/plugin_processing_multishot_options_layout.xml rename to app/src/main/res/layout/plugin_processing_multishot_options_layout.xml diff --git a/res/layout/plugin_processing_objectremoval_postprocessing.xml b/app/src/main/res/layout/plugin_processing_objectremoval_postprocessing.xml similarity index 100% rename from res/layout/plugin_processing_objectremoval_postprocessing.xml rename to app/src/main/res/layout/plugin_processing_objectremoval_postprocessing.xml diff --git a/res/layout/plugin_processing_preshot_postprocessing_layout.xml b/app/src/main/res/layout/plugin_processing_preshot_postprocessing_layout.xml similarity index 100% rename from res/layout/plugin_processing_preshot_postprocessing_layout.xml rename to app/src/main/res/layout/plugin_processing_preshot_postprocessing_layout.xml diff --git a/res/layout/plugin_processing_sequence_postprocessing.xml b/app/src/main/res/layout/plugin_processing_sequence_postprocessing.xml similarity index 100% rename from res/layout/plugin_processing_sequence_postprocessing.xml rename to app/src/main/res/layout/plugin_processing_sequence_postprocessing.xml diff --git a/res/layout/plugin_vf_aeawlock_layout.xml b/app/src/main/res/layout/plugin_vf_aeawlock_layout.xml similarity index 100% rename from res/layout/plugin_vf_aeawlock_layout.xml rename to app/src/main/res/layout/plugin_vf_aeawlock_layout.xml diff --git a/res/layout/plugin_vf_barcodescanner_layout.xml b/app/src/main/res/layout/plugin_vf_barcodescanner_layout.xml similarity index 100% rename from res/layout/plugin_vf_barcodescanner_layout.xml rename to app/src/main/res/layout/plugin_vf_barcodescanner_layout.xml diff --git a/res/layout/plugin_vf_barcodescanner_list_layout.xml b/app/src/main/res/layout/plugin_vf_barcodescanner_list_layout.xml similarity index 100% rename from res/layout/plugin_vf_barcodescanner_list_layout.xml rename to app/src/main/res/layout/plugin_vf_barcodescanner_list_layout.xml diff --git a/res/layout/plugin_vf_barcodescanner_view_layout.xml b/app/src/main/res/layout/plugin_vf_barcodescanner_view_layout.xml similarity index 100% rename from res/layout/plugin_vf_barcodescanner_view_layout.xml rename to app/src/main/res/layout/plugin_vf_barcodescanner_view_layout.xml diff --git a/res/layout/plugin_vf_barcodescanner_view_layout_landscape.xml b/app/src/main/res/layout/plugin_vf_barcodescanner_view_layout_landscape.xml similarity index 100% rename from res/layout/plugin_vf_barcodescanner_view_layout_landscape.xml rename to app/src/main/res/layout/plugin_vf_barcodescanner_view_layout_landscape.xml diff --git a/res/layout/plugin_vf_focus_layout.xml b/app/src/main/res/layout/plugin_vf_focus_layout.xml similarity index 100% rename from res/layout/plugin_vf_focus_layout.xml rename to app/src/main/res/layout/plugin_vf_focus_layout.xml diff --git a/res/layout/plugin_vf_gyro_layout.xml b/app/src/main/res/layout/plugin_vf_gyro_layout.xml similarity index 100% rename from res/layout/plugin_vf_gyro_layout.xml rename to app/src/main/res/layout/plugin_vf_gyro_layout.xml diff --git a/res/layout/plugin_vf_infoset_icon.xml b/app/src/main/res/layout/plugin_vf_infoset_icon.xml similarity index 100% rename from res/layout/plugin_vf_infoset_icon.xml rename to app/src/main/res/layout/plugin_vf_infoset_icon.xml diff --git a/res/layout/plugin_vf_infoset_text.xml b/app/src/main/res/layout/plugin_vf_infoset_text.xml similarity index 100% rename from res/layout/plugin_vf_infoset_text.xml rename to app/src/main/res/layout/plugin_vf_infoset_text.xml diff --git a/res/layout/plugin_vf_zoom_layout.xml b/app/src/main/res/layout/plugin_vf_zoom_layout.xml similarity index 100% rename from res/layout/plugin_vf_zoom_layout.xml rename to app/src/main/res/layout/plugin_vf_zoom_layout.xml diff --git a/res/layout/quick_setting_dialog.xml b/app/src/main/res/layout/quick_setting_dialog.xml similarity index 100% rename from res/layout/quick_setting_dialog.xml rename to app/src/main/res/layout/quick_setting_dialog.xml diff --git a/res/layout/selftimer_and_phototimelapse_dialog.xml b/app/src/main/res/layout/selftimer_and_phototimelapse_dialog.xml similarity index 100% rename from res/layout/selftimer_and_phototimelapse_dialog.xml rename to app/src/main/res/layout/selftimer_and_phototimelapse_dialog.xml diff --git a/res/layout/selftimer_capture_layout.xml b/app/src/main/res/layout/selftimer_capture_layout.xml similarity index 100% rename from res/layout/selftimer_capture_layout.xml rename to app/src/main/res/layout/selftimer_capture_layout.xml diff --git a/res/layout/selftimer_dialog.xml b/app/src/main/res/layout/selftimer_dialog.xml similarity index 100% rename from res/layout/selftimer_dialog.xml rename to app/src/main/res/layout/selftimer_dialog.xml diff --git a/res/layout/simple_list_item_single_choice.xml b/app/src/main/res/layout/simple_list_item_single_choice.xml similarity index 100% rename from res/layout/simple_list_item_single_choice.xml rename to app/src/main/res/layout/simple_list_item_single_choice.xml diff --git a/res/layout/widget_opencamera_column_1.xml b/app/src/main/res/layout/widget_opencamera_column_1.xml similarity index 100% rename from res/layout/widget_opencamera_column_1.xml rename to app/src/main/res/layout/widget_opencamera_column_1.xml diff --git a/res/layout/widget_opencamera_column_2.xml b/app/src/main/res/layout/widget_opencamera_column_2.xml similarity index 100% rename from res/layout/widget_opencamera_column_2.xml rename to app/src/main/res/layout/widget_opencamera_column_2.xml diff --git a/res/layout/widget_opencamera_column_3.xml b/app/src/main/res/layout/widget_opencamera_column_3.xml similarity index 100% rename from res/layout/widget_opencamera_column_3.xml rename to app/src/main/res/layout/widget_opencamera_column_3.xml diff --git a/res/layout/widget_opencamera_column_4.xml b/app/src/main/res/layout/widget_opencamera_column_4.xml similarity index 100% rename from res/layout/widget_opencamera_column_4.xml rename to app/src/main/res/layout/widget_opencamera_column_4.xml diff --git a/res/layout/widget_opencamera_configure.xml b/app/src/main/res/layout/widget_opencamera_configure.xml similarity index 100% rename from res/layout/widget_opencamera_configure.xml rename to app/src/main/res/layout/widget_opencamera_configure.xml diff --git a/res/layout/widget_opencamera_full_solid.xml b/app/src/main/res/layout/widget_opencamera_full_solid.xml similarity index 100% rename from res/layout/widget_opencamera_full_solid.xml rename to app/src/main/res/layout/widget_opencamera_full_solid.xml diff --git a/res/layout/widget_opencamera_full_solid_mode_grid_element.xml b/app/src/main/res/layout/widget_opencamera_full_solid_mode_grid_element.xml similarity index 100% rename from res/layout/widget_opencamera_full_solid_mode_grid_element.xml rename to app/src/main/res/layout/widget_opencamera_full_solid_mode_grid_element.xml diff --git a/res/layout/widget_opencamera_launcher.xml b/app/src/main/res/layout/widget_opencamera_launcher.xml similarity index 100% rename from res/layout/widget_opencamera_launcher.xml rename to app/src/main/res/layout/widget_opencamera_launcher.xml diff --git a/res/layout/widget_opencamera_mode_grid_element.xml b/app/src/main/res/layout/widget_opencamera_mode_grid_element.xml similarity index 100% rename from res/layout/widget_opencamera_mode_grid_element.xml rename to app/src/main/res/layout/widget_opencamera_mode_grid_element.xml diff --git a/res/layout/widget_opencamera_mode_list_element.xml b/app/src/main/res/layout/widget_opencamera_mode_list_element.xml similarity index 100% rename from res/layout/widget_opencamera_mode_list_element.xml rename to app/src/main/res/layout/widget_opencamera_mode_list_element.xml diff --git a/res/layout/widget_opencamera_shop_dialog.xml b/app/src/main/res/layout/widget_opencamera_shop_dialog.xml similarity index 100% rename from res/layout/widget_opencamera_shop_dialog.xml rename to app/src/main/res/layout/widget_opencamera_shop_dialog.xml diff --git a/res/layout/widget_opencamera_solid.xml b/app/src/main/res/layout/widget_opencamera_solid.xml similarity index 100% rename from res/layout/widget_opencamera_solid.xml rename to app/src/main/res/layout/widget_opencamera_solid.xml diff --git a/res/layout/widget_opencamera_solid_configure.xml b/app/src/main/res/layout/widget_opencamera_solid_configure.xml similarity index 100% rename from res/layout/widget_opencamera_solid_configure.xml rename to app/src/main/res/layout/widget_opencamera_solid_configure.xml diff --git a/res/layout/widget_opencamera_solid_loading.xml b/app/src/main/res/layout/widget_opencamera_solid_loading.xml similarity index 100% rename from res/layout/widget_opencamera_solid_loading.xml rename to app/src/main/res/layout/widget_opencamera_solid_loading.xml diff --git a/res/layout/widget_opencamera_solid_mode_grid_element.xml b/app/src/main/res/layout/widget_opencamera_solid_mode_grid_element.xml similarity index 100% rename from res/layout/widget_opencamera_solid_mode_grid_element.xml rename to app/src/main/res/layout/widget_opencamera_solid_mode_grid_element.xml diff --git a/res/menu/context_menu_plugin_vf_barcodescanner.xml b/app/src/main/res/menu/context_menu_plugin_vf_barcodescanner.xml similarity index 100% rename from res/menu/context_menu_plugin_vf_barcodescanner.xml rename to app/src/main/res/menu/context_menu_plugin_vf_barcodescanner.xml diff --git a/res/raw/plugin_capture_night_tack.wav b/app/src/main/res/raw/plugin_capture_night_tack.wav similarity index 100% rename from res/raw/plugin_capture_night_tack.wav rename to app/src/main/res/raw/plugin_capture_night_tack.wav diff --git a/res/raw/plugin_capture_selftimer_countdown.ogg b/app/src/main/res/raw/plugin_capture_selftimer_countdown.ogg similarity index 100% rename from res/raw/plugin_capture_selftimer_countdown.ogg rename to app/src/main/res/raw/plugin_capture_selftimer_countdown.ogg diff --git a/res/raw/plugin_capture_selftimer_finalcountdown.ogg b/app/src/main/res/raw/plugin_capture_selftimer_finalcountdown.ogg similarity index 100% rename from res/raw/plugin_capture_selftimer_finalcountdown.ogg rename to app/src/main/res/raw/plugin_capture_selftimer_finalcountdown.ogg diff --git a/res/raw/plugin_capture_tick.wav b/app/src/main/res/raw/plugin_capture_tick.wav similarity index 100% rename from res/raw/plugin_capture_tick.wav rename to app/src/main/res/raw/plugin_capture_tick.wav diff --git a/res/raw/plugin_vf_focus_false.ogg b/app/src/main/res/raw/plugin_vf_focus_false.ogg similarity index 100% rename from res/raw/plugin_vf_focus_false.ogg rename to app/src/main/res/raw/plugin_vf_focus_false.ogg diff --git a/res/raw/plugin_vf_focus_ok.ogg b/app/src/main/res/raw/plugin_vf_focus_ok.ogg similarity index 100% rename from res/raw/plugin_vf_focus_ok.ogg rename to app/src/main/res/raw/plugin_vf_focus_ok.ogg diff --git a/res/values-ar-rEG/description.xml b/app/src/main/res/values-ar-rEG/description.xml similarity index 100% rename from res/values-ar-rEG/description.xml rename to app/src/main/res/values-ar-rEG/description.xml diff --git a/res/values-ar-rEG/strings_almalence_gui.xml b/app/src/main/res/values-ar-rEG/strings_almalence_gui.xml similarity index 100% rename from res/values-ar-rEG/strings_almalence_gui.xml rename to app/src/main/res/values-ar-rEG/strings_almalence_gui.xml diff --git a/res/values-ar-rEG/strings_modes.xml b/app/src/main/res/values-ar-rEG/strings_modes.xml similarity index 100% rename from res/values-ar-rEG/strings_modes.xml rename to app/src/main/res/values-ar-rEG/strings_modes.xml diff --git a/res/values-ar-rEG/strings_opencamera.xml b/app/src/main/res/values-ar-rEG/strings_opencamera.xml similarity index 100% rename from res/values-ar-rEG/strings_opencamera.xml rename to app/src/main/res/values-ar-rEG/strings_opencamera.xml diff --git a/res/values-ar-rEG/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-ar-rEG/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_capture_bestshot.xml diff --git a/res/values-ar-rEG/strings_plugin_capture_burst.xml b/app/src/main/res/values-ar-rEG/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_capture_burst.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_capture_burst.xml diff --git a/res/values-ar-rEG/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-ar-rEG/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_capture_expobracketing.xml diff --git a/res/values-ar-rEG/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-ar-rEG/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-ar-rEG/strings_plugin_capture_multishot.xml b/app/src/main/res/values-ar-rEG/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_capture_multishot.xml diff --git a/res/values-ar-rEG/strings_plugin_capture_night.xml b/app/src/main/res/values-ar-rEG/strings_plugin_capture_night.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_capture_night.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_capture_night.xml diff --git a/res/values-ar-rEG/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-ar-rEG/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-ar-rEG/strings_plugin_capture_preshot.xml b/app/src/main/res/values-ar-rEG/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_capture_preshot.xml diff --git a/res/values-ar-rEG/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-ar-rEG/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_capture_selftimer.xml diff --git a/res/values-ar-rEG/strings_plugin_capture_video.xml b/app/src/main/res/values-ar-rEG/strings_plugin_capture_video.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_capture_video.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_capture_video.xml diff --git a/res/values-ar-rEG/strings_plugin_export_common.xml b/app/src/main/res/values-ar-rEG/strings_plugin_export_common.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_export_common.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_export_common.xml diff --git a/res/values-ar-rEG/strings_plugin_export_export.xml b/app/src/main/res/values-ar-rEG/strings_plugin_export_export.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_export_export.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_export_export.xml diff --git a/res/values-ar-rEG/strings_plugin_preferences.xml b/app/src/main/res/values-ar-rEG/strings_plugin_preferences.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_preferences.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_preferences.xml diff --git a/res/values-ar-rEG/strings_plugin_processing_hdr.xml b/app/src/main/res/values-ar-rEG/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_processing_hdr.xml diff --git a/res/values-ar-rEG/strings_plugin_processing_multishot.xml b/app/src/main/res/values-ar-rEG/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_processing_multishot.xml diff --git a/res/values-ar-rEG/strings_plugin_processing_night.xml b/app/src/main/res/values-ar-rEG/strings_plugin_processing_night.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_processing_night.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_processing_night.xml diff --git a/res/values-ar-rEG/strings_plugin_processing_panorama.xml b/app/src/main/res/values-ar-rEG/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_processing_panorama.xml diff --git a/res/values-ar-rEG/strings_plugin_processing_preshot.xml b/app/src/main/res/values-ar-rEG/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_processing_preshot.xml diff --git a/res/values-ar-rEG/strings_plugin_processing_processing.xml b/app/src/main/res/values-ar-rEG/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_processing_processing.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_processing_processing.xml diff --git a/res/values-ar-rEG/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-ar-rEG/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_vf_aeawlock.xml diff --git a/res/values-ar-rEG/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-ar-rEG/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-ar-rEG/strings_plugin_vf_common.xml b/app/src/main/res/values-ar-rEG/strings_plugin_vf_common.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_vf_common.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_vf_common.xml diff --git a/res/values-ar-rEG/strings_plugin_vf_focus.xml b/app/src/main/res/values-ar-rEG/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_vf_focus.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_vf_focus.xml diff --git a/res/values-ar-rEG/strings_plugin_vf_grid.xml b/app/src/main/res/values-ar-rEG/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_vf_grid.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_vf_grid.xml diff --git a/res/values-ar-rEG/strings_plugin_vf_gyro.xml b/app/src/main/res/values-ar-rEG/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_vf_gyro.xml diff --git a/res/values-ar-rEG/strings_plugin_vf_histogram.xml b/app/src/main/res/values-ar-rEG/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_vf_histogram.xml diff --git a/res/values-ar-rEG/strings_plugin_vf_infoset.xml b/app/src/main/res/values-ar-rEG/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_vf_infoset.xml diff --git a/res/values-ar-rEG/strings_plugin_vf_zoom.xml b/app/src/main/res/values-ar-rEG/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-ar-rEG/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-ar-rEG/strings_plugin_vf_zoom.xml diff --git a/res/values-ar-rEG/strings_preferences_modes.xml b/app/src/main/res/values-ar-rEG/strings_preferences_modes.xml similarity index 100% rename from res/values-ar-rEG/strings_preferences_modes.xml rename to app/src/main/res/values-ar-rEG/strings_preferences_modes.xml diff --git a/res/values-ar-rEG/strings_preferences_upgrade.xml b/app/src/main/res/values-ar-rEG/strings_preferences_upgrade.xml similarity index 100% rename from res/values-ar-rEG/strings_preferences_upgrade.xml rename to app/src/main/res/values-ar-rEG/strings_preferences_upgrade.xml diff --git a/res/values-ar-rEG/strings_widget.xml b/app/src/main/res/values-ar-rEG/strings_widget.xml similarity index 100% rename from res/values-ar-rEG/strings_widget.xml rename to app/src/main/res/values-ar-rEG/strings_widget.xml diff --git a/res/values-az-rAZ/strings_almalence_gui.xml b/app/src/main/res/values-az-rAZ/strings_almalence_gui.xml similarity index 100% rename from res/values-az-rAZ/strings_almalence_gui.xml rename to app/src/main/res/values-az-rAZ/strings_almalence_gui.xml diff --git a/res/values-az-rAZ/strings_modes.xml b/app/src/main/res/values-az-rAZ/strings_modes.xml similarity index 100% rename from res/values-az-rAZ/strings_modes.xml rename to app/src/main/res/values-az-rAZ/strings_modes.xml diff --git a/res/values-az-rAZ/strings_opencamera.xml b/app/src/main/res/values-az-rAZ/strings_opencamera.xml similarity index 100% rename from res/values-az-rAZ/strings_opencamera.xml rename to app/src/main/res/values-az-rAZ/strings_opencamera.xml diff --git a/res/values-az-rAZ/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-az-rAZ/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_capture_bestshot.xml diff --git a/res/values-az-rAZ/strings_plugin_capture_burst.xml b/app/src/main/res/values-az-rAZ/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_capture_burst.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_capture_burst.xml diff --git a/res/values-az-rAZ/strings_plugin_capture_dro.xml b/app/src/main/res/values-az-rAZ/strings_plugin_capture_dro.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_capture_dro.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_capture_dro.xml diff --git a/res/values-az-rAZ/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-az-rAZ/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_capture_expobracketing.xml diff --git a/res/values-az-rAZ/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-az-rAZ/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-az-rAZ/strings_plugin_capture_multishot.xml b/app/src/main/res/values-az-rAZ/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_capture_multishot.xml diff --git a/res/values-az-rAZ/strings_plugin_capture_night.xml b/app/src/main/res/values-az-rAZ/strings_plugin_capture_night.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_capture_night.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_capture_night.xml diff --git a/res/values-az-rAZ/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-az-rAZ/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-az-rAZ/strings_plugin_capture_preshot.xml b/app/src/main/res/values-az-rAZ/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_capture_preshot.xml diff --git a/res/values-az-rAZ/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-az-rAZ/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_capture_selftimer.xml diff --git a/res/values-az-rAZ/strings_plugin_capture_video.xml b/app/src/main/res/values-az-rAZ/strings_plugin_capture_video.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_capture_video.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_capture_video.xml diff --git a/res/values-az-rAZ/strings_plugin_export_export.xml b/app/src/main/res/values-az-rAZ/strings_plugin_export_export.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_export_export.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_export_export.xml diff --git a/res/values-az-rAZ/strings_plugin_preferences.xml b/app/src/main/res/values-az-rAZ/strings_plugin_preferences.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_preferences.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_preferences.xml diff --git a/res/values-az-rAZ/strings_plugin_processing_hdr.xml b/app/src/main/res/values-az-rAZ/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_processing_hdr.xml diff --git a/res/values-az-rAZ/strings_plugin_processing_multishot.xml b/app/src/main/res/values-az-rAZ/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_processing_multishot.xml diff --git a/res/values-az-rAZ/strings_plugin_processing_night.xml b/app/src/main/res/values-az-rAZ/strings_plugin_processing_night.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_processing_night.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_processing_night.xml diff --git a/res/values-az-rAZ/strings_plugin_processing_panorama.xml b/app/src/main/res/values-az-rAZ/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_processing_panorama.xml diff --git a/res/values-az-rAZ/strings_plugin_processing_preshot.xml b/app/src/main/res/values-az-rAZ/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_processing_preshot.xml diff --git a/res/values-az-rAZ/strings_plugin_processing_processing.xml b/app/src/main/res/values-az-rAZ/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_processing_processing.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_processing_processing.xml diff --git a/res/values-az-rAZ/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-az-rAZ/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_vf_aeawlock.xml diff --git a/res/values-az-rAZ/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-az-rAZ/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-az-rAZ/strings_plugin_vf_common.xml b/app/src/main/res/values-az-rAZ/strings_plugin_vf_common.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_vf_common.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_vf_common.xml diff --git a/res/values-az-rAZ/strings_plugin_vf_focus.xml b/app/src/main/res/values-az-rAZ/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_vf_focus.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_vf_focus.xml diff --git a/res/values-az-rAZ/strings_plugin_vf_grid.xml b/app/src/main/res/values-az-rAZ/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_vf_grid.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_vf_grid.xml diff --git a/res/values-az-rAZ/strings_plugin_vf_gyro.xml b/app/src/main/res/values-az-rAZ/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_vf_gyro.xml diff --git a/res/values-az-rAZ/strings_plugin_vf_histogram.xml b/app/src/main/res/values-az-rAZ/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_vf_histogram.xml diff --git a/res/values-az-rAZ/strings_plugin_vf_infoset.xml b/app/src/main/res/values-az-rAZ/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_vf_infoset.xml diff --git a/res/values-az-rAZ/strings_plugin_vf_zoom.xml b/app/src/main/res/values-az-rAZ/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-az-rAZ/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-az-rAZ/strings_plugin_vf_zoom.xml diff --git a/res/values-az-rAZ/strings_preferences_modes.xml b/app/src/main/res/values-az-rAZ/strings_preferences_modes.xml similarity index 100% rename from res/values-az-rAZ/strings_preferences_modes.xml rename to app/src/main/res/values-az-rAZ/strings_preferences_modes.xml diff --git a/res/values-az-rAZ/strings_preferences_upgrade.xml b/app/src/main/res/values-az-rAZ/strings_preferences_upgrade.xml similarity index 100% rename from res/values-az-rAZ/strings_preferences_upgrade.xml rename to app/src/main/res/values-az-rAZ/strings_preferences_upgrade.xml diff --git a/res/values-az-rAZ/strings_widget.xml b/app/src/main/res/values-az-rAZ/strings_widget.xml similarity index 100% rename from res/values-az-rAZ/strings_widget.xml rename to app/src/main/res/values-az-rAZ/strings_widget.xml diff --git a/res/values-cs-rCZ/description.xml b/app/src/main/res/values-cs-rCZ/description.xml similarity index 100% rename from res/values-cs-rCZ/description.xml rename to app/src/main/res/values-cs-rCZ/description.xml diff --git a/res/values-cs-rCZ/strings_almalence_gui.xml b/app/src/main/res/values-cs-rCZ/strings_almalence_gui.xml similarity index 100% rename from res/values-cs-rCZ/strings_almalence_gui.xml rename to app/src/main/res/values-cs-rCZ/strings_almalence_gui.xml diff --git a/res/values-cs-rCZ/strings_modes.xml b/app/src/main/res/values-cs-rCZ/strings_modes.xml similarity index 100% rename from res/values-cs-rCZ/strings_modes.xml rename to app/src/main/res/values-cs-rCZ/strings_modes.xml diff --git a/res/values-cs-rCZ/strings_opencamera.xml b/app/src/main/res/values-cs-rCZ/strings_opencamera.xml similarity index 100% rename from res/values-cs-rCZ/strings_opencamera.xml rename to app/src/main/res/values-cs-rCZ/strings_opencamera.xml diff --git a/res/values-cs-rCZ/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_capture_bestshot.xml diff --git a/res/values-cs-rCZ/strings_plugin_capture_burst.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_capture_burst.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_capture_burst.xml diff --git a/res/values-cs-rCZ/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_capture_expobracketing.xml diff --git a/res/values-cs-rCZ/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-cs-rCZ/strings_plugin_capture_multishot.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_capture_multishot.xml diff --git a/res/values-cs-rCZ/strings_plugin_capture_night.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_capture_night.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_capture_night.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_capture_night.xml diff --git a/res/values-cs-rCZ/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-cs-rCZ/strings_plugin_capture_preshot.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_capture_preshot.xml diff --git a/res/values-cs-rCZ/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_capture_selftimer.xml diff --git a/res/values-cs-rCZ/strings_plugin_capture_video.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_capture_video.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_capture_video.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_capture_video.xml diff --git a/res/values-cs-rCZ/strings_plugin_export_common.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_export_common.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_export_common.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_export_common.xml diff --git a/res/values-cs-rCZ/strings_plugin_export_export.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_export_export.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_export_export.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_export_export.xml diff --git a/res/values-cs-rCZ/strings_plugin_preferences.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_preferences.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_preferences.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_preferences.xml diff --git a/res/values-cs-rCZ/strings_plugin_processing_hdr.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_processing_hdr.xml diff --git a/res/values-cs-rCZ/strings_plugin_processing_multishot.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_processing_multishot.xml diff --git a/res/values-cs-rCZ/strings_plugin_processing_night.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_processing_night.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_processing_night.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_processing_night.xml diff --git a/res/values-cs-rCZ/strings_plugin_processing_panorama.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_processing_panorama.xml diff --git a/res/values-cs-rCZ/strings_plugin_processing_preshot.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_processing_preshot.xml diff --git a/res/values-cs-rCZ/strings_plugin_processing_processing.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_processing_processing.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_processing_processing.xml diff --git a/res/values-cs-rCZ/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_vf_aeawlock.xml diff --git a/res/values-cs-rCZ/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-cs-rCZ/strings_plugin_vf_common.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_vf_common.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_vf_common.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_vf_common.xml diff --git a/res/values-cs-rCZ/strings_plugin_vf_focus.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_vf_focus.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_vf_focus.xml diff --git a/res/values-cs-rCZ/strings_plugin_vf_grid.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_vf_grid.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_vf_grid.xml diff --git a/res/values-cs-rCZ/strings_plugin_vf_gyro.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_vf_gyro.xml diff --git a/res/values-cs-rCZ/strings_plugin_vf_histogram.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_vf_histogram.xml diff --git a/res/values-cs-rCZ/strings_plugin_vf_infoset.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_vf_infoset.xml diff --git a/res/values-cs-rCZ/strings_plugin_vf_zoom.xml b/app/src/main/res/values-cs-rCZ/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-cs-rCZ/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-cs-rCZ/strings_plugin_vf_zoom.xml diff --git a/res/values-cs-rCZ/strings_preferences_modes.xml b/app/src/main/res/values-cs-rCZ/strings_preferences_modes.xml similarity index 100% rename from res/values-cs-rCZ/strings_preferences_modes.xml rename to app/src/main/res/values-cs-rCZ/strings_preferences_modes.xml diff --git a/res/values-cs-rCZ/strings_preferences_upgrade.xml b/app/src/main/res/values-cs-rCZ/strings_preferences_upgrade.xml similarity index 100% rename from res/values-cs-rCZ/strings_preferences_upgrade.xml rename to app/src/main/res/values-cs-rCZ/strings_preferences_upgrade.xml diff --git a/res/values-cs-rCZ/strings_widget.xml b/app/src/main/res/values-cs-rCZ/strings_widget.xml similarity index 100% rename from res/values-cs-rCZ/strings_widget.xml rename to app/src/main/res/values-cs-rCZ/strings_widget.xml diff --git a/res/values-de/description.xml b/app/src/main/res/values-de/description.xml similarity index 100% rename from res/values-de/description.xml rename to app/src/main/res/values-de/description.xml diff --git a/res/values-de/strings_almalence_gui.xml b/app/src/main/res/values-de/strings_almalence_gui.xml similarity index 100% rename from res/values-de/strings_almalence_gui.xml rename to app/src/main/res/values-de/strings_almalence_gui.xml diff --git a/res/values-de/strings_modes.xml b/app/src/main/res/values-de/strings_modes.xml similarity index 100% rename from res/values-de/strings_modes.xml rename to app/src/main/res/values-de/strings_modes.xml diff --git a/res/values-de/strings_opencamera.xml b/app/src/main/res/values-de/strings_opencamera.xml similarity index 100% rename from res/values-de/strings_opencamera.xml rename to app/src/main/res/values-de/strings_opencamera.xml diff --git a/res/values-de/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-de/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-de/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-de/strings_plugin_capture_bestshot.xml diff --git a/res/values-de/strings_plugin_capture_burst.xml b/app/src/main/res/values-de/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-de/strings_plugin_capture_burst.xml rename to app/src/main/res/values-de/strings_plugin_capture_burst.xml diff --git a/res/values-de/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-de/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-de/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-de/strings_plugin_capture_expobracketing.xml diff --git a/res/values-de/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-de/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-de/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-de/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-de/strings_plugin_capture_multishot.xml b/app/src/main/res/values-de/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-de/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-de/strings_plugin_capture_multishot.xml diff --git a/res/values-de/strings_plugin_capture_night.xml b/app/src/main/res/values-de/strings_plugin_capture_night.xml similarity index 100% rename from res/values-de/strings_plugin_capture_night.xml rename to app/src/main/res/values-de/strings_plugin_capture_night.xml diff --git a/res/values-de/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-de/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-de/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-de/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-de/strings_plugin_capture_preshot.xml b/app/src/main/res/values-de/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-de/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-de/strings_plugin_capture_preshot.xml diff --git a/res/values-de/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-de/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-de/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-de/strings_plugin_capture_selftimer.xml diff --git a/res/values-de/strings_plugin_capture_video.xml b/app/src/main/res/values-de/strings_plugin_capture_video.xml similarity index 100% rename from res/values-de/strings_plugin_capture_video.xml rename to app/src/main/res/values-de/strings_plugin_capture_video.xml diff --git a/res/values-de/strings_plugin_export_common.xml b/app/src/main/res/values-de/strings_plugin_export_common.xml similarity index 100% rename from res/values-de/strings_plugin_export_common.xml rename to app/src/main/res/values-de/strings_plugin_export_common.xml diff --git a/res/values-de/strings_plugin_export_export.xml b/app/src/main/res/values-de/strings_plugin_export_export.xml similarity index 100% rename from res/values-de/strings_plugin_export_export.xml rename to app/src/main/res/values-de/strings_plugin_export_export.xml diff --git a/res/values-de/strings_plugin_preferences.xml b/app/src/main/res/values-de/strings_plugin_preferences.xml similarity index 100% rename from res/values-de/strings_plugin_preferences.xml rename to app/src/main/res/values-de/strings_plugin_preferences.xml diff --git a/res/values-de/strings_plugin_processing_hdr.xml b/app/src/main/res/values-de/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-de/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-de/strings_plugin_processing_hdr.xml diff --git a/res/values-de/strings_plugin_processing_multishot.xml b/app/src/main/res/values-de/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-de/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-de/strings_plugin_processing_multishot.xml diff --git a/res/values-de/strings_plugin_processing_night.xml b/app/src/main/res/values-de/strings_plugin_processing_night.xml similarity index 100% rename from res/values-de/strings_plugin_processing_night.xml rename to app/src/main/res/values-de/strings_plugin_processing_night.xml diff --git a/res/values-de/strings_plugin_processing_panorama.xml b/app/src/main/res/values-de/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-de/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-de/strings_plugin_processing_panorama.xml diff --git a/res/values-de/strings_plugin_processing_preshot.xml b/app/src/main/res/values-de/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-de/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-de/strings_plugin_processing_preshot.xml diff --git a/res/values-de/strings_plugin_processing_processing.xml b/app/src/main/res/values-de/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-de/strings_plugin_processing_processing.xml rename to app/src/main/res/values-de/strings_plugin_processing_processing.xml diff --git a/res/values-de/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-de/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-de/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-de/strings_plugin_vf_aeawlock.xml diff --git a/res/values-de/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-de/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-de/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-de/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-de/strings_plugin_vf_common.xml b/app/src/main/res/values-de/strings_plugin_vf_common.xml similarity index 100% rename from res/values-de/strings_plugin_vf_common.xml rename to app/src/main/res/values-de/strings_plugin_vf_common.xml diff --git a/res/values-de/strings_plugin_vf_focus.xml b/app/src/main/res/values-de/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-de/strings_plugin_vf_focus.xml rename to app/src/main/res/values-de/strings_plugin_vf_focus.xml diff --git a/res/values-de/strings_plugin_vf_grid.xml b/app/src/main/res/values-de/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-de/strings_plugin_vf_grid.xml rename to app/src/main/res/values-de/strings_plugin_vf_grid.xml diff --git a/res/values-de/strings_plugin_vf_gyro.xml b/app/src/main/res/values-de/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-de/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-de/strings_plugin_vf_gyro.xml diff --git a/res/values-de/strings_plugin_vf_histogram.xml b/app/src/main/res/values-de/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-de/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-de/strings_plugin_vf_histogram.xml diff --git a/res/values-de/strings_plugin_vf_infoset.xml b/app/src/main/res/values-de/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-de/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-de/strings_plugin_vf_infoset.xml diff --git a/res/values-de/strings_plugin_vf_zoom.xml b/app/src/main/res/values-de/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-de/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-de/strings_plugin_vf_zoom.xml diff --git a/res/values-de/strings_preferences_modes.xml b/app/src/main/res/values-de/strings_preferences_modes.xml similarity index 100% rename from res/values-de/strings_preferences_modes.xml rename to app/src/main/res/values-de/strings_preferences_modes.xml diff --git a/res/values-de/strings_preferences_upgrade.xml b/app/src/main/res/values-de/strings_preferences_upgrade.xml similarity index 100% rename from res/values-de/strings_preferences_upgrade.xml rename to app/src/main/res/values-de/strings_preferences_upgrade.xml diff --git a/res/values-de/strings_widget.xml b/app/src/main/res/values-de/strings_widget.xml similarity index 100% rename from res/values-de/strings_widget.xml rename to app/src/main/res/values-de/strings_widget.xml diff --git a/res/values-es/description.xml b/app/src/main/res/values-es/description.xml similarity index 100% rename from res/values-es/description.xml rename to app/src/main/res/values-es/description.xml diff --git a/res/values-es/strings_almalence_gui.xml b/app/src/main/res/values-es/strings_almalence_gui.xml similarity index 100% rename from res/values-es/strings_almalence_gui.xml rename to app/src/main/res/values-es/strings_almalence_gui.xml diff --git a/res/values-es/strings_modes.xml b/app/src/main/res/values-es/strings_modes.xml similarity index 100% rename from res/values-es/strings_modes.xml rename to app/src/main/res/values-es/strings_modes.xml diff --git a/res/values-es/strings_opencamera.xml b/app/src/main/res/values-es/strings_opencamera.xml similarity index 100% rename from res/values-es/strings_opencamera.xml rename to app/src/main/res/values-es/strings_opencamera.xml diff --git a/res/values-es/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-es/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-es/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-es/strings_plugin_capture_bestshot.xml diff --git a/res/values-es/strings_plugin_capture_burst.xml b/app/src/main/res/values-es/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-es/strings_plugin_capture_burst.xml rename to app/src/main/res/values-es/strings_plugin_capture_burst.xml diff --git a/res/values-es/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-es/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-es/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-es/strings_plugin_capture_expobracketing.xml diff --git a/res/values-es/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-es/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-es/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-es/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-es/strings_plugin_capture_multishot.xml b/app/src/main/res/values-es/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-es/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-es/strings_plugin_capture_multishot.xml diff --git a/res/values-es/strings_plugin_capture_night.xml b/app/src/main/res/values-es/strings_plugin_capture_night.xml similarity index 100% rename from res/values-es/strings_plugin_capture_night.xml rename to app/src/main/res/values-es/strings_plugin_capture_night.xml diff --git a/res/values-es/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-es/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-es/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-es/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-es/strings_plugin_capture_preshot.xml b/app/src/main/res/values-es/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-es/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-es/strings_plugin_capture_preshot.xml diff --git a/res/values-es/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-es/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-es/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-es/strings_plugin_capture_selftimer.xml diff --git a/res/values-es/strings_plugin_capture_video.xml b/app/src/main/res/values-es/strings_plugin_capture_video.xml similarity index 100% rename from res/values-es/strings_plugin_capture_video.xml rename to app/src/main/res/values-es/strings_plugin_capture_video.xml diff --git a/res/values-es/strings_plugin_export_common.xml b/app/src/main/res/values-es/strings_plugin_export_common.xml similarity index 100% rename from res/values-es/strings_plugin_export_common.xml rename to app/src/main/res/values-es/strings_plugin_export_common.xml diff --git a/res/values-es/strings_plugin_export_export.xml b/app/src/main/res/values-es/strings_plugin_export_export.xml similarity index 100% rename from res/values-es/strings_plugin_export_export.xml rename to app/src/main/res/values-es/strings_plugin_export_export.xml diff --git a/res/values-es/strings_plugin_preferences.xml b/app/src/main/res/values-es/strings_plugin_preferences.xml similarity index 100% rename from res/values-es/strings_plugin_preferences.xml rename to app/src/main/res/values-es/strings_plugin_preferences.xml diff --git a/res/values-es/strings_plugin_processing_hdr.xml b/app/src/main/res/values-es/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-es/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-es/strings_plugin_processing_hdr.xml diff --git a/res/values-es/strings_plugin_processing_multishot.xml b/app/src/main/res/values-es/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-es/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-es/strings_plugin_processing_multishot.xml diff --git a/res/values-es/strings_plugin_processing_night.xml b/app/src/main/res/values-es/strings_plugin_processing_night.xml similarity index 100% rename from res/values-es/strings_plugin_processing_night.xml rename to app/src/main/res/values-es/strings_plugin_processing_night.xml diff --git a/res/values-es/strings_plugin_processing_panorama.xml b/app/src/main/res/values-es/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-es/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-es/strings_plugin_processing_panorama.xml diff --git a/res/values-es/strings_plugin_processing_preshot.xml b/app/src/main/res/values-es/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-es/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-es/strings_plugin_processing_preshot.xml diff --git a/res/values-es/strings_plugin_processing_processing.xml b/app/src/main/res/values-es/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-es/strings_plugin_processing_processing.xml rename to app/src/main/res/values-es/strings_plugin_processing_processing.xml diff --git a/res/values-es/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-es/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-es/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-es/strings_plugin_vf_aeawlock.xml diff --git a/res/values-es/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-es/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-es/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-es/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-es/strings_plugin_vf_common.xml b/app/src/main/res/values-es/strings_plugin_vf_common.xml similarity index 100% rename from res/values-es/strings_plugin_vf_common.xml rename to app/src/main/res/values-es/strings_plugin_vf_common.xml diff --git a/res/values-es/strings_plugin_vf_focus.xml b/app/src/main/res/values-es/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-es/strings_plugin_vf_focus.xml rename to app/src/main/res/values-es/strings_plugin_vf_focus.xml diff --git a/res/values-es/strings_plugin_vf_grid.xml b/app/src/main/res/values-es/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-es/strings_plugin_vf_grid.xml rename to app/src/main/res/values-es/strings_plugin_vf_grid.xml diff --git a/res/values-es/strings_plugin_vf_gyro.xml b/app/src/main/res/values-es/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-es/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-es/strings_plugin_vf_gyro.xml diff --git a/res/values-es/strings_plugin_vf_histogram.xml b/app/src/main/res/values-es/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-es/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-es/strings_plugin_vf_histogram.xml diff --git a/res/values-es/strings_plugin_vf_infoset.xml b/app/src/main/res/values-es/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-es/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-es/strings_plugin_vf_infoset.xml diff --git a/res/values-es/strings_plugin_vf_zoom.xml b/app/src/main/res/values-es/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-es/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-es/strings_plugin_vf_zoom.xml diff --git a/res/values-es/strings_preferences_modes.xml b/app/src/main/res/values-es/strings_preferences_modes.xml similarity index 100% rename from res/values-es/strings_preferences_modes.xml rename to app/src/main/res/values-es/strings_preferences_modes.xml diff --git a/res/values-es/strings_preferences_upgrade.xml b/app/src/main/res/values-es/strings_preferences_upgrade.xml similarity index 100% rename from res/values-es/strings_preferences_upgrade.xml rename to app/src/main/res/values-es/strings_preferences_upgrade.xml diff --git a/res/values-es/strings_widget.xml b/app/src/main/res/values-es/strings_widget.xml similarity index 100% rename from res/values-es/strings_widget.xml rename to app/src/main/res/values-es/strings_widget.xml diff --git a/res/values-fr/description.xml b/app/src/main/res/values-fr/description.xml similarity index 100% rename from res/values-fr/description.xml rename to app/src/main/res/values-fr/description.xml diff --git a/res/values-fr/strings_almalence_gui.xml b/app/src/main/res/values-fr/strings_almalence_gui.xml similarity index 100% rename from res/values-fr/strings_almalence_gui.xml rename to app/src/main/res/values-fr/strings_almalence_gui.xml diff --git a/res/values-fr/strings_modes.xml b/app/src/main/res/values-fr/strings_modes.xml similarity index 100% rename from res/values-fr/strings_modes.xml rename to app/src/main/res/values-fr/strings_modes.xml diff --git a/res/values-fr/strings_opencamera.xml b/app/src/main/res/values-fr/strings_opencamera.xml similarity index 100% rename from res/values-fr/strings_opencamera.xml rename to app/src/main/res/values-fr/strings_opencamera.xml diff --git a/res/values-fr/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-fr/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-fr/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-fr/strings_plugin_capture_bestshot.xml diff --git a/res/values-fr/strings_plugin_capture_burst.xml b/app/src/main/res/values-fr/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-fr/strings_plugin_capture_burst.xml rename to app/src/main/res/values-fr/strings_plugin_capture_burst.xml diff --git a/res/values-fr/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-fr/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-fr/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-fr/strings_plugin_capture_expobracketing.xml diff --git a/res/values-fr/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-fr/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-fr/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-fr/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-fr/strings_plugin_capture_multishot.xml b/app/src/main/res/values-fr/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-fr/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-fr/strings_plugin_capture_multishot.xml diff --git a/res/values-fr/strings_plugin_capture_night.xml b/app/src/main/res/values-fr/strings_plugin_capture_night.xml similarity index 100% rename from res/values-fr/strings_plugin_capture_night.xml rename to app/src/main/res/values-fr/strings_plugin_capture_night.xml diff --git a/res/values-fr/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-fr/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-fr/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-fr/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-fr/strings_plugin_capture_preshot.xml b/app/src/main/res/values-fr/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-fr/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-fr/strings_plugin_capture_preshot.xml diff --git a/res/values-fr/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-fr/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-fr/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-fr/strings_plugin_capture_selftimer.xml diff --git a/res/values-fr/strings_plugin_capture_video.xml b/app/src/main/res/values-fr/strings_plugin_capture_video.xml similarity index 100% rename from res/values-fr/strings_plugin_capture_video.xml rename to app/src/main/res/values-fr/strings_plugin_capture_video.xml diff --git a/res/values-fr/strings_plugin_export_common.xml b/app/src/main/res/values-fr/strings_plugin_export_common.xml similarity index 100% rename from res/values-fr/strings_plugin_export_common.xml rename to app/src/main/res/values-fr/strings_plugin_export_common.xml diff --git a/res/values-fr/strings_plugin_export_export.xml b/app/src/main/res/values-fr/strings_plugin_export_export.xml similarity index 100% rename from res/values-fr/strings_plugin_export_export.xml rename to app/src/main/res/values-fr/strings_plugin_export_export.xml diff --git a/res/values-fr/strings_plugin_preferences.xml b/app/src/main/res/values-fr/strings_plugin_preferences.xml similarity index 100% rename from res/values-fr/strings_plugin_preferences.xml rename to app/src/main/res/values-fr/strings_plugin_preferences.xml diff --git a/res/values-fr/strings_plugin_processing_hdr.xml b/app/src/main/res/values-fr/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-fr/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-fr/strings_plugin_processing_hdr.xml diff --git a/res/values-fr/strings_plugin_processing_multishot.xml b/app/src/main/res/values-fr/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-fr/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-fr/strings_plugin_processing_multishot.xml diff --git a/res/values-fr/strings_plugin_processing_night.xml b/app/src/main/res/values-fr/strings_plugin_processing_night.xml similarity index 100% rename from res/values-fr/strings_plugin_processing_night.xml rename to app/src/main/res/values-fr/strings_plugin_processing_night.xml diff --git a/res/values-fr/strings_plugin_processing_panorama.xml b/app/src/main/res/values-fr/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-fr/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-fr/strings_plugin_processing_panorama.xml diff --git a/res/values-fr/strings_plugin_processing_preshot.xml b/app/src/main/res/values-fr/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-fr/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-fr/strings_plugin_processing_preshot.xml diff --git a/res/values-fr/strings_plugin_processing_processing.xml b/app/src/main/res/values-fr/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-fr/strings_plugin_processing_processing.xml rename to app/src/main/res/values-fr/strings_plugin_processing_processing.xml diff --git a/res/values-fr/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-fr/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-fr/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-fr/strings_plugin_vf_aeawlock.xml diff --git a/res/values-fr/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-fr/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-fr/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-fr/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-fr/strings_plugin_vf_common.xml b/app/src/main/res/values-fr/strings_plugin_vf_common.xml similarity index 100% rename from res/values-fr/strings_plugin_vf_common.xml rename to app/src/main/res/values-fr/strings_plugin_vf_common.xml diff --git a/res/values-fr/strings_plugin_vf_focus.xml b/app/src/main/res/values-fr/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-fr/strings_plugin_vf_focus.xml rename to app/src/main/res/values-fr/strings_plugin_vf_focus.xml diff --git a/res/values-fr/strings_plugin_vf_grid.xml b/app/src/main/res/values-fr/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-fr/strings_plugin_vf_grid.xml rename to app/src/main/res/values-fr/strings_plugin_vf_grid.xml diff --git a/res/values-fr/strings_plugin_vf_gyro.xml b/app/src/main/res/values-fr/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-fr/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-fr/strings_plugin_vf_gyro.xml diff --git a/res/values-fr/strings_plugin_vf_histogram.xml b/app/src/main/res/values-fr/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-fr/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-fr/strings_plugin_vf_histogram.xml diff --git a/res/values-fr/strings_plugin_vf_infoset.xml b/app/src/main/res/values-fr/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-fr/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-fr/strings_plugin_vf_infoset.xml diff --git a/res/values-fr/strings_plugin_vf_zoom.xml b/app/src/main/res/values-fr/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-fr/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-fr/strings_plugin_vf_zoom.xml diff --git a/res/values-fr/strings_preferences_modes.xml b/app/src/main/res/values-fr/strings_preferences_modes.xml similarity index 100% rename from res/values-fr/strings_preferences_modes.xml rename to app/src/main/res/values-fr/strings_preferences_modes.xml diff --git a/res/values-fr/strings_preferences_upgrade.xml b/app/src/main/res/values-fr/strings_preferences_upgrade.xml similarity index 100% rename from res/values-fr/strings_preferences_upgrade.xml rename to app/src/main/res/values-fr/strings_preferences_upgrade.xml diff --git a/res/values-fr/strings_widget.xml b/app/src/main/res/values-fr/strings_widget.xml similarity index 100% rename from res/values-fr/strings_widget.xml rename to app/src/main/res/values-fr/strings_widget.xml diff --git a/res/values-hdpi/widget_dimens.xml b/app/src/main/res/values-hdpi/widget_dimens.xml similarity index 100% rename from res/values-hdpi/widget_dimens.xml rename to app/src/main/res/values-hdpi/widget_dimens.xml diff --git a/res/values-hr/description_strings.xml b/app/src/main/res/values-hr/description_strings.xml similarity index 100% rename from res/values-hr/description_strings.xml rename to app/src/main/res/values-hr/description_strings.xml diff --git a/res/values-hr/strings_almalence_gui.xml b/app/src/main/res/values-hr/strings_almalence_gui.xml similarity index 100% rename from res/values-hr/strings_almalence_gui.xml rename to app/src/main/res/values-hr/strings_almalence_gui.xml diff --git a/res/values-hr/strings_modes.xml b/app/src/main/res/values-hr/strings_modes.xml similarity index 100% rename from res/values-hr/strings_modes.xml rename to app/src/main/res/values-hr/strings_modes.xml diff --git a/res/values-hr/strings_opencamera.xml b/app/src/main/res/values-hr/strings_opencamera.xml similarity index 100% rename from res/values-hr/strings_opencamera.xml rename to app/src/main/res/values-hr/strings_opencamera.xml diff --git a/res/values-hr/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-hr/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-hr/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-hr/strings_plugin_capture_bestshot.xml diff --git a/res/values-hr/strings_plugin_capture_burst.xml b/app/src/main/res/values-hr/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-hr/strings_plugin_capture_burst.xml rename to app/src/main/res/values-hr/strings_plugin_capture_burst.xml diff --git a/res/values-hr/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-hr/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-hr/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-hr/strings_plugin_capture_expobracketing.xml diff --git a/res/values-hr/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-hr/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-hr/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-hr/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-hr/strings_plugin_capture_multishot.xml b/app/src/main/res/values-hr/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-hr/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-hr/strings_plugin_capture_multishot.xml diff --git a/res/values-hr/strings_plugin_capture_night.xml b/app/src/main/res/values-hr/strings_plugin_capture_night.xml similarity index 100% rename from res/values-hr/strings_plugin_capture_night.xml rename to app/src/main/res/values-hr/strings_plugin_capture_night.xml diff --git a/res/values-hr/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-hr/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-hr/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-hr/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-hr/strings_plugin_capture_preshot.xml b/app/src/main/res/values-hr/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-hr/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-hr/strings_plugin_capture_preshot.xml diff --git a/res/values-hr/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-hr/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-hr/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-hr/strings_plugin_capture_selftimer.xml diff --git a/res/values-hr/strings_plugin_capture_video.xml b/app/src/main/res/values-hr/strings_plugin_capture_video.xml similarity index 100% rename from res/values-hr/strings_plugin_capture_video.xml rename to app/src/main/res/values-hr/strings_plugin_capture_video.xml diff --git a/res/values-hr/strings_plugin_export_common.xml b/app/src/main/res/values-hr/strings_plugin_export_common.xml similarity index 100% rename from res/values-hr/strings_plugin_export_common.xml rename to app/src/main/res/values-hr/strings_plugin_export_common.xml diff --git a/res/values-hr/strings_plugin_export_export.xml b/app/src/main/res/values-hr/strings_plugin_export_export.xml similarity index 100% rename from res/values-hr/strings_plugin_export_export.xml rename to app/src/main/res/values-hr/strings_plugin_export_export.xml diff --git a/res/values-hr/strings_plugin_preferences.xml b/app/src/main/res/values-hr/strings_plugin_preferences.xml similarity index 100% rename from res/values-hr/strings_plugin_preferences.xml rename to app/src/main/res/values-hr/strings_plugin_preferences.xml diff --git a/res/values-hr/strings_plugin_processing_hdr.xml b/app/src/main/res/values-hr/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-hr/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-hr/strings_plugin_processing_hdr.xml diff --git a/res/values-hr/strings_plugin_processing_multishot.xml b/app/src/main/res/values-hr/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-hr/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-hr/strings_plugin_processing_multishot.xml diff --git a/res/values-hr/strings_plugin_processing_night.xml b/app/src/main/res/values-hr/strings_plugin_processing_night.xml similarity index 100% rename from res/values-hr/strings_plugin_processing_night.xml rename to app/src/main/res/values-hr/strings_plugin_processing_night.xml diff --git a/res/values-hr/strings_plugin_processing_panorama.xml b/app/src/main/res/values-hr/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-hr/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-hr/strings_plugin_processing_panorama.xml diff --git a/res/values-hr/strings_plugin_processing_preshot.xml b/app/src/main/res/values-hr/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-hr/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-hr/strings_plugin_processing_preshot.xml diff --git a/res/values-hr/strings_plugin_processing_processing.xml b/app/src/main/res/values-hr/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-hr/strings_plugin_processing_processing.xml rename to app/src/main/res/values-hr/strings_plugin_processing_processing.xml diff --git a/res/values-hr/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-hr/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-hr/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-hr/strings_plugin_vf_aeawlock.xml diff --git a/res/values-hr/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-hr/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-hr/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-hr/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-hr/strings_plugin_vf_common.xml b/app/src/main/res/values-hr/strings_plugin_vf_common.xml similarity index 100% rename from res/values-hr/strings_plugin_vf_common.xml rename to app/src/main/res/values-hr/strings_plugin_vf_common.xml diff --git a/res/values-hr/strings_plugin_vf_focus.xml b/app/src/main/res/values-hr/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-hr/strings_plugin_vf_focus.xml rename to app/src/main/res/values-hr/strings_plugin_vf_focus.xml diff --git a/res/values-hr/strings_plugin_vf_grid.xml b/app/src/main/res/values-hr/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-hr/strings_plugin_vf_grid.xml rename to app/src/main/res/values-hr/strings_plugin_vf_grid.xml diff --git a/res/values-hr/strings_plugin_vf_gyro.xml b/app/src/main/res/values-hr/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-hr/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-hr/strings_plugin_vf_gyro.xml diff --git a/res/values-hr/strings_plugin_vf_histogram.xml b/app/src/main/res/values-hr/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-hr/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-hr/strings_plugin_vf_histogram.xml diff --git a/res/values-hr/strings_plugin_vf_infoset.xml b/app/src/main/res/values-hr/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-hr/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-hr/strings_plugin_vf_infoset.xml diff --git a/res/values-hr/strings_plugin_vf_zoom.xml b/app/src/main/res/values-hr/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-hr/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-hr/strings_plugin_vf_zoom.xml diff --git a/res/values-hr/strings_preferences_modes.xml b/app/src/main/res/values-hr/strings_preferences_modes.xml similarity index 100% rename from res/values-hr/strings_preferences_modes.xml rename to app/src/main/res/values-hr/strings_preferences_modes.xml diff --git a/res/values-hr/strings_preferences_upgrade.xml b/app/src/main/res/values-hr/strings_preferences_upgrade.xml similarity index 100% rename from res/values-hr/strings_preferences_upgrade.xml rename to app/src/main/res/values-hr/strings_preferences_upgrade.xml diff --git a/res/values-hr/strings_widget.xml b/app/src/main/res/values-hr/strings_widget.xml similarity index 100% rename from res/values-hr/strings_widget.xml rename to app/src/main/res/values-hr/strings_widget.xml diff --git a/res/values-it/description.xml b/app/src/main/res/values-it/description.xml similarity index 100% rename from res/values-it/description.xml rename to app/src/main/res/values-it/description.xml diff --git a/res/values-it/strings_almalence_gui.xml b/app/src/main/res/values-it/strings_almalence_gui.xml similarity index 100% rename from res/values-it/strings_almalence_gui.xml rename to app/src/main/res/values-it/strings_almalence_gui.xml diff --git a/res/values-it/strings_modes.xml b/app/src/main/res/values-it/strings_modes.xml similarity index 100% rename from res/values-it/strings_modes.xml rename to app/src/main/res/values-it/strings_modes.xml diff --git a/res/values-it/strings_opencamera.xml b/app/src/main/res/values-it/strings_opencamera.xml similarity index 100% rename from res/values-it/strings_opencamera.xml rename to app/src/main/res/values-it/strings_opencamera.xml diff --git a/res/values-it/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-it/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-it/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-it/strings_plugin_capture_bestshot.xml diff --git a/res/values-it/strings_plugin_capture_burst.xml b/app/src/main/res/values-it/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-it/strings_plugin_capture_burst.xml rename to app/src/main/res/values-it/strings_plugin_capture_burst.xml diff --git a/res/values-it/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-it/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-it/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-it/strings_plugin_capture_expobracketing.xml diff --git a/res/values-it/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-it/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-it/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-it/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-it/strings_plugin_capture_multishot.xml b/app/src/main/res/values-it/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-it/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-it/strings_plugin_capture_multishot.xml diff --git a/res/values-it/strings_plugin_capture_night.xml b/app/src/main/res/values-it/strings_plugin_capture_night.xml similarity index 100% rename from res/values-it/strings_plugin_capture_night.xml rename to app/src/main/res/values-it/strings_plugin_capture_night.xml diff --git a/res/values-it/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-it/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-it/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-it/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-it/strings_plugin_capture_preshot.xml b/app/src/main/res/values-it/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-it/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-it/strings_plugin_capture_preshot.xml diff --git a/res/values-it/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-it/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-it/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-it/strings_plugin_capture_selftimer.xml diff --git a/res/values-it/strings_plugin_capture_video.xml b/app/src/main/res/values-it/strings_plugin_capture_video.xml similarity index 100% rename from res/values-it/strings_plugin_capture_video.xml rename to app/src/main/res/values-it/strings_plugin_capture_video.xml diff --git a/res/values-it/strings_plugin_export_common.xml b/app/src/main/res/values-it/strings_plugin_export_common.xml similarity index 100% rename from res/values-it/strings_plugin_export_common.xml rename to app/src/main/res/values-it/strings_plugin_export_common.xml diff --git a/res/values-it/strings_plugin_export_export.xml b/app/src/main/res/values-it/strings_plugin_export_export.xml similarity index 100% rename from res/values-it/strings_plugin_export_export.xml rename to app/src/main/res/values-it/strings_plugin_export_export.xml diff --git a/res/values-it/strings_plugin_preferences.xml b/app/src/main/res/values-it/strings_plugin_preferences.xml similarity index 100% rename from res/values-it/strings_plugin_preferences.xml rename to app/src/main/res/values-it/strings_plugin_preferences.xml diff --git a/res/values-it/strings_plugin_processing_hdr.xml b/app/src/main/res/values-it/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-it/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-it/strings_plugin_processing_hdr.xml diff --git a/res/values-it/strings_plugin_processing_multishot.xml b/app/src/main/res/values-it/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-it/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-it/strings_plugin_processing_multishot.xml diff --git a/res/values-it/strings_plugin_processing_night.xml b/app/src/main/res/values-it/strings_plugin_processing_night.xml similarity index 100% rename from res/values-it/strings_plugin_processing_night.xml rename to app/src/main/res/values-it/strings_plugin_processing_night.xml diff --git a/res/values-it/strings_plugin_processing_panorama.xml b/app/src/main/res/values-it/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-it/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-it/strings_plugin_processing_panorama.xml diff --git a/res/values-it/strings_plugin_processing_preshot.xml b/app/src/main/res/values-it/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-it/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-it/strings_plugin_processing_preshot.xml diff --git a/res/values-it/strings_plugin_processing_processing.xml b/app/src/main/res/values-it/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-it/strings_plugin_processing_processing.xml rename to app/src/main/res/values-it/strings_plugin_processing_processing.xml diff --git a/res/values-it/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-it/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-it/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-it/strings_plugin_vf_aeawlock.xml diff --git a/res/values-it/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-it/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-it/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-it/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-it/strings_plugin_vf_common.xml b/app/src/main/res/values-it/strings_plugin_vf_common.xml similarity index 100% rename from res/values-it/strings_plugin_vf_common.xml rename to app/src/main/res/values-it/strings_plugin_vf_common.xml diff --git a/res/values-it/strings_plugin_vf_focus.xml b/app/src/main/res/values-it/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-it/strings_plugin_vf_focus.xml rename to app/src/main/res/values-it/strings_plugin_vf_focus.xml diff --git a/res/values-it/strings_plugin_vf_grid.xml b/app/src/main/res/values-it/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-it/strings_plugin_vf_grid.xml rename to app/src/main/res/values-it/strings_plugin_vf_grid.xml diff --git a/res/values-it/strings_plugin_vf_gyro.xml b/app/src/main/res/values-it/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-it/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-it/strings_plugin_vf_gyro.xml diff --git a/res/values-it/strings_plugin_vf_histogram.xml b/app/src/main/res/values-it/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-it/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-it/strings_plugin_vf_histogram.xml diff --git a/res/values-it/strings_plugin_vf_infoset.xml b/app/src/main/res/values-it/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-it/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-it/strings_plugin_vf_infoset.xml diff --git a/res/values-it/strings_plugin_vf_zoom.xml b/app/src/main/res/values-it/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-it/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-it/strings_plugin_vf_zoom.xml diff --git a/res/values-it/strings_preferences_modes.xml b/app/src/main/res/values-it/strings_preferences_modes.xml similarity index 100% rename from res/values-it/strings_preferences_modes.xml rename to app/src/main/res/values-it/strings_preferences_modes.xml diff --git a/res/values-it/strings_preferences_upgrade.xml b/app/src/main/res/values-it/strings_preferences_upgrade.xml similarity index 100% rename from res/values-it/strings_preferences_upgrade.xml rename to app/src/main/res/values-it/strings_preferences_upgrade.xml diff --git a/res/values-it/strings_widget.xml b/app/src/main/res/values-it/strings_widget.xml similarity index 100% rename from res/values-it/strings_widget.xml rename to app/src/main/res/values-it/strings_widget.xml diff --git a/res/values-ja/description.xml b/app/src/main/res/values-ja/description.xml similarity index 100% rename from res/values-ja/description.xml rename to app/src/main/res/values-ja/description.xml diff --git a/res/values-ja/strings_almalence_gui.xml b/app/src/main/res/values-ja/strings_almalence_gui.xml similarity index 100% rename from res/values-ja/strings_almalence_gui.xml rename to app/src/main/res/values-ja/strings_almalence_gui.xml diff --git a/res/values-ja/strings_modes.xml b/app/src/main/res/values-ja/strings_modes.xml similarity index 100% rename from res/values-ja/strings_modes.xml rename to app/src/main/res/values-ja/strings_modes.xml diff --git a/res/values-ja/strings_opencamera.xml b/app/src/main/res/values-ja/strings_opencamera.xml similarity index 100% rename from res/values-ja/strings_opencamera.xml rename to app/src/main/res/values-ja/strings_opencamera.xml diff --git a/res/values-ja/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-ja/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-ja/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-ja/strings_plugin_capture_bestshot.xml diff --git a/res/values-ja/strings_plugin_capture_burst.xml b/app/src/main/res/values-ja/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-ja/strings_plugin_capture_burst.xml rename to app/src/main/res/values-ja/strings_plugin_capture_burst.xml diff --git a/res/values-ja/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-ja/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-ja/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-ja/strings_plugin_capture_expobracketing.xml diff --git a/res/values-ja/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-ja/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-ja/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-ja/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-ja/strings_plugin_capture_multishot.xml b/app/src/main/res/values-ja/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-ja/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-ja/strings_plugin_capture_multishot.xml diff --git a/res/values-ja/strings_plugin_capture_night.xml b/app/src/main/res/values-ja/strings_plugin_capture_night.xml similarity index 100% rename from res/values-ja/strings_plugin_capture_night.xml rename to app/src/main/res/values-ja/strings_plugin_capture_night.xml diff --git a/res/values-ja/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-ja/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-ja/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-ja/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-ja/strings_plugin_capture_preshot.xml b/app/src/main/res/values-ja/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-ja/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-ja/strings_plugin_capture_preshot.xml diff --git a/res/values-ja/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-ja/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-ja/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-ja/strings_plugin_capture_selftimer.xml diff --git a/res/values-ja/strings_plugin_capture_video.xml b/app/src/main/res/values-ja/strings_plugin_capture_video.xml similarity index 100% rename from res/values-ja/strings_plugin_capture_video.xml rename to app/src/main/res/values-ja/strings_plugin_capture_video.xml diff --git a/res/values-ja/strings_plugin_export_common.xml b/app/src/main/res/values-ja/strings_plugin_export_common.xml similarity index 100% rename from res/values-ja/strings_plugin_export_common.xml rename to app/src/main/res/values-ja/strings_plugin_export_common.xml diff --git a/res/values-ja/strings_plugin_export_export.xml b/app/src/main/res/values-ja/strings_plugin_export_export.xml similarity index 100% rename from res/values-ja/strings_plugin_export_export.xml rename to app/src/main/res/values-ja/strings_plugin_export_export.xml diff --git a/res/values-ja/strings_plugin_preferences.xml b/app/src/main/res/values-ja/strings_plugin_preferences.xml similarity index 100% rename from res/values-ja/strings_plugin_preferences.xml rename to app/src/main/res/values-ja/strings_plugin_preferences.xml diff --git a/res/values-ja/strings_plugin_processing_hdr.xml b/app/src/main/res/values-ja/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-ja/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-ja/strings_plugin_processing_hdr.xml diff --git a/res/values-ja/strings_plugin_processing_multishot.xml b/app/src/main/res/values-ja/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-ja/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-ja/strings_plugin_processing_multishot.xml diff --git a/res/values-ja/strings_plugin_processing_night.xml b/app/src/main/res/values-ja/strings_plugin_processing_night.xml similarity index 100% rename from res/values-ja/strings_plugin_processing_night.xml rename to app/src/main/res/values-ja/strings_plugin_processing_night.xml diff --git a/res/values-ja/strings_plugin_processing_panorama.xml b/app/src/main/res/values-ja/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-ja/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-ja/strings_plugin_processing_panorama.xml diff --git a/res/values-ja/strings_plugin_processing_preshot.xml b/app/src/main/res/values-ja/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-ja/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-ja/strings_plugin_processing_preshot.xml diff --git a/res/values-ja/strings_plugin_processing_processing.xml b/app/src/main/res/values-ja/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-ja/strings_plugin_processing_processing.xml rename to app/src/main/res/values-ja/strings_plugin_processing_processing.xml diff --git a/res/values-ja/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-ja/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-ja/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-ja/strings_plugin_vf_aeawlock.xml diff --git a/res/values-ja/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-ja/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-ja/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-ja/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-ja/strings_plugin_vf_common.xml b/app/src/main/res/values-ja/strings_plugin_vf_common.xml similarity index 100% rename from res/values-ja/strings_plugin_vf_common.xml rename to app/src/main/res/values-ja/strings_plugin_vf_common.xml diff --git a/res/values-ja/strings_plugin_vf_focus.xml b/app/src/main/res/values-ja/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-ja/strings_plugin_vf_focus.xml rename to app/src/main/res/values-ja/strings_plugin_vf_focus.xml diff --git a/res/values-ja/strings_plugin_vf_grid.xml b/app/src/main/res/values-ja/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-ja/strings_plugin_vf_grid.xml rename to app/src/main/res/values-ja/strings_plugin_vf_grid.xml diff --git a/res/values-ja/strings_plugin_vf_gyro.xml b/app/src/main/res/values-ja/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-ja/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-ja/strings_plugin_vf_gyro.xml diff --git a/res/values-ja/strings_plugin_vf_histogram.xml b/app/src/main/res/values-ja/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-ja/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-ja/strings_plugin_vf_histogram.xml diff --git a/res/values-ja/strings_plugin_vf_infoset.xml b/app/src/main/res/values-ja/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-ja/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-ja/strings_plugin_vf_infoset.xml diff --git a/res/values-ja/strings_plugin_vf_zoom.xml b/app/src/main/res/values-ja/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-ja/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-ja/strings_plugin_vf_zoom.xml diff --git a/res/values-ja/strings_preferences_modes.xml b/app/src/main/res/values-ja/strings_preferences_modes.xml similarity index 100% rename from res/values-ja/strings_preferences_modes.xml rename to app/src/main/res/values-ja/strings_preferences_modes.xml diff --git a/res/values-ja/strings_preferences_upgrade.xml b/app/src/main/res/values-ja/strings_preferences_upgrade.xml similarity index 100% rename from res/values-ja/strings_preferences_upgrade.xml rename to app/src/main/res/values-ja/strings_preferences_upgrade.xml diff --git a/res/values-ja/strings_widget.xml b/app/src/main/res/values-ja/strings_widget.xml similarity index 100% rename from res/values-ja/strings_widget.xml rename to app/src/main/res/values-ja/strings_widget.xml diff --git a/res/values-ko/description.xml b/app/src/main/res/values-ko/description.xml similarity index 100% rename from res/values-ko/description.xml rename to app/src/main/res/values-ko/description.xml diff --git a/res/values-ko/strings_almalence_gui.xml b/app/src/main/res/values-ko/strings_almalence_gui.xml similarity index 100% rename from res/values-ko/strings_almalence_gui.xml rename to app/src/main/res/values-ko/strings_almalence_gui.xml diff --git a/res/values-ko/strings_modes.xml b/app/src/main/res/values-ko/strings_modes.xml similarity index 100% rename from res/values-ko/strings_modes.xml rename to app/src/main/res/values-ko/strings_modes.xml diff --git a/res/values-ko/strings_opencamera.xml b/app/src/main/res/values-ko/strings_opencamera.xml similarity index 100% rename from res/values-ko/strings_opencamera.xml rename to app/src/main/res/values-ko/strings_opencamera.xml diff --git a/res/values-ko/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-ko/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-ko/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-ko/strings_plugin_capture_bestshot.xml diff --git a/res/values-ko/strings_plugin_capture_burst.xml b/app/src/main/res/values-ko/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-ko/strings_plugin_capture_burst.xml rename to app/src/main/res/values-ko/strings_plugin_capture_burst.xml diff --git a/res/values-ko/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-ko/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-ko/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-ko/strings_plugin_capture_expobracketing.xml diff --git a/res/values-ko/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-ko/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-ko/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-ko/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-ko/strings_plugin_capture_multishot.xml b/app/src/main/res/values-ko/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-ko/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-ko/strings_plugin_capture_multishot.xml diff --git a/res/values-ko/strings_plugin_capture_night.xml b/app/src/main/res/values-ko/strings_plugin_capture_night.xml similarity index 100% rename from res/values-ko/strings_plugin_capture_night.xml rename to app/src/main/res/values-ko/strings_plugin_capture_night.xml diff --git a/res/values-ko/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-ko/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-ko/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-ko/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-ko/strings_plugin_capture_preshot.xml b/app/src/main/res/values-ko/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-ko/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-ko/strings_plugin_capture_preshot.xml diff --git a/res/values-ko/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-ko/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-ko/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-ko/strings_plugin_capture_selftimer.xml diff --git a/res/values-ko/strings_plugin_capture_video.xml b/app/src/main/res/values-ko/strings_plugin_capture_video.xml similarity index 100% rename from res/values-ko/strings_plugin_capture_video.xml rename to app/src/main/res/values-ko/strings_plugin_capture_video.xml diff --git a/res/values-ko/strings_plugin_export_common.xml b/app/src/main/res/values-ko/strings_plugin_export_common.xml similarity index 100% rename from res/values-ko/strings_plugin_export_common.xml rename to app/src/main/res/values-ko/strings_plugin_export_common.xml diff --git a/res/values-ko/strings_plugin_export_export.xml b/app/src/main/res/values-ko/strings_plugin_export_export.xml similarity index 100% rename from res/values-ko/strings_plugin_export_export.xml rename to app/src/main/res/values-ko/strings_plugin_export_export.xml diff --git a/res/values-ko/strings_plugin_preferences.xml b/app/src/main/res/values-ko/strings_plugin_preferences.xml similarity index 100% rename from res/values-ko/strings_plugin_preferences.xml rename to app/src/main/res/values-ko/strings_plugin_preferences.xml diff --git a/res/values-ko/strings_plugin_processing_hdr.xml b/app/src/main/res/values-ko/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-ko/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-ko/strings_plugin_processing_hdr.xml diff --git a/res/values-ko/strings_plugin_processing_multishot.xml b/app/src/main/res/values-ko/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-ko/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-ko/strings_plugin_processing_multishot.xml diff --git a/res/values-ko/strings_plugin_processing_night.xml b/app/src/main/res/values-ko/strings_plugin_processing_night.xml similarity index 100% rename from res/values-ko/strings_plugin_processing_night.xml rename to app/src/main/res/values-ko/strings_plugin_processing_night.xml diff --git a/res/values-ko/strings_plugin_processing_panorama.xml b/app/src/main/res/values-ko/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-ko/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-ko/strings_plugin_processing_panorama.xml diff --git a/res/values-ko/strings_plugin_processing_preshot.xml b/app/src/main/res/values-ko/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-ko/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-ko/strings_plugin_processing_preshot.xml diff --git a/res/values-ko/strings_plugin_processing_processing.xml b/app/src/main/res/values-ko/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-ko/strings_plugin_processing_processing.xml rename to app/src/main/res/values-ko/strings_plugin_processing_processing.xml diff --git a/res/values-ko/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-ko/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-ko/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-ko/strings_plugin_vf_aeawlock.xml diff --git a/res/values-ko/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-ko/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-ko/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-ko/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-ko/strings_plugin_vf_common.xml b/app/src/main/res/values-ko/strings_plugin_vf_common.xml similarity index 100% rename from res/values-ko/strings_plugin_vf_common.xml rename to app/src/main/res/values-ko/strings_plugin_vf_common.xml diff --git a/res/values-ko/strings_plugin_vf_focus.xml b/app/src/main/res/values-ko/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-ko/strings_plugin_vf_focus.xml rename to app/src/main/res/values-ko/strings_plugin_vf_focus.xml diff --git a/res/values-ko/strings_plugin_vf_grid.xml b/app/src/main/res/values-ko/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-ko/strings_plugin_vf_grid.xml rename to app/src/main/res/values-ko/strings_plugin_vf_grid.xml diff --git a/res/values-ko/strings_plugin_vf_gyro.xml b/app/src/main/res/values-ko/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-ko/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-ko/strings_plugin_vf_gyro.xml diff --git a/res/values-ko/strings_plugin_vf_histogram.xml b/app/src/main/res/values-ko/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-ko/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-ko/strings_plugin_vf_histogram.xml diff --git a/res/values-ko/strings_plugin_vf_infoset.xml b/app/src/main/res/values-ko/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-ko/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-ko/strings_plugin_vf_infoset.xml diff --git a/res/values-ko/strings_plugin_vf_zoom.xml b/app/src/main/res/values-ko/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-ko/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-ko/strings_plugin_vf_zoom.xml diff --git a/res/values-ko/strings_preferences_modes.xml b/app/src/main/res/values-ko/strings_preferences_modes.xml similarity index 100% rename from res/values-ko/strings_preferences_modes.xml rename to app/src/main/res/values-ko/strings_preferences_modes.xml diff --git a/res/values-ko/strings_preferences_upgrade.xml b/app/src/main/res/values-ko/strings_preferences_upgrade.xml similarity index 100% rename from res/values-ko/strings_preferences_upgrade.xml rename to app/src/main/res/values-ko/strings_preferences_upgrade.xml diff --git a/res/values-ko/strings_widget.xml b/app/src/main/res/values-ko/strings_widget.xml similarity index 100% rename from res/values-ko/strings_widget.xml rename to app/src/main/res/values-ko/strings_widget.xml diff --git a/res/values-large/almalence_gui_dimens.xml b/app/src/main/res/values-large/almalence_gui_dimens.xml similarity index 100% rename from res/values-large/almalence_gui_dimens.xml rename to app/src/main/res/values-large/almalence_gui_dimens.xml diff --git a/res/values-large/almalence_gui_integers.xml b/app/src/main/res/values-large/almalence_gui_integers.xml similarity index 100% rename from res/values-large/almalence_gui_integers.xml rename to app/src/main/res/values-large/almalence_gui_integers.xml diff --git a/res/values-large/plugin_capture_night_dimension.xml b/app/src/main/res/values-large/plugin_capture_night_dimension.xml similarity index 100% rename from res/values-large/plugin_capture_night_dimension.xml rename to app/src/main/res/values-large/plugin_capture_night_dimension.xml diff --git a/res/values-large/plugin_processing_groupshot_dimension.xml b/app/src/main/res/values-large/plugin_processing_groupshot_dimension.xml similarity index 100% rename from res/values-large/plugin_processing_groupshot_dimension.xml rename to app/src/main/res/values-large/plugin_processing_groupshot_dimension.xml diff --git a/res/values-large/plugin_processing_objectremoval_dimension.xml b/app/src/main/res/values-large/plugin_processing_objectremoval_dimension.xml similarity index 100% rename from res/values-large/plugin_processing_objectremoval_dimension.xml rename to app/src/main/res/values-large/plugin_processing_objectremoval_dimension.xml diff --git a/res/values-large/plugin_vf_focus_cropfactor.xml b/app/src/main/res/values-large/plugin_vf_focus_cropfactor.xml similarity index 100% rename from res/values-large/plugin_vf_focus_cropfactor.xml rename to app/src/main/res/values-large/plugin_vf_focus_cropfactor.xml diff --git a/res/values-large/plugin_vf_infoset_dimension.xml b/app/src/main/res/values-large/plugin_vf_infoset_dimension.xml similarity index 100% rename from res/values-large/plugin_vf_infoset_dimension.xml rename to app/src/main/res/values-large/plugin_vf_infoset_dimension.xml diff --git a/res/values-large/screen.xml b/app/src/main/res/values-large/screen.xml similarity index 100% rename from res/values-large/screen.xml rename to app/src/main/res/values-large/screen.xml diff --git a/res/values-mdpi/widget_dimens.xml b/app/src/main/res/values-mdpi/widget_dimens.xml similarity index 100% rename from res/values-mdpi/widget_dimens.xml rename to app/src/main/res/values-mdpi/widget_dimens.xml diff --git a/res/values-normal/almalence_gui_dimens.xml b/app/src/main/res/values-normal/almalence_gui_dimens.xml similarity index 100% rename from res/values-normal/almalence_gui_dimens.xml rename to app/src/main/res/values-normal/almalence_gui_dimens.xml diff --git a/res/values-pl-rPL/description.xml b/app/src/main/res/values-pl-rPL/description.xml similarity index 100% rename from res/values-pl-rPL/description.xml rename to app/src/main/res/values-pl-rPL/description.xml diff --git a/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from res/values-pl-rPL/strings.xml rename to app/src/main/res/values-pl-rPL/strings.xml diff --git a/res/values-pl-rPL/strings_almalence_gui.xml b/app/src/main/res/values-pl-rPL/strings_almalence_gui.xml similarity index 100% rename from res/values-pl-rPL/strings_almalence_gui.xml rename to app/src/main/res/values-pl-rPL/strings_almalence_gui.xml diff --git a/res/values-pl-rPL/strings_modes.xml b/app/src/main/res/values-pl-rPL/strings_modes.xml similarity index 100% rename from res/values-pl-rPL/strings_modes.xml rename to app/src/main/res/values-pl-rPL/strings_modes.xml diff --git a/res/values-pl-rPL/strings_opencamera.xml b/app/src/main/res/values-pl-rPL/strings_opencamera.xml similarity index 100% rename from res/values-pl-rPL/strings_opencamera.xml rename to app/src/main/res/values-pl-rPL/strings_opencamera.xml diff --git a/res/values-pl-rPL/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-pl-rPL/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_capture_bestshot.xml diff --git a/res/values-pl-rPL/strings_plugin_capture_burst.xml b/app/src/main/res/values-pl-rPL/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_capture_burst.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_capture_burst.xml diff --git a/res/values-pl-rPL/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-pl-rPL/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_capture_expobracketing.xml diff --git a/res/values-pl-rPL/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-pl-rPL/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-pl-rPL/strings_plugin_capture_multishot.xml b/app/src/main/res/values-pl-rPL/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_capture_multishot.xml diff --git a/res/values-pl-rPL/strings_plugin_capture_night.xml b/app/src/main/res/values-pl-rPL/strings_plugin_capture_night.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_capture_night.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_capture_night.xml diff --git a/res/values-pl-rPL/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-pl-rPL/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-pl-rPL/strings_plugin_capture_preshot.xml b/app/src/main/res/values-pl-rPL/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_capture_preshot.xml diff --git a/res/values-pl-rPL/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-pl-rPL/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_capture_selftimer.xml diff --git a/res/values-pl-rPL/strings_plugin_capture_video.xml b/app/src/main/res/values-pl-rPL/strings_plugin_capture_video.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_capture_video.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_capture_video.xml diff --git a/res/values-pl-rPL/strings_plugin_export_common.xml b/app/src/main/res/values-pl-rPL/strings_plugin_export_common.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_export_common.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_export_common.xml diff --git a/res/values-pl-rPL/strings_plugin_export_export.xml b/app/src/main/res/values-pl-rPL/strings_plugin_export_export.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_export_export.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_export_export.xml diff --git a/res/values-pl-rPL/strings_plugin_preferences.xml b/app/src/main/res/values-pl-rPL/strings_plugin_preferences.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_preferences.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_preferences.xml diff --git a/res/values-pl-rPL/strings_plugin_processing_hdr.xml b/app/src/main/res/values-pl-rPL/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_processing_hdr.xml diff --git a/res/values-pl-rPL/strings_plugin_processing_multishot.xml b/app/src/main/res/values-pl-rPL/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_processing_multishot.xml diff --git a/res/values-pl-rPL/strings_plugin_processing_night.xml b/app/src/main/res/values-pl-rPL/strings_plugin_processing_night.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_processing_night.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_processing_night.xml diff --git a/res/values-pl-rPL/strings_plugin_processing_panorama.xml b/app/src/main/res/values-pl-rPL/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_processing_panorama.xml diff --git a/res/values-pl-rPL/strings_plugin_processing_preshot.xml b/app/src/main/res/values-pl-rPL/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_processing_preshot.xml diff --git a/res/values-pl-rPL/strings_plugin_processing_processing.xml b/app/src/main/res/values-pl-rPL/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_processing_processing.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_processing_processing.xml diff --git a/res/values-pl-rPL/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-pl-rPL/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_vf_aeawlock.xml diff --git a/res/values-pl-rPL/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-pl-rPL/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-pl-rPL/strings_plugin_vf_common.xml b/app/src/main/res/values-pl-rPL/strings_plugin_vf_common.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_vf_common.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_vf_common.xml diff --git a/res/values-pl-rPL/strings_plugin_vf_focus.xml b/app/src/main/res/values-pl-rPL/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_vf_focus.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_vf_focus.xml diff --git a/res/values-pl-rPL/strings_plugin_vf_grid.xml b/app/src/main/res/values-pl-rPL/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_vf_grid.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_vf_grid.xml diff --git a/res/values-pl-rPL/strings_plugin_vf_gyro.xml b/app/src/main/res/values-pl-rPL/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_vf_gyro.xml diff --git a/res/values-pl-rPL/strings_plugin_vf_histogram.xml b/app/src/main/res/values-pl-rPL/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_vf_histogram.xml diff --git a/res/values-pl-rPL/strings_plugin_vf_infoset.xml b/app/src/main/res/values-pl-rPL/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_vf_infoset.xml diff --git a/res/values-pl-rPL/strings_plugin_vf_zoom.xml b/app/src/main/res/values-pl-rPL/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-pl-rPL/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-pl-rPL/strings_plugin_vf_zoom.xml diff --git a/res/values-pl-rPL/strings_preferences_modes.xml b/app/src/main/res/values-pl-rPL/strings_preferences_modes.xml similarity index 100% rename from res/values-pl-rPL/strings_preferences_modes.xml rename to app/src/main/res/values-pl-rPL/strings_preferences_modes.xml diff --git a/res/values-pl-rPL/strings_preferences_upgrade.xml b/app/src/main/res/values-pl-rPL/strings_preferences_upgrade.xml similarity index 100% rename from res/values-pl-rPL/strings_preferences_upgrade.xml rename to app/src/main/res/values-pl-rPL/strings_preferences_upgrade.xml diff --git a/res/values-pl-rPL/strings_widget.xml b/app/src/main/res/values-pl-rPL/strings_widget.xml similarity index 100% rename from res/values-pl-rPL/strings_widget.xml rename to app/src/main/res/values-pl-rPL/strings_widget.xml diff --git a/res/values-pt-rBR/description.xml b/app/src/main/res/values-pt-rBR/description.xml similarity index 100% rename from res/values-pt-rBR/description.xml rename to app/src/main/res/values-pt-rBR/description.xml diff --git a/res/values-pt-rBR/strings_almalence_gui.xml b/app/src/main/res/values-pt-rBR/strings_almalence_gui.xml similarity index 100% rename from res/values-pt-rBR/strings_almalence_gui.xml rename to app/src/main/res/values-pt-rBR/strings_almalence_gui.xml diff --git a/res/values-pt-rBR/strings_modes.xml b/app/src/main/res/values-pt-rBR/strings_modes.xml similarity index 100% rename from res/values-pt-rBR/strings_modes.xml rename to app/src/main/res/values-pt-rBR/strings_modes.xml diff --git a/res/values-pt-rBR/strings_opencamera.xml b/app/src/main/res/values-pt-rBR/strings_opencamera.xml similarity index 100% rename from res/values-pt-rBR/strings_opencamera.xml rename to app/src/main/res/values-pt-rBR/strings_opencamera.xml diff --git a/res/values-pt-rBR/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-pt-rBR/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_capture_bestshot.xml diff --git a/res/values-pt-rBR/strings_plugin_capture_burst.xml b/app/src/main/res/values-pt-rBR/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_capture_burst.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_capture_burst.xml diff --git a/res/values-pt-rBR/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-pt-rBR/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_capture_expobracketing.xml diff --git a/res/values-pt-rBR/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-pt-rBR/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-pt-rBR/strings_plugin_capture_multishot.xml b/app/src/main/res/values-pt-rBR/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_capture_multishot.xml diff --git a/res/values-pt-rBR/strings_plugin_capture_night.xml b/app/src/main/res/values-pt-rBR/strings_plugin_capture_night.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_capture_night.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_capture_night.xml diff --git a/res/values-pt-rBR/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-pt-rBR/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-pt-rBR/strings_plugin_capture_preshot.xml b/app/src/main/res/values-pt-rBR/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_capture_preshot.xml diff --git a/res/values-pt-rBR/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-pt-rBR/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_capture_selftimer.xml diff --git a/res/values-pt-rBR/strings_plugin_capture_video.xml b/app/src/main/res/values-pt-rBR/strings_plugin_capture_video.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_capture_video.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_capture_video.xml diff --git a/res/values-pt-rBR/strings_plugin_export_common.xml b/app/src/main/res/values-pt-rBR/strings_plugin_export_common.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_export_common.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_export_common.xml diff --git a/res/values-pt-rBR/strings_plugin_export_export.xml b/app/src/main/res/values-pt-rBR/strings_plugin_export_export.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_export_export.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_export_export.xml diff --git a/res/values-pt-rBR/strings_plugin_preferences.xml b/app/src/main/res/values-pt-rBR/strings_plugin_preferences.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_preferences.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_preferences.xml diff --git a/res/values-pt-rBR/strings_plugin_processing_hdr.xml b/app/src/main/res/values-pt-rBR/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_processing_hdr.xml diff --git a/res/values-pt-rBR/strings_plugin_processing_multishot.xml b/app/src/main/res/values-pt-rBR/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_processing_multishot.xml diff --git a/res/values-pt-rBR/strings_plugin_processing_night.xml b/app/src/main/res/values-pt-rBR/strings_plugin_processing_night.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_processing_night.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_processing_night.xml diff --git a/res/values-pt-rBR/strings_plugin_processing_panorama.xml b/app/src/main/res/values-pt-rBR/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_processing_panorama.xml diff --git a/res/values-pt-rBR/strings_plugin_processing_preshot.xml b/app/src/main/res/values-pt-rBR/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_processing_preshot.xml diff --git a/res/values-pt-rBR/strings_plugin_processing_processing.xml b/app/src/main/res/values-pt-rBR/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_processing_processing.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_processing_processing.xml diff --git a/res/values-pt-rBR/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-pt-rBR/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_vf_aeawlock.xml diff --git a/res/values-pt-rBR/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-pt-rBR/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-pt-rBR/strings_plugin_vf_common.xml b/app/src/main/res/values-pt-rBR/strings_plugin_vf_common.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_vf_common.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_vf_common.xml diff --git a/res/values-pt-rBR/strings_plugin_vf_focus.xml b/app/src/main/res/values-pt-rBR/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_vf_focus.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_vf_focus.xml diff --git a/res/values-pt-rBR/strings_plugin_vf_grid.xml b/app/src/main/res/values-pt-rBR/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_vf_grid.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_vf_grid.xml diff --git a/res/values-pt-rBR/strings_plugin_vf_gyro.xml b/app/src/main/res/values-pt-rBR/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_vf_gyro.xml diff --git a/res/values-pt-rBR/strings_plugin_vf_histogram.xml b/app/src/main/res/values-pt-rBR/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_vf_histogram.xml diff --git a/res/values-pt-rBR/strings_plugin_vf_infoset.xml b/app/src/main/res/values-pt-rBR/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_vf_infoset.xml diff --git a/res/values-pt-rBR/strings_plugin_vf_zoom.xml b/app/src/main/res/values-pt-rBR/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-pt-rBR/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-pt-rBR/strings_plugin_vf_zoom.xml diff --git a/res/values-pt-rBR/strings_preferences_modes.xml b/app/src/main/res/values-pt-rBR/strings_preferences_modes.xml similarity index 100% rename from res/values-pt-rBR/strings_preferences_modes.xml rename to app/src/main/res/values-pt-rBR/strings_preferences_modes.xml diff --git a/res/values-pt-rBR/strings_preferences_upgrade.xml b/app/src/main/res/values-pt-rBR/strings_preferences_upgrade.xml similarity index 100% rename from res/values-pt-rBR/strings_preferences_upgrade.xml rename to app/src/main/res/values-pt-rBR/strings_preferences_upgrade.xml diff --git a/res/values-pt-rBR/strings_widget.xml b/app/src/main/res/values-pt-rBR/strings_widget.xml similarity index 100% rename from res/values-pt-rBR/strings_widget.xml rename to app/src/main/res/values-pt-rBR/strings_widget.xml diff --git a/res/values-ru/sony_camera_strings.xml b/app/src/main/res/values-ru/sony_camera_strings.xml similarity index 100% rename from res/values-ru/sony_camera_strings.xml rename to app/src/main/res/values-ru/sony_camera_strings.xml diff --git a/res/values-ru/strings_almalence_gui.xml b/app/src/main/res/values-ru/strings_almalence_gui.xml similarity index 100% rename from res/values-ru/strings_almalence_gui.xml rename to app/src/main/res/values-ru/strings_almalence_gui.xml diff --git a/res/values-ru/strings_modes.xml b/app/src/main/res/values-ru/strings_modes.xml similarity index 100% rename from res/values-ru/strings_modes.xml rename to app/src/main/res/values-ru/strings_modes.xml diff --git a/res/values-ru/strings_opencamera.xml b/app/src/main/res/values-ru/strings_opencamera.xml similarity index 100% rename from res/values-ru/strings_opencamera.xml rename to app/src/main/res/values-ru/strings_opencamera.xml diff --git a/res/values-ru/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-ru/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-ru/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-ru/strings_plugin_capture_bestshot.xml diff --git a/res/values-ru/strings_plugin_capture_burst.xml b/app/src/main/res/values-ru/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-ru/strings_plugin_capture_burst.xml rename to app/src/main/res/values-ru/strings_plugin_capture_burst.xml diff --git a/res/values-ru/strings_plugin_capture_dro.xml b/app/src/main/res/values-ru/strings_plugin_capture_dro.xml similarity index 100% rename from res/values-ru/strings_plugin_capture_dro.xml rename to app/src/main/res/values-ru/strings_plugin_capture_dro.xml diff --git a/res/values-ru/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-ru/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-ru/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-ru/strings_plugin_capture_expobracketing.xml diff --git a/res/values-ru/strings_plugin_capture_multishot.xml b/app/src/main/res/values-ru/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-ru/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-ru/strings_plugin_capture_multishot.xml diff --git a/res/values-ru/strings_plugin_capture_night.xml b/app/src/main/res/values-ru/strings_plugin_capture_night.xml similarity index 100% rename from res/values-ru/strings_plugin_capture_night.xml rename to app/src/main/res/values-ru/strings_plugin_capture_night.xml diff --git a/res/values-ru/strings_plugin_capture_preshot.xml b/app/src/main/res/values-ru/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-ru/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-ru/strings_plugin_capture_preshot.xml diff --git a/res/values-ru/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-ru/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-ru/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-ru/strings_plugin_capture_selftimer.xml diff --git a/res/values-ru/strings_plugin_capture_video.xml b/app/src/main/res/values-ru/strings_plugin_capture_video.xml similarity index 100% rename from res/values-ru/strings_plugin_capture_video.xml rename to app/src/main/res/values-ru/strings_plugin_capture_video.xml diff --git a/res/values-ru/strings_plugin_export_export.xml b/app/src/main/res/values-ru/strings_plugin_export_export.xml similarity index 100% rename from res/values-ru/strings_plugin_export_export.xml rename to app/src/main/res/values-ru/strings_plugin_export_export.xml diff --git a/res/values-ru/strings_plugin_preferences.xml b/app/src/main/res/values-ru/strings_plugin_preferences.xml similarity index 100% rename from res/values-ru/strings_plugin_preferences.xml rename to app/src/main/res/values-ru/strings_plugin_preferences.xml diff --git a/res/values-ru/strings_plugin_processing_hdr.xml b/app/src/main/res/values-ru/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-ru/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-ru/strings_plugin_processing_hdr.xml diff --git a/res/values-ru/strings_plugin_processing_multishot.xml b/app/src/main/res/values-ru/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-ru/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-ru/strings_plugin_processing_multishot.xml diff --git a/res/values-ru/strings_plugin_processing_night.xml b/app/src/main/res/values-ru/strings_plugin_processing_night.xml similarity index 100% rename from res/values-ru/strings_plugin_processing_night.xml rename to app/src/main/res/values-ru/strings_plugin_processing_night.xml diff --git a/res/values-ru/strings_plugin_processing_panorama.xml b/app/src/main/res/values-ru/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-ru/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-ru/strings_plugin_processing_panorama.xml diff --git a/res/values-ru/strings_plugin_processing_preshot.xml b/app/src/main/res/values-ru/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-ru/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-ru/strings_plugin_processing_preshot.xml diff --git a/res/values-ru/strings_plugin_processing_processing.xml b/app/src/main/res/values-ru/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-ru/strings_plugin_processing_processing.xml rename to app/src/main/res/values-ru/strings_plugin_processing_processing.xml diff --git a/res/values-ru/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-ru/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-ru/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-ru/strings_plugin_vf_aeawlock.xml diff --git a/res/values-ru/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-ru/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-ru/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-ru/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-ru/strings_plugin_vf_common.xml b/app/src/main/res/values-ru/strings_plugin_vf_common.xml similarity index 100% rename from res/values-ru/strings_plugin_vf_common.xml rename to app/src/main/res/values-ru/strings_plugin_vf_common.xml diff --git a/res/values-ru/strings_plugin_vf_focus.xml b/app/src/main/res/values-ru/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-ru/strings_plugin_vf_focus.xml rename to app/src/main/res/values-ru/strings_plugin_vf_focus.xml diff --git a/res/values-ru/strings_plugin_vf_grid.xml b/app/src/main/res/values-ru/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-ru/strings_plugin_vf_grid.xml rename to app/src/main/res/values-ru/strings_plugin_vf_grid.xml diff --git a/res/values-ru/strings_plugin_vf_gyro.xml b/app/src/main/res/values-ru/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-ru/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-ru/strings_plugin_vf_gyro.xml diff --git a/res/values-ru/strings_plugin_vf_histogram.xml b/app/src/main/res/values-ru/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-ru/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-ru/strings_plugin_vf_histogram.xml diff --git a/res/values-ru/strings_plugin_vf_infoset.xml b/app/src/main/res/values-ru/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-ru/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-ru/strings_plugin_vf_infoset.xml diff --git a/res/values-ru/strings_plugin_vf_zoom.xml b/app/src/main/res/values-ru/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-ru/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-ru/strings_plugin_vf_zoom.xml diff --git a/res/values-ru/strings_preferences_modes.xml b/app/src/main/res/values-ru/strings_preferences_modes.xml similarity index 100% rename from res/values-ru/strings_preferences_modes.xml rename to app/src/main/res/values-ru/strings_preferences_modes.xml diff --git a/res/values-ru/strings_preferences_upgrade.xml b/app/src/main/res/values-ru/strings_preferences_upgrade.xml similarity index 100% rename from res/values-ru/strings_preferences_upgrade.xml rename to app/src/main/res/values-ru/strings_preferences_upgrade.xml diff --git a/res/values-ru/strings_widget.xml b/app/src/main/res/values-ru/strings_widget.xml similarity index 100% rename from res/values-ru/strings_widget.xml rename to app/src/main/res/values-ru/strings_widget.xml diff --git a/res/values-v14/style_gui_almalence_settings.xml b/app/src/main/res/values-v14/style_gui_almalence_settings.xml similarity index 100% rename from res/values-v14/style_gui_almalence_settings.xml rename to app/src/main/res/values-v14/style_gui_almalence_settings.xml diff --git a/res/values-xhdpi/widget_dimens.xml b/app/src/main/res/values-xhdpi/widget_dimens.xml similarity index 100% rename from res/values-xhdpi/widget_dimens.xml rename to app/src/main/res/values-xhdpi/widget_dimens.xml diff --git a/res/values-xlarge/almalence_gui_dimens.xml b/app/src/main/res/values-xlarge/almalence_gui_dimens.xml similarity index 100% rename from res/values-xlarge/almalence_gui_dimens.xml rename to app/src/main/res/values-xlarge/almalence_gui_dimens.xml diff --git a/res/values-xlarge/almalence_gui_integers.xml b/app/src/main/res/values-xlarge/almalence_gui_integers.xml similarity index 100% rename from res/values-xlarge/almalence_gui_integers.xml rename to app/src/main/res/values-xlarge/almalence_gui_integers.xml diff --git a/res/values-xlarge/plugin_capture_night_dimension.xml b/app/src/main/res/values-xlarge/plugin_capture_night_dimension.xml similarity index 100% rename from res/values-xlarge/plugin_capture_night_dimension.xml rename to app/src/main/res/values-xlarge/plugin_capture_night_dimension.xml diff --git a/res/values-xlarge/plugin_vf_focus_cropfactor.xml b/app/src/main/res/values-xlarge/plugin_vf_focus_cropfactor.xml similarity index 100% rename from res/values-xlarge/plugin_vf_focus_cropfactor.xml rename to app/src/main/res/values-xlarge/plugin_vf_focus_cropfactor.xml diff --git a/res/values-xlarge/plugin_vf_infoset_dimension.xml b/app/src/main/res/values-xlarge/plugin_vf_infoset_dimension.xml similarity index 100% rename from res/values-xlarge/plugin_vf_infoset_dimension.xml rename to app/src/main/res/values-xlarge/plugin_vf_infoset_dimension.xml diff --git a/res/values-xlarge/screen.xml b/app/src/main/res/values-xlarge/screen.xml similarity index 100% rename from res/values-xlarge/screen.xml rename to app/src/main/res/values-xlarge/screen.xml diff --git a/res/values-xlarge/widget_dimens.xml b/app/src/main/res/values-xlarge/widget_dimens.xml similarity index 100% rename from res/values-xlarge/widget_dimens.xml rename to app/src/main/res/values-xlarge/widget_dimens.xml diff --git a/res/values-zh-rCN/description.xml b/app/src/main/res/values-zh-rCN/description.xml similarity index 100% rename from res/values-zh-rCN/description.xml rename to app/src/main/res/values-zh-rCN/description.xml diff --git a/res/values-zh-rCN/strings_almalence_gui.xml b/app/src/main/res/values-zh-rCN/strings_almalence_gui.xml similarity index 100% rename from res/values-zh-rCN/strings_almalence_gui.xml rename to app/src/main/res/values-zh-rCN/strings_almalence_gui.xml diff --git a/res/values-zh-rCN/strings_modes.xml b/app/src/main/res/values-zh-rCN/strings_modes.xml similarity index 100% rename from res/values-zh-rCN/strings_modes.xml rename to app/src/main/res/values-zh-rCN/strings_modes.xml diff --git a/res/values-zh-rCN/strings_opencamera.xml b/app/src/main/res/values-zh-rCN/strings_opencamera.xml similarity index 100% rename from res/values-zh-rCN/strings_opencamera.xml rename to app/src/main/res/values-zh-rCN/strings_opencamera.xml diff --git a/res/values-zh-rCN/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-zh-rCN/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_capture_bestshot.xml diff --git a/res/values-zh-rCN/strings_plugin_capture_burst.xml b/app/src/main/res/values-zh-rCN/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_capture_burst.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_capture_burst.xml diff --git a/res/values-zh-rCN/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-zh-rCN/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_capture_expobracketing.xml diff --git a/res/values-zh-rCN/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-zh-rCN/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-zh-rCN/strings_plugin_capture_multishot.xml b/app/src/main/res/values-zh-rCN/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_capture_multishot.xml diff --git a/res/values-zh-rCN/strings_plugin_capture_night.xml b/app/src/main/res/values-zh-rCN/strings_plugin_capture_night.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_capture_night.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_capture_night.xml diff --git a/res/values-zh-rCN/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-zh-rCN/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-zh-rCN/strings_plugin_capture_preshot.xml b/app/src/main/res/values-zh-rCN/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_capture_preshot.xml diff --git a/res/values-zh-rCN/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-zh-rCN/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_capture_selftimer.xml diff --git a/res/values-zh-rCN/strings_plugin_capture_video.xml b/app/src/main/res/values-zh-rCN/strings_plugin_capture_video.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_capture_video.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_capture_video.xml diff --git a/res/values-zh-rCN/strings_plugin_export_common.xml b/app/src/main/res/values-zh-rCN/strings_plugin_export_common.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_export_common.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_export_common.xml diff --git a/res/values-zh-rCN/strings_plugin_export_export.xml b/app/src/main/res/values-zh-rCN/strings_plugin_export_export.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_export_export.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_export_export.xml diff --git a/res/values-zh-rCN/strings_plugin_preferences.xml b/app/src/main/res/values-zh-rCN/strings_plugin_preferences.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_preferences.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_preferences.xml diff --git a/res/values-zh-rCN/strings_plugin_processing_hdr.xml b/app/src/main/res/values-zh-rCN/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_processing_hdr.xml diff --git a/res/values-zh-rCN/strings_plugin_processing_multishot.xml b/app/src/main/res/values-zh-rCN/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_processing_multishot.xml diff --git a/res/values-zh-rCN/strings_plugin_processing_night.xml b/app/src/main/res/values-zh-rCN/strings_plugin_processing_night.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_processing_night.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_processing_night.xml diff --git a/res/values-zh-rCN/strings_plugin_processing_panorama.xml b/app/src/main/res/values-zh-rCN/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_processing_panorama.xml diff --git a/res/values-zh-rCN/strings_plugin_processing_preshot.xml b/app/src/main/res/values-zh-rCN/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_processing_preshot.xml diff --git a/res/values-zh-rCN/strings_plugin_processing_processing.xml b/app/src/main/res/values-zh-rCN/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_processing_processing.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_processing_processing.xml diff --git a/res/values-zh-rCN/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-zh-rCN/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_vf_aeawlock.xml diff --git a/res/values-zh-rCN/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-zh-rCN/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-zh-rCN/strings_plugin_vf_common.xml b/app/src/main/res/values-zh-rCN/strings_plugin_vf_common.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_vf_common.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_vf_common.xml diff --git a/res/values-zh-rCN/strings_plugin_vf_focus.xml b/app/src/main/res/values-zh-rCN/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_vf_focus.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_vf_focus.xml diff --git a/res/values-zh-rCN/strings_plugin_vf_grid.xml b/app/src/main/res/values-zh-rCN/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_vf_grid.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_vf_grid.xml diff --git a/res/values-zh-rCN/strings_plugin_vf_gyro.xml b/app/src/main/res/values-zh-rCN/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_vf_gyro.xml diff --git a/res/values-zh-rCN/strings_plugin_vf_histogram.xml b/app/src/main/res/values-zh-rCN/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_vf_histogram.xml diff --git a/res/values-zh-rCN/strings_plugin_vf_infoset.xml b/app/src/main/res/values-zh-rCN/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_vf_infoset.xml diff --git a/res/values-zh-rCN/strings_plugin_vf_zoom.xml b/app/src/main/res/values-zh-rCN/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-zh-rCN/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-zh-rCN/strings_plugin_vf_zoom.xml diff --git a/res/values-zh-rCN/strings_preferences_modes.xml b/app/src/main/res/values-zh-rCN/strings_preferences_modes.xml similarity index 100% rename from res/values-zh-rCN/strings_preferences_modes.xml rename to app/src/main/res/values-zh-rCN/strings_preferences_modes.xml diff --git a/res/values-zh-rCN/strings_preferences_upgrade.xml b/app/src/main/res/values-zh-rCN/strings_preferences_upgrade.xml similarity index 100% rename from res/values-zh-rCN/strings_preferences_upgrade.xml rename to app/src/main/res/values-zh-rCN/strings_preferences_upgrade.xml diff --git a/res/values-zh-rCN/strings_widget.xml b/app/src/main/res/values-zh-rCN/strings_widget.xml similarity index 100% rename from res/values-zh-rCN/strings_widget.xml rename to app/src/main/res/values-zh-rCN/strings_widget.xml diff --git a/res/values-zh-rTW/description.xml b/app/src/main/res/values-zh-rTW/description.xml similarity index 100% rename from res/values-zh-rTW/description.xml rename to app/src/main/res/values-zh-rTW/description.xml diff --git a/res/values-zh-rTW/strings_almalence_gui.xml b/app/src/main/res/values-zh-rTW/strings_almalence_gui.xml similarity index 100% rename from res/values-zh-rTW/strings_almalence_gui.xml rename to app/src/main/res/values-zh-rTW/strings_almalence_gui.xml diff --git a/res/values-zh-rTW/strings_modes.xml b/app/src/main/res/values-zh-rTW/strings_modes.xml similarity index 100% rename from res/values-zh-rTW/strings_modes.xml rename to app/src/main/res/values-zh-rTW/strings_modes.xml diff --git a/res/values-zh-rTW/strings_opencamera.xml b/app/src/main/res/values-zh-rTW/strings_opencamera.xml similarity index 100% rename from res/values-zh-rTW/strings_opencamera.xml rename to app/src/main/res/values-zh-rTW/strings_opencamera.xml diff --git a/res/values-zh-rTW/strings_plugin_capture_bestshot.xml b/app/src/main/res/values-zh-rTW/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_capture_bestshot.xml diff --git a/res/values-zh-rTW/strings_plugin_capture_burst.xml b/app/src/main/res/values-zh-rTW/strings_plugin_capture_burst.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_capture_burst.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_capture_burst.xml diff --git a/res/values-zh-rTW/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values-zh-rTW/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_capture_expobracketing.xml diff --git a/res/values-zh-rTW/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values-zh-rTW/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_capture_hiresportrait.xml diff --git a/res/values-zh-rTW/strings_plugin_capture_multishot.xml b/app/src/main/res/values-zh-rTW/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_capture_multishot.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_capture_multishot.xml diff --git a/res/values-zh-rTW/strings_plugin_capture_night.xml b/app/src/main/res/values-zh-rTW/strings_plugin_capture_night.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_capture_night.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_capture_night.xml diff --git a/res/values-zh-rTW/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values-zh-rTW/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values-zh-rTW/strings_plugin_capture_preshot.xml b/app/src/main/res/values-zh-rTW/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_capture_preshot.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_capture_preshot.xml diff --git a/res/values-zh-rTW/strings_plugin_capture_selftimer.xml b/app/src/main/res/values-zh-rTW/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_capture_selftimer.xml diff --git a/res/values-zh-rTW/strings_plugin_capture_video.xml b/app/src/main/res/values-zh-rTW/strings_plugin_capture_video.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_capture_video.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_capture_video.xml diff --git a/res/values-zh-rTW/strings_plugin_export_common.xml b/app/src/main/res/values-zh-rTW/strings_plugin_export_common.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_export_common.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_export_common.xml diff --git a/res/values-zh-rTW/strings_plugin_export_export.xml b/app/src/main/res/values-zh-rTW/strings_plugin_export_export.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_export_export.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_export_export.xml diff --git a/res/values-zh-rTW/strings_plugin_preferences.xml b/app/src/main/res/values-zh-rTW/strings_plugin_preferences.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_preferences.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_preferences.xml diff --git a/res/values-zh-rTW/strings_plugin_processing_hdr.xml b/app/src/main/res/values-zh-rTW/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_processing_hdr.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_processing_hdr.xml diff --git a/res/values-zh-rTW/strings_plugin_processing_multishot.xml b/app/src/main/res/values-zh-rTW/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_processing_multishot.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_processing_multishot.xml diff --git a/res/values-zh-rTW/strings_plugin_processing_night.xml b/app/src/main/res/values-zh-rTW/strings_plugin_processing_night.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_processing_night.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_processing_night.xml diff --git a/res/values-zh-rTW/strings_plugin_processing_panorama.xml b/app/src/main/res/values-zh-rTW/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_processing_panorama.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_processing_panorama.xml diff --git a/res/values-zh-rTW/strings_plugin_processing_preshot.xml b/app/src/main/res/values-zh-rTW/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_processing_preshot.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_processing_preshot.xml diff --git a/res/values-zh-rTW/strings_plugin_processing_processing.xml b/app/src/main/res/values-zh-rTW/strings_plugin_processing_processing.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_processing_processing.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_processing_processing.xml diff --git a/res/values-zh-rTW/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values-zh-rTW/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_vf_aeawlock.xml diff --git a/res/values-zh-rTW/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values-zh-rTW/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_vf_barcodescanner.xml diff --git a/res/values-zh-rTW/strings_plugin_vf_common.xml b/app/src/main/res/values-zh-rTW/strings_plugin_vf_common.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_vf_common.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_vf_common.xml diff --git a/res/values-zh-rTW/strings_plugin_vf_focus.xml b/app/src/main/res/values-zh-rTW/strings_plugin_vf_focus.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_vf_focus.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_vf_focus.xml diff --git a/res/values-zh-rTW/strings_plugin_vf_grid.xml b/app/src/main/res/values-zh-rTW/strings_plugin_vf_grid.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_vf_grid.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_vf_grid.xml diff --git a/res/values-zh-rTW/strings_plugin_vf_gyro.xml b/app/src/main/res/values-zh-rTW/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_vf_gyro.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_vf_gyro.xml diff --git a/res/values-zh-rTW/strings_plugin_vf_histogram.xml b/app/src/main/res/values-zh-rTW/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_vf_histogram.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_vf_histogram.xml diff --git a/res/values-zh-rTW/strings_plugin_vf_infoset.xml b/app/src/main/res/values-zh-rTW/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_vf_infoset.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_vf_infoset.xml diff --git a/res/values-zh-rTW/strings_plugin_vf_zoom.xml b/app/src/main/res/values-zh-rTW/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values-zh-rTW/strings_plugin_vf_zoom.xml rename to app/src/main/res/values-zh-rTW/strings_plugin_vf_zoom.xml diff --git a/res/values-zh-rTW/strings_preferences_modes.xml b/app/src/main/res/values-zh-rTW/strings_preferences_modes.xml similarity index 100% rename from res/values-zh-rTW/strings_preferences_modes.xml rename to app/src/main/res/values-zh-rTW/strings_preferences_modes.xml diff --git a/res/values-zh-rTW/strings_preferences_upgrade.xml b/app/src/main/res/values-zh-rTW/strings_preferences_upgrade.xml similarity index 100% rename from res/values-zh-rTW/strings_preferences_upgrade.xml rename to app/src/main/res/values-zh-rTW/strings_preferences_upgrade.xml diff --git a/res/values-zh-rTW/strings_widget.xml b/app/src/main/res/values-zh-rTW/strings_widget.xml similarity index 100% rename from res/values-zh-rTW/strings_widget.xml rename to app/src/main/res/values-zh-rTW/strings_widget.xml diff --git a/res/values/almalence_gui_dimens.xml b/app/src/main/res/values/almalence_gui_dimens.xml similarity index 100% rename from res/values/almalence_gui_dimens.xml rename to app/src/main/res/values/almalence_gui_dimens.xml diff --git a/res/values/almalence_gui_integers.xml b/app/src/main/res/values/almalence_gui_integers.xml similarity index 100% rename from res/values/almalence_gui_integers.xml rename to app/src/main/res/values/almalence_gui_integers.xml diff --git a/res/values/array_opencamera.xml b/app/src/main/res/values/array_opencamera.xml similarity index 100% rename from res/values/array_opencamera.xml rename to app/src/main/res/values/array_opencamera.xml diff --git a/res/values/array_plugin_capture_bestshot.xml b/app/src/main/res/values/array_plugin_capture_bestshot.xml similarity index 100% rename from res/values/array_plugin_capture_bestshot.xml rename to app/src/main/res/values/array_plugin_capture_bestshot.xml diff --git a/res/values/array_plugin_capture_burst.xml b/app/src/main/res/values/array_plugin_capture_burst.xml similarity index 100% rename from res/values/array_plugin_capture_burst.xml rename to app/src/main/res/values/array_plugin_capture_burst.xml diff --git a/res/values/array_plugin_capture_dro.xml b/app/src/main/res/values/array_plugin_capture_dro.xml similarity index 100% rename from res/values/array_plugin_capture_dro.xml rename to app/src/main/res/values/array_plugin_capture_dro.xml diff --git a/res/values/array_plugin_capture_expobracketing.xml b/app/src/main/res/values/array_plugin_capture_expobracketing.xml similarity index 100% rename from res/values/array_plugin_capture_expobracketing.xml rename to app/src/main/res/values/array_plugin_capture_expobracketing.xml diff --git a/res/values/array_plugin_capture_night.xml b/app/src/main/res/values/array_plugin_capture_night.xml similarity index 100% rename from res/values/array_plugin_capture_night.xml rename to app/src/main/res/values/array_plugin_capture_night.xml diff --git a/res/values/array_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values/array_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values/array_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values/array_plugin_capture_panoramaaugmented.xml diff --git a/res/values/array_plugin_capture_preshot.xml b/app/src/main/res/values/array_plugin_capture_preshot.xml similarity index 100% rename from res/values/array_plugin_capture_preshot.xml rename to app/src/main/res/values/array_plugin_capture_preshot.xml diff --git a/res/values/array_plugin_capture_selftimer.xml b/app/src/main/res/values/array_plugin_capture_selftimer.xml similarity index 100% rename from res/values/array_plugin_capture_selftimer.xml rename to app/src/main/res/values/array_plugin_capture_selftimer.xml diff --git a/res/values/array_plugin_capture_video.xml b/app/src/main/res/values/array_plugin_capture_video.xml similarity index 100% rename from res/values/array_plugin_capture_video.xml rename to app/src/main/res/values/array_plugin_capture_video.xml diff --git a/res/values/array_plugin_export_common.xml b/app/src/main/res/values/array_plugin_export_common.xml similarity index 100% rename from res/values/array_plugin_export_common.xml rename to app/src/main/res/values/array_plugin_export_common.xml diff --git a/res/values/array_plugin_export_export.xml b/app/src/main/res/values/array_plugin_export_export.xml similarity index 100% rename from res/values/array_plugin_export_export.xml rename to app/src/main/res/values/array_plugin_export_export.xml diff --git a/res/values/array_plugin_processing_hdr.xml b/app/src/main/res/values/array_plugin_processing_hdr.xml similarity index 100% rename from res/values/array_plugin_processing_hdr.xml rename to app/src/main/res/values/array_plugin_processing_hdr.xml diff --git a/res/values/array_plugin_processing_night.xml b/app/src/main/res/values/array_plugin_processing_night.xml similarity index 100% rename from res/values/array_plugin_processing_night.xml rename to app/src/main/res/values/array_plugin_processing_night.xml diff --git a/res/values/array_plugin_vf_grid.xml b/app/src/main/res/values/array_plugin_vf_grid.xml similarity index 100% rename from res/values/array_plugin_vf_grid.xml rename to app/src/main/res/values/array_plugin_vf_grid.xml diff --git a/res/values/array_plugin_vf_histogram.xml b/app/src/main/res/values/array_plugin_vf_histogram.xml similarity index 100% rename from res/values/array_plugin_vf_histogram.xml rename to app/src/main/res/values/array_plugin_vf_histogram.xml diff --git a/res/values/attrs._plugin_processing_groupshot.xml b/app/src/main/res/values/attrs._plugin_processing_groupshot.xml similarity index 100% rename from res/values/attrs._plugin_processing_groupshot.xml rename to app/src/main/res/values/attrs._plugin_processing_groupshot.xml diff --git a/res/values/attrs.xml b/app/src/main/res/values/attrs.xml similarity index 100% rename from res/values/attrs.xml rename to app/src/main/res/values/attrs.xml diff --git a/res/values/attrs_almalence_panel.xml b/app/src/main/res/values/attrs_almalence_panel.xml similarity index 100% rename from res/values/attrs_almalence_panel.xml rename to app/src/main/res/values/attrs_almalence_panel.xml diff --git a/res/values/attrs_plugin_capture_night.xml b/app/src/main/res/values/attrs_plugin_capture_night.xml similarity index 100% rename from res/values/attrs_plugin_capture_night.xml rename to app/src/main/res/values/attrs_plugin_capture_night.xml diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/res/values/colors_plugin_capture_video.xml b/app/src/main/res/values/colors_plugin_capture_video.xml similarity index 100% rename from res/values/colors_plugin_capture_video.xml rename to app/src/main/res/values/colors_plugin_capture_video.xml diff --git a/res/values/id_gui_almalence_panel.xml b/app/src/main/res/values/id_gui_almalence_panel.xml similarity index 100% rename from res/values/id_gui_almalence_panel.xml rename to app/src/main/res/values/id_gui_almalence_panel.xml diff --git a/res/values/plugin_capture_night_dimension.xml b/app/src/main/res/values/plugin_capture_night_dimension.xml similarity index 100% rename from res/values/plugin_capture_night_dimension.xml rename to app/src/main/res/values/plugin_capture_night_dimension.xml diff --git a/res/values/plugin_capture_video_dimens.xml b/app/src/main/res/values/plugin_capture_video_dimens.xml similarity index 100% rename from res/values/plugin_capture_video_dimens.xml rename to app/src/main/res/values/plugin_capture_video_dimens.xml diff --git a/res/values/plugin_processing_preshot_dimension.xml b/app/src/main/res/values/plugin_processing_preshot_dimension.xml similarity index 100% rename from res/values/plugin_processing_preshot_dimension.xml rename to app/src/main/res/values/plugin_processing_preshot_dimension.xml diff --git a/res/values/plugin_vf_aeawlock_dimens.xml b/app/src/main/res/values/plugin_vf_aeawlock_dimens.xml similarity index 100% rename from res/values/plugin_vf_aeawlock_dimens.xml rename to app/src/main/res/values/plugin_vf_aeawlock_dimens.xml diff --git a/res/values/plugin_vf_focus_cropfactor.xml b/app/src/main/res/values/plugin_vf_focus_cropfactor.xml similarity index 100% rename from res/values/plugin_vf_focus_cropfactor.xml rename to app/src/main/res/values/plugin_vf_focus_cropfactor.xml diff --git a/res/values/plugin_vf_infoset_dimension.xml b/app/src/main/res/values/plugin_vf_infoset_dimension.xml similarity index 100% rename from res/values/plugin_vf_infoset_dimension.xml rename to app/src/main/res/values/plugin_vf_infoset_dimension.xml diff --git a/res/values/plugin_vf_zoom_dimension.xml b/app/src/main/res/values/plugin_vf_zoom_dimension.xml similarity index 100% rename from res/values/plugin_vf_zoom_dimension.xml rename to app/src/main/res/values/plugin_vf_zoom_dimension.xml diff --git a/res/values/screen.xml b/app/src/main/res/values/screen.xml similarity index 100% rename from res/values/screen.xml rename to app/src/main/res/values/screen.xml diff --git a/res/values/sony_camera_strings.xml b/app/src/main/res/values/sony_camera_strings.xml similarity index 100% rename from res/values/sony_camera_strings.xml rename to app/src/main/res/values/sony_camera_strings.xml diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/res/values/strings_almalence_gui.xml b/app/src/main/res/values/strings_almalence_gui.xml similarity index 100% rename from res/values/strings_almalence_gui.xml rename to app/src/main/res/values/strings_almalence_gui.xml diff --git a/res/values/strings_modes.xml b/app/src/main/res/values/strings_modes.xml similarity index 100% rename from res/values/strings_modes.xml rename to app/src/main/res/values/strings_modes.xml diff --git a/res/values/strings_opencamera.xml b/app/src/main/res/values/strings_opencamera.xml similarity index 100% rename from res/values/strings_opencamera.xml rename to app/src/main/res/values/strings_opencamera.xml diff --git a/res/values/strings_opencamera_prefs.xml b/app/src/main/res/values/strings_opencamera_prefs.xml similarity index 100% rename from res/values/strings_opencamera_prefs.xml rename to app/src/main/res/values/strings_opencamera_prefs.xml diff --git a/res/values/strings_plugin_capture_bestshot.xml b/app/src/main/res/values/strings_plugin_capture_bestshot.xml similarity index 100% rename from res/values/strings_plugin_capture_bestshot.xml rename to app/src/main/res/values/strings_plugin_capture_bestshot.xml diff --git a/res/values/strings_plugin_capture_burst.xml b/app/src/main/res/values/strings_plugin_capture_burst.xml similarity index 100% rename from res/values/strings_plugin_capture_burst.xml rename to app/src/main/res/values/strings_plugin_capture_burst.xml diff --git a/res/values/strings_plugin_capture_dro.xml b/app/src/main/res/values/strings_plugin_capture_dro.xml similarity index 100% rename from res/values/strings_plugin_capture_dro.xml rename to app/src/main/res/values/strings_plugin_capture_dro.xml diff --git a/res/values/strings_plugin_capture_expobracketing.xml b/app/src/main/res/values/strings_plugin_capture_expobracketing.xml similarity index 100% rename from res/values/strings_plugin_capture_expobracketing.xml rename to app/src/main/res/values/strings_plugin_capture_expobracketing.xml diff --git a/res/values/strings_plugin_capture_hiresportrait.xml b/app/src/main/res/values/strings_plugin_capture_hiresportrait.xml similarity index 100% rename from res/values/strings_plugin_capture_hiresportrait.xml rename to app/src/main/res/values/strings_plugin_capture_hiresportrait.xml diff --git a/res/values/strings_plugin_capture_multishot.xml b/app/src/main/res/values/strings_plugin_capture_multishot.xml similarity index 100% rename from res/values/strings_plugin_capture_multishot.xml rename to app/src/main/res/values/strings_plugin_capture_multishot.xml diff --git a/res/values/strings_plugin_capture_night.xml b/app/src/main/res/values/strings_plugin_capture_night.xml similarity index 100% rename from res/values/strings_plugin_capture_night.xml rename to app/src/main/res/values/strings_plugin_capture_night.xml diff --git a/res/values/strings_plugin_capture_panoramaaugmented.xml b/app/src/main/res/values/strings_plugin_capture_panoramaaugmented.xml similarity index 100% rename from res/values/strings_plugin_capture_panoramaaugmented.xml rename to app/src/main/res/values/strings_plugin_capture_panoramaaugmented.xml diff --git a/res/values/strings_plugin_capture_preshot.xml b/app/src/main/res/values/strings_plugin_capture_preshot.xml similarity index 100% rename from res/values/strings_plugin_capture_preshot.xml rename to app/src/main/res/values/strings_plugin_capture_preshot.xml diff --git a/res/values/strings_plugin_capture_selftimer.xml b/app/src/main/res/values/strings_plugin_capture_selftimer.xml similarity index 100% rename from res/values/strings_plugin_capture_selftimer.xml rename to app/src/main/res/values/strings_plugin_capture_selftimer.xml diff --git a/res/values/strings_plugin_capture_video.xml b/app/src/main/res/values/strings_plugin_capture_video.xml similarity index 100% rename from res/values/strings_plugin_capture_video.xml rename to app/src/main/res/values/strings_plugin_capture_video.xml diff --git a/res/values/strings_plugin_export_common.xml b/app/src/main/res/values/strings_plugin_export_common.xml similarity index 100% rename from res/values/strings_plugin_export_common.xml rename to app/src/main/res/values/strings_plugin_export_common.xml diff --git a/res/values/strings_plugin_export_export.xml b/app/src/main/res/values/strings_plugin_export_export.xml similarity index 100% rename from res/values/strings_plugin_export_export.xml rename to app/src/main/res/values/strings_plugin_export_export.xml diff --git a/res/values/strings_plugin_preferences.xml b/app/src/main/res/values/strings_plugin_preferences.xml similarity index 100% rename from res/values/strings_plugin_preferences.xml rename to app/src/main/res/values/strings_plugin_preferences.xml diff --git a/res/values/strings_plugin_processing_hdr.xml b/app/src/main/res/values/strings_plugin_processing_hdr.xml similarity index 100% rename from res/values/strings_plugin_processing_hdr.xml rename to app/src/main/res/values/strings_plugin_processing_hdr.xml diff --git a/res/values/strings_plugin_processing_multishot.xml b/app/src/main/res/values/strings_plugin_processing_multishot.xml similarity index 100% rename from res/values/strings_plugin_processing_multishot.xml rename to app/src/main/res/values/strings_plugin_processing_multishot.xml diff --git a/res/values/strings_plugin_processing_night.xml b/app/src/main/res/values/strings_plugin_processing_night.xml similarity index 100% rename from res/values/strings_plugin_processing_night.xml rename to app/src/main/res/values/strings_plugin_processing_night.xml diff --git a/res/values/strings_plugin_processing_panorama.xml b/app/src/main/res/values/strings_plugin_processing_panorama.xml similarity index 100% rename from res/values/strings_plugin_processing_panorama.xml rename to app/src/main/res/values/strings_plugin_processing_panorama.xml diff --git a/res/values/strings_plugin_processing_preshot.xml b/app/src/main/res/values/strings_plugin_processing_preshot.xml similarity index 100% rename from res/values/strings_plugin_processing_preshot.xml rename to app/src/main/res/values/strings_plugin_processing_preshot.xml diff --git a/res/values/strings_plugin_processing_processing.xml b/app/src/main/res/values/strings_plugin_processing_processing.xml similarity index 100% rename from res/values/strings_plugin_processing_processing.xml rename to app/src/main/res/values/strings_plugin_processing_processing.xml diff --git a/res/values/strings_plugin_vf_aeawlock.xml b/app/src/main/res/values/strings_plugin_vf_aeawlock.xml similarity index 100% rename from res/values/strings_plugin_vf_aeawlock.xml rename to app/src/main/res/values/strings_plugin_vf_aeawlock.xml diff --git a/res/values/strings_plugin_vf_barcodescanner.xml b/app/src/main/res/values/strings_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values/strings_plugin_vf_barcodescanner.xml rename to app/src/main/res/values/strings_plugin_vf_barcodescanner.xml diff --git a/res/values/strings_plugin_vf_common.xml b/app/src/main/res/values/strings_plugin_vf_common.xml similarity index 100% rename from res/values/strings_plugin_vf_common.xml rename to app/src/main/res/values/strings_plugin_vf_common.xml diff --git a/res/values/strings_plugin_vf_focus.xml b/app/src/main/res/values/strings_plugin_vf_focus.xml similarity index 100% rename from res/values/strings_plugin_vf_focus.xml rename to app/src/main/res/values/strings_plugin_vf_focus.xml diff --git a/res/values/strings_plugin_vf_grid.xml b/app/src/main/res/values/strings_plugin_vf_grid.xml similarity index 100% rename from res/values/strings_plugin_vf_grid.xml rename to app/src/main/res/values/strings_plugin_vf_grid.xml diff --git a/res/values/strings_plugin_vf_gyro.xml b/app/src/main/res/values/strings_plugin_vf_gyro.xml similarity index 100% rename from res/values/strings_plugin_vf_gyro.xml rename to app/src/main/res/values/strings_plugin_vf_gyro.xml diff --git a/res/values/strings_plugin_vf_histogram.xml b/app/src/main/res/values/strings_plugin_vf_histogram.xml similarity index 100% rename from res/values/strings_plugin_vf_histogram.xml rename to app/src/main/res/values/strings_plugin_vf_histogram.xml diff --git a/res/values/strings_plugin_vf_infoset.xml b/app/src/main/res/values/strings_plugin_vf_infoset.xml similarity index 100% rename from res/values/strings_plugin_vf_infoset.xml rename to app/src/main/res/values/strings_plugin_vf_infoset.xml diff --git a/res/values/strings_plugin_vf_zoom.xml b/app/src/main/res/values/strings_plugin_vf_zoom.xml similarity index 100% rename from res/values/strings_plugin_vf_zoom.xml rename to app/src/main/res/values/strings_plugin_vf_zoom.xml diff --git a/res/values/strings_preferences_modes.xml b/app/src/main/res/values/strings_preferences_modes.xml similarity index 100% rename from res/values/strings_preferences_modes.xml rename to app/src/main/res/values/strings_preferences_modes.xml diff --git a/res/values/strings_preferences_upgrade.xml b/app/src/main/res/values/strings_preferences_upgrade.xml similarity index 100% rename from res/values/strings_preferences_upgrade.xml rename to app/src/main/res/values/strings_preferences_upgrade.xml diff --git a/res/values/strings_widget.xml b/app/src/main/res/values/strings_widget.xml similarity index 100% rename from res/values/strings_widget.xml rename to app/src/main/res/values/strings_widget.xml diff --git a/res/values/style_gui_almalence_settings.xml b/app/src/main/res/values/style_gui_almalence_settings.xml similarity index 100% rename from res/values/style_gui_almalence_settings.xml rename to app/src/main/res/values/style_gui_almalence_settings.xml diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/res/values/styles_plugin_capture_night.xml b/app/src/main/res/values/styles_plugin_capture_night.xml similarity index 100% rename from res/values/styles_plugin_capture_night.xml rename to app/src/main/res/values/styles_plugin_capture_night.xml diff --git a/res/values/styles_plugin_capture_selftimer_countdown.xml b/app/src/main/res/values/styles_plugin_capture_selftimer_countdown.xml similarity index 100% rename from res/values/styles_plugin_capture_selftimer_countdown.xml rename to app/src/main/res/values/styles_plugin_capture_selftimer_countdown.xml diff --git a/res/values/styles_plugin_capture_video.xml b/app/src/main/res/values/styles_plugin_capture_video.xml similarity index 100% rename from res/values/styles_plugin_capture_video.xml rename to app/src/main/res/values/styles_plugin_capture_video.xml diff --git a/res/values/styles_plugin_vf_barcodescanner.xml b/app/src/main/res/values/styles_plugin_vf_barcodescanner.xml similarity index 100% rename from res/values/styles_plugin_vf_barcodescanner.xml rename to app/src/main/res/values/styles_plugin_vf_barcodescanner.xml diff --git a/res/values/themes.xml b/app/src/main/res/values/themes.xml similarity index 100% rename from res/values/themes.xml rename to app/src/main/res/values/themes.xml diff --git a/res/values/widget_dimens.xml b/app/src/main/res/values/widget_dimens.xml similarity index 100% rename from res/values/widget_dimens.xml rename to app/src/main/res/values/widget_dimens.xml diff --git a/res/xml/opencamera_appfullsolidwidget_info.xml b/app/src/main/res/xml/opencamera_appfullsolidwidget_info.xml similarity index 100% rename from res/xml/opencamera_appfullsolidwidget_info.xml rename to app/src/main/res/xml/opencamera_appfullsolidwidget_info.xml diff --git a/res/xml/opencamera_appsolidwidget_info.xml b/app/src/main/res/xml/opencamera_appsolidwidget_info.xml similarity index 100% rename from res/xml/opencamera_appsolidwidget_info.xml rename to app/src/main/res/xml/opencamera_appsolidwidget_info.xml diff --git a/res/xml/opencamera_appwidget_info.xml b/app/src/main/res/xml/opencamera_appwidget_info.xml similarity index 100% rename from res/xml/opencamera_appwidget_info.xml rename to app/src/main/res/xml/opencamera_appwidget_info.xml diff --git a/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml similarity index 100% rename from res/xml/preferences.xml rename to app/src/main/res/xml/preferences.xml diff --git a/res/xml/preferences_advance_inactive.xml b/app/src/main/res/xml/preferences_advance_inactive.xml similarity index 100% rename from res/xml/preferences_advance_inactive.xml rename to app/src/main/res/xml/preferences_advance_inactive.xml diff --git a/res/xml/preferences_advanced_common.xml b/app/src/main/res/xml/preferences_advanced_common.xml similarity index 100% rename from res/xml/preferences_advanced_common.xml rename to app/src/main/res/xml/preferences_advanced_common.xml diff --git a/res/xml/preferences_capture_burst.xml b/app/src/main/res/xml/preferences_capture_burst.xml similarity index 100% rename from res/xml/preferences_capture_burst.xml rename to app/src/main/res/xml/preferences_capture_burst.xml diff --git a/res/xml/preferences_capture_dro.xml b/app/src/main/res/xml/preferences_capture_dro.xml similarity index 100% rename from res/xml/preferences_capture_dro.xml rename to app/src/main/res/xml/preferences_capture_dro.xml diff --git a/res/xml/preferences_capture_expobracketing.xml b/app/src/main/res/xml/preferences_capture_expobracketing.xml similarity index 100% rename from res/xml/preferences_capture_expobracketing.xml rename to app/src/main/res/xml/preferences_capture_expobracketing.xml diff --git a/res/xml/preferences_capture_expobracketing_more.xml b/app/src/main/res/xml/preferences_capture_expobracketing_more.xml similarity index 100% rename from res/xml/preferences_capture_expobracketing_more.xml rename to app/src/main/res/xml/preferences_capture_expobracketing_more.xml diff --git a/res/xml/preferences_capture_night.xml b/app/src/main/res/xml/preferences_capture_night.xml similarity index 100% rename from res/xml/preferences_capture_night.xml rename to app/src/main/res/xml/preferences_capture_night.xml diff --git a/res/xml/preferences_capture_night_more.xml b/app/src/main/res/xml/preferences_capture_night_more.xml similarity index 100% rename from res/xml/preferences_capture_night_more.xml rename to app/src/main/res/xml/preferences_capture_night_more.xml diff --git a/res/xml/preferences_capture_panoramaaugmented.xml b/app/src/main/res/xml/preferences_capture_panoramaaugmented.xml similarity index 100% rename from res/xml/preferences_capture_panoramaaugmented.xml rename to app/src/main/res/xml/preferences_capture_panoramaaugmented.xml diff --git a/res/xml/preferences_capture_panoramaaugmented_more.xml b/app/src/main/res/xml/preferences_capture_panoramaaugmented_more.xml similarity index 100% rename from res/xml/preferences_capture_panoramaaugmented_more.xml rename to app/src/main/res/xml/preferences_capture_panoramaaugmented_more.xml diff --git a/res/xml/preferences_capture_preshot.xml b/app/src/main/res/xml/preferences_capture_preshot.xml similarity index 100% rename from res/xml/preferences_capture_preshot.xml rename to app/src/main/res/xml/preferences_capture_preshot.xml diff --git a/res/xml/preferences_capture_preshot_more.xml b/app/src/main/res/xml/preferences_capture_preshot_more.xml similarity index 100% rename from res/xml/preferences_capture_preshot_more.xml rename to app/src/main/res/xml/preferences_capture_preshot_more.xml diff --git a/res/xml/preferences_capture_selftimer.xml b/app/src/main/res/xml/preferences_capture_selftimer.xml similarity index 100% rename from res/xml/preferences_capture_selftimer.xml rename to app/src/main/res/xml/preferences_capture_selftimer.xml diff --git a/res/xml/preferences_capture_video.xml b/app/src/main/res/xml/preferences_capture_video.xml similarity index 100% rename from res/xml/preferences_capture_video.xml rename to app/src/main/res/xml/preferences_capture_video.xml diff --git a/res/xml/preferences_export_common.xml b/app/src/main/res/xml/preferences_export_common.xml similarity index 100% rename from res/xml/preferences_export_common.xml rename to app/src/main/res/xml/preferences_export_common.xml diff --git a/res/xml/preferences_export_export.xml b/app/src/main/res/xml/preferences_export_export.xml similarity index 100% rename from res/xml/preferences_export_export.xml rename to app/src/main/res/xml/preferences_export_export.xml diff --git a/res/xml/preferences_export_timestamp.xml b/app/src/main/res/xml/preferences_export_timestamp.xml similarity index 100% rename from res/xml/preferences_export_timestamp.xml rename to app/src/main/res/xml/preferences_export_timestamp.xml diff --git a/res/xml/preferences_general_image_size.xml b/app/src/main/res/xml/preferences_general_image_size.xml similarity index 100% rename from res/xml/preferences_general_image_size.xml rename to app/src/main/res/xml/preferences_general_image_size.xml diff --git a/res/xml/preferences_general_more.xml b/app/src/main/res/xml/preferences_general_more.xml similarity index 100% rename from res/xml/preferences_general_more.xml rename to app/src/main/res/xml/preferences_general_more.xml diff --git a/res/xml/preferences_general_saveconfiguration.xml b/app/src/main/res/xml/preferences_general_saveconfiguration.xml similarity index 100% rename from res/xml/preferences_general_saveconfiguration.xml rename to app/src/main/res/xml/preferences_general_saveconfiguration.xml diff --git a/res/xml/preferences_headers.xml b/app/src/main/res/xml/preferences_headers.xml similarity index 100% rename from res/xml/preferences_headers.xml rename to app/src/main/res/xml/preferences_headers.xml diff --git a/res/xml/preferences_modes.xml b/app/src/main/res/xml/preferences_modes.xml similarity index 100% rename from res/xml/preferences_modes.xml rename to app/src/main/res/xml/preferences_modes.xml diff --git a/res/xml/preferences_processing_hdr.xml b/app/src/main/res/xml/preferences_processing_hdr.xml similarity index 100% rename from res/xml/preferences_processing_hdr.xml rename to app/src/main/res/xml/preferences_processing_hdr.xml diff --git a/res/xml/preferences_processing_hdr_more.xml b/app/src/main/res/xml/preferences_processing_hdr_more.xml similarity index 100% rename from res/xml/preferences_processing_hdr_more.xml rename to app/src/main/res/xml/preferences_processing_hdr_more.xml diff --git a/res/xml/preferences_processing_multishot.xml b/app/src/main/res/xml/preferences_processing_multishot.xml similarity index 100% rename from res/xml/preferences_processing_multishot.xml rename to app/src/main/res/xml/preferences_processing_multishot.xml diff --git a/res/xml/preferences_processing_night.xml b/app/src/main/res/xml/preferences_processing_night.xml similarity index 100% rename from res/xml/preferences_processing_night.xml rename to app/src/main/res/xml/preferences_processing_night.xml diff --git a/res/xml/preferences_processing_night_more.xml b/app/src/main/res/xml/preferences_processing_night_more.xml similarity index 100% rename from res/xml/preferences_processing_night_more.xml rename to app/src/main/res/xml/preferences_processing_night_more.xml diff --git a/res/xml/preferences_processing_panorama.xml b/app/src/main/res/xml/preferences_processing_panorama.xml similarity index 100% rename from res/xml/preferences_processing_panorama.xml rename to app/src/main/res/xml/preferences_processing_panorama.xml diff --git a/res/xml/preferences_processing_preshot.xml b/app/src/main/res/xml/preferences_processing_preshot.xml similarity index 100% rename from res/xml/preferences_processing_preshot.xml rename to app/src/main/res/xml/preferences_processing_preshot.xml diff --git a/res/xml/preferences_processing_processing.xml b/app/src/main/res/xml/preferences_processing_processing.xml similarity index 100% rename from res/xml/preferences_processing_processing.xml rename to app/src/main/res/xml/preferences_processing_processing.xml diff --git a/res/xml/preferences_processing_super.xml b/app/src/main/res/xml/preferences_processing_super.xml similarity index 100% rename from res/xml/preferences_processing_super.xml rename to app/src/main/res/xml/preferences_processing_super.xml diff --git a/res/xml/preferences_saving_inactive.xml b/app/src/main/res/xml/preferences_saving_inactive.xml similarity index 100% rename from res/xml/preferences_saving_inactive.xml rename to app/src/main/res/xml/preferences_saving_inactive.xml diff --git a/res/xml/preferences_shooting_inactive.xml b/app/src/main/res/xml/preferences_shooting_inactive.xml similarity index 100% rename from res/xml/preferences_shooting_inactive.xml rename to app/src/main/res/xml/preferences_shooting_inactive.xml diff --git a/res/xml/preferences_vf_aeawlock.xml b/app/src/main/res/xml/preferences_vf_aeawlock.xml similarity index 100% rename from res/xml/preferences_vf_aeawlock.xml rename to app/src/main/res/xml/preferences_vf_aeawlock.xml diff --git a/res/xml/preferences_vf_barcodescanner.xml b/app/src/main/res/xml/preferences_vf_barcodescanner.xml similarity index 100% rename from res/xml/preferences_vf_barcodescanner.xml rename to app/src/main/res/xml/preferences_vf_barcodescanner.xml diff --git a/res/xml/preferences_vf_common.xml b/app/src/main/res/xml/preferences_vf_common.xml similarity index 100% rename from res/xml/preferences_vf_common.xml rename to app/src/main/res/xml/preferences_vf_common.xml diff --git a/res/xml/preferences_vf_focus.xml b/app/src/main/res/xml/preferences_vf_focus.xml similarity index 100% rename from res/xml/preferences_vf_focus.xml rename to app/src/main/res/xml/preferences_vf_focus.xml diff --git a/res/xml/preferences_vf_grid.xml b/app/src/main/res/xml/preferences_vf_grid.xml similarity index 100% rename from res/xml/preferences_vf_grid.xml rename to app/src/main/res/xml/preferences_vf_grid.xml diff --git a/res/xml/preferences_vf_gyro.xml b/app/src/main/res/xml/preferences_vf_gyro.xml similarity index 100% rename from res/xml/preferences_vf_gyro.xml rename to app/src/main/res/xml/preferences_vf_gyro.xml diff --git a/res/xml/preferences_vf_histogram.xml b/app/src/main/res/xml/preferences_vf_histogram.xml similarity index 100% rename from res/xml/preferences_vf_histogram.xml rename to app/src/main/res/xml/preferences_vf_histogram.xml diff --git a/res/xml/preferences_vf_inactive.xml b/app/src/main/res/xml/preferences_vf_inactive.xml similarity index 100% rename from res/xml/preferences_vf_inactive.xml rename to app/src/main/res/xml/preferences_vf_inactive.xml diff --git a/res/xml/preferences_vf_infoset.xml b/app/src/main/res/xml/preferences_vf_infoset.xml similarity index 100% rename from res/xml/preferences_vf_infoset.xml rename to app/src/main/res/xml/preferences_vf_infoset.xml diff --git a/res/xml/preferences_vf_more.xml b/app/src/main/res/xml/preferences_vf_more.xml similarity index 100% rename from res/xml/preferences_vf_more.xml rename to app/src/main/res/xml/preferences_vf_more.xml diff --git a/res/xml/preferences_vf_zoom.xml b/app/src/main/res/xml/preferences_vf_zoom.xml similarity index 100% rename from res/xml/preferences_vf_zoom.xml rename to app/src/main/res/xml/preferences_vf_zoom.xml diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..6750b094 --- /dev/null +++ b/build.gradle @@ -0,0 +1,17 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + repositories { + jcenter() + google() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.4.1' + } +} + +allprojects { + repositories { + jcenter() + google() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ + diff --git a/jni/Application.mk b/jni/Application.mk deleted file mode 100755 index f4866bb5..00000000 --- a/jni/Application.mk +++ /dev/null @@ -1,10 +0,0 @@ -APP_ABI := armeabi-v7a -#APP_ABI := x86 - -#unlocked -#APP_ABI := armeabi-v7a x86 - -APP_STL := gnustl_static -APP_OPTIM := release -APP_PLATFORM := android-21 -NDK_TOOLCHAIN_VERSION=4.9 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..e7b4def4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'