diff --git a/README.md b/README.md
index 82a397f..7a5dad8 100644
--- a/README.md
+++ b/README.md
@@ -112,18 +112,24 @@ which are mapped at download file. The available fields are:
 * `title`: The title of the song.
 * `year`: The year of the album/song.
 * `author`: The author of the file on C3DB.
-* `orig_file`: The original filename that would be downloaded by e.g. a browser.
+* `orig_name`: The original filename that would be downloaded by e.g. a browser.
 
-The default structure leverages all of these options to create an archive-ready structure as follows:
+The default structure leverages most of these options to create an archive-ready structure as follows:
 
 ```
-{genre}/{author}/{artist}/{album}/{title} [{year}].{orig_file}
+{artist}/{album}/{title}.{author}.{orig_name}
 ```
 
+The genre is excluded because in my experience it is a fairly useless metric and is often incorrectly set,
+so it gets in the way more often than not. You are free of course to add it in to your own custom structure.
+The date is excluded for similar reasons and because if you know the album, you know the date.
+
+If any field is missing during download, it is replaced with "None".
+
 As an example:
 
 ```
-Prog/Rush/Vapor Trails [Remixed]/Sweet Miracle [2002] (ejthedj).sweetMiracle
+Rush/Vapor Trails [Remixed]/Sweet Miracle.ejthedj.sweetMiracle
 ```
 
 Note that any parent director(ies) will be automatically created down the whole tree until the final filename.
diff --git a/c3dbdl/c3dbdl.py b/c3dbdl/c3dbdl.py
index 3a56651..9347cb0 100755
--- a/c3dbdl/c3dbdl.py
+++ b/c3dbdl/c3dbdl.py
@@ -436,7 +436,7 @@ def database():
     "--file-structure",
     "_file_structure",
     envvar="C3DBDL_DL_FILE_STRUCTURE",
-    default="{genre}/{author}/{artist}/{album}/{title} [{year}].{orig_name}",
+    default="{artist}/{album}/{title}.{author}.{orig_name}",
     help="Specify the output file/directory stucture.",
 )
 @click.option(
@@ -490,7 +490,7 @@ def download(_filters, _id, _desc, _limit, _file_structure):
 
     \b
     The default output file structure is:
-        "{genre}/{author}/{artist}/{album}/{title} [{year}].{orig_name}"
+        "{artist}/{album}/{title}.{author}.{orig_name}"
 
     Filters allow granular selection of the song(s) to download. Multiple filters can be
     specified, and a song is selected only if ALL filters match (logical AND). Each filter