Download naming changes

lib/settings.g.dart

@@ -23,10 +23,11 @@ Settings _$SettingsFromJson(Map<String, dynamic> json) {
     ..downloadQuality =
         _$enumDecodeNullable(_$AudioQualityEnumMap, json['downloadQuality']) ??
             AudioQuality.FLAC
-    ..downloadNaming =
-        _$enumDecodeNullable(_$DownloadNamingEnumMap, json['downloadNaming']) ??
-            DownloadNaming.DEFAULT
-    ..downloadFolderStructure = json['downloadFolderStructure'] as bool ?? true
+    ..downloadFilename =
+        json['downloadFilename'] as String ?? '%artists% - %title%'
+    ..albumFolder = json['albumFolder'] as bool ?? true
+    ..artistFolder = json['artistFolder'] as bool ?? true
+    ..albumDiscFolder = json['albumDiscFolder'] as bool ?? false
     ..theme =
         _$enumDecodeNullable(_$ThemesEnumMap, json['theme']) ?? Themes.Light
     ..primaryColor = Settings._colorFromJson(json['primaryColor'] as int)
@@ -43,8 +44,10 @@ Map<String, dynamic> _$SettingsToJson(Settings instance) => <String, dynamic>{
       'offlineQuality': _$AudioQualityEnumMap[instance.offlineQuality],
       'downloadQuality': _$AudioQualityEnumMap[instance.downloadQuality],
       'downloadPath': instance.downloadPath,
-      'downloadNaming': _$DownloadNamingEnumMap[instance.downloadNaming],
-      'downloadFolderStructure': instance.downloadFolderStructure,
+      'downloadFilename': instance.downloadFilename,
+      'albumFolder': instance.albumFolder,
+      'artistFolder': instance.artistFolder,
+      'albumDiscFolder': instance.albumDiscFolder,
       'theme': _$ThemesEnumMap[instance.theme],
       'primaryColor': Settings._colorToJson(instance.primaryColor),
       'useArtColor': instance.useArtColor,
@@ -91,11 +94,6 @@ const _$AudioQualityEnumMap = {
   AudioQuality.FLAC: 'FLAC',
 };
 
-const _$DownloadNamingEnumMap = {
-  DownloadNaming.DEFAULT: 'DEFAULT',
-  DownloadNaming.STANDALONE: 'STANDALONE',
-};
-
 const _$ThemesEnumMap = {
   Themes.Light: 'Light',
   Themes.Dark: 'Dark',