diff --git a/playmusicexporter/playmusicexporter.iml b/playmusicexporter/playmusicexporter.iml
index 168f989..beffcb2 100644
--- a/playmusicexporter/playmusicexporter.iml
+++ b/playmusicexporter/playmusicexporter.iml
@@ -62,13 +62,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -76,6 +69,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
diff --git a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/settings/PlayMusicExporterPreferences.java b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/settings/PlayMusicExporterPreferences.java
index e4a1610..abe711c 100644
--- a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/settings/PlayMusicExporterPreferences.java
+++ b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/settings/PlayMusicExporterPreferences.java
@@ -4,6 +4,7 @@ package re.jcg.playmusicexporter.settings;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.net.Uri;
+import android.os.Environment;
 import android.preference.PreferenceManager;
 
 import re.jcg.playmusicexporter.fragments.NavigationDrawerFragment;
@@ -27,7 +28,8 @@ public class PlayMusicExporterPreferences {
     //TODO Split Export Paths in export prefs, this won't work else.
     private static final String ALBA_EXPORT_PATH = "preference_alba_export_path";
     private static final String GROUPS_EXPORT_PATH = "preference_groups_export_path";
-    private static final String URI_DEFAULT = Uri.EMPTY.toString();
+    private static final String URI_DEFAULT = Uri.fromFile(
+            Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC)).toString();
 
     private static final String AUTO_EXPORT_STRUCTURE = "preference_auto_export_structure";
     private static final String ALBA_EXPORT_STRUCTURE = "preference_alba_export_structure";
diff --git a/playmusicexporter/src/main/res/values/strings.xml b/playmusicexporter/src/main/res/values/strings.xml
index f402eef..fcb6ba9 100644
--- a/playmusicexporter/src/main/res/values/strings.xml
+++ b/playmusicexporter/src/main/res/values/strings.xml
@@ -72,7 +72,7 @@
     <string name="settings_category_auto_export_conditions">Export conditions</string>
     <string name="settings_category_auto_export_path_subdir">Export path and subdirectory structure</string>
     <string name="settings_category_debug">Debug</string>
-    <string name="settings_category_alba_export">Export location alba</string>
+    <string name="settings_category_alba_export">Export location albums</string>
     <string name="settings_category_groups_export">Export location groups</string>
 
 
@@ -87,7 +87,7 @@
     <string name="settings_auto_export_different_path_switch_summary">Off means that the automatic export uses the same export path as manual album exports.</string>
     <string name="settings_auto_export_different_path">Export path</string>
     <string name="settings_auto_export_different_structure_switch">Use a different subdirectory structure</string>
-    <string name="settings_auto_export_different_structure_switch_summary">Off means that the automatic export uses the same subdirectory structure as alba.</string>
+    <string name="settings_auto_export_different_structure_switch_summary">Off means that the automatic export uses the same subdirectory structure as albums.</string>
     <string name="settings_auto_export_different_structure">Subdirectory structure</string>
 
     <string name="settings_category_export_location">Export Location</string>
@@ -95,7 +95,7 @@
     <string name="settings_export_subdirectory_structure_dialog_message">Use / for a new folder \n Available Tags: \n - {album-artist} \n - {album} \n - {artist} \n - {title} \n - {disc=CD $} \n - {no=$$.} \n - {year} \n - {genre} \n</string>
 
 
-    <string name="settings_export_path_alba">Export path for alba</string>
+    <string name="settings_export_path_alba">Export path for albums</string>
     <string name="settings_export_structure_alba">Subdirectory structure for albums</string>
     <string name="settings_export_subdirectory_structure_album">Set your subdirectory structure</string>
     <string name="settings_export_subdirectory_structure_album_example">Example: Beatles/Help!/13. Yesterday.mp3</string>