diff --git a/app/build.gradle b/app/build.gradle
index 6d4e105f..aaef9e89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,7 @@ android {
         targetSdkVersion 27
         versionCode 48
         versionName "2.5.0"
-        setProperty("archivesBaseName", "draw")
+        setProperty("archivesBaseName", "camera")
     }
 
     signingConfigs {
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
index 49bb00df..44a81810 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
@@ -28,7 +28,6 @@ class SettingsActivity : SimpleActivity() {
 
         setupCustomizeColors()
         setupUseEnglish()
-        setupSavePhotosFolder()
         setupShowPreview()
         setupSound()
         setupFocusBeforeCapture()
@@ -38,6 +37,7 @@ class SettingsActivity : SimpleActivity() {
         setupKeepSettingsVisible()
         setupAlwaysOpenBackCamera()
         setupSavePhotoMetadata()
+        setupSavePhotosFolder()
         updateTextColors(settings_holder)
     }
 
@@ -70,18 +70,6 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
-    private fun setupSavePhotosFolder() {
-        settings_save_photos.text = getLastPart(config.savePhotosFolder)
-        settings_save_photos_holder.setOnClickListener {
-            FilePickerDialog(this, config.savePhotosFolder, false, showFAB = true) {
-                handleSAFDialog(File(it)) {
-                    config.savePhotosFolder = it
-                    settings_save_photos.text = getLastPart(config.savePhotosFolder)
-                }
-            }
-        }
-    }
-
     private fun getLastPart(path: String): String {
         val humanized = humanizePath(path)
         return humanized.substringAfterLast("/", humanized)
@@ -158,4 +146,16 @@ class SettingsActivity : SimpleActivity() {
             config.savePhotoMetadata = settings_save_photo_metadata.isChecked
         }
     }
+
+    private fun setupSavePhotosFolder() {
+        settings_save_photos.text = getLastPart(config.savePhotosFolder)
+        settings_save_photos_holder.setOnClickListener {
+            FilePickerDialog(this, config.savePhotosFolder, false, showFAB = true) {
+                handleSAFDialog(File(it)) {
+                    config.savePhotosFolder = it
+                    settings_save_photos.text = getLastPart(config.savePhotosFolder)
+                }
+            }
+        }
+    }
 }
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 1e616fba..cc6b6617 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -50,41 +50,6 @@
 
         </RelativeLayout>
 
-        <RelativeLayout
-            android:id="@+id/settings_save_photos_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/bigger_margin"
-            android:paddingLeft="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin"
-            android:paddingTop="@dimen/bigger_margin">
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_save_photos_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/settings_save_photos"
-                android:layout_toStartOf="@+id/settings_save_photos"
-                android:paddingLeft="@dimen/medium_margin"
-                android:paddingRight="@dimen/medium_margin"
-                android:text="@string/save_photos"/>
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_save_photos"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_marginEnd="@dimen/small_margin"
-                android:layout_marginRight="@dimen/small_margin"
-                android:background="@null"
-                android:clickable="false"/>
-
-        </RelativeLayout>
-
         <RelativeLayout
             android:id="@+id/settings_show_preview_holder"
             android:layout_width="match_parent"
@@ -264,5 +229,40 @@
                 android:text="@string/save_photo_metadata"/>
 
         </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/settings_save_photos_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:paddingBottom="@dimen/bigger_margin"
+            android:paddingLeft="@dimen/activity_margin"
+            android:paddingRight="@dimen/activity_margin"
+            android:paddingTop="@dimen/bigger_margin">
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/settings_save_photos_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/settings_save_photos"
+                android:layout_toStartOf="@+id/settings_save_photos"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingRight="@dimen/medium_margin"
+                android:text="@string/save_photos"/>
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/settings_save_photos"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginEnd="@dimen/small_margin"
+                android:layout_marginRight="@dimen/small_margin"
+                android:background="@null"
+                android:clickable="false"/>
+
+        </RelativeLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/build.gradle b/build.gradle
index 2bf82004..e0982e11 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong