diff --git a/cmd/csaf_downloader/downloader.go b/cmd/csaf_downloader/downloader.go
index d40f31b..1799a84 100644
--- a/cmd/csaf_downloader/downloader.go
+++ b/cmd/csaf_downloader/downloader.go
@@ -621,26 +621,28 @@ nextAdvisory:
 			continue
 		}
 
-		if err := d.eval.Extract(`$.document.tracking.initial_release_date`, dateExtract, false, doc); err != nil {
+		if err := d.eval.Extract(
+			`$.document.tracking.initial_release_date`, dateExtract, false, doc,
+		); err != nil {
 			slog.Warn("Cannot extract initial_release_date from advisory",
 				"url", file.URL())
 			initialReleaseDate = time.Now()
 		}
 		initialReleaseDate = initialReleaseDate.UTC()
 
-		// Advisories that failed validation are store in a special folder.
+		// Advisories that failed validation are stored in a special folder.
 		var newDir string
 		if valStatus != validValidationStatus {
-			newDir = path.Join(d.cfg.Directory, failedValidationDir, lower)
+			newDir = path.Join(d.cfg.Directory, failedValidationDir)
 		} else {
-			newDir = path.Join(d.cfg.Directory, lower)
+			newDir = d.cfg.Directory
 		}
 
 		// Do we have a configured destination folder?
 		if d.cfg.Folder != "" {
 			newDir = path.Join(newDir, d.cfg.Folder)
 		} else {
-			newDir = path.Join(newDir, strconv.Itoa(initialReleaseDate.Year()))
+			newDir = path.Join(newDir, lower, strconv.Itoa(initialReleaseDate.Year()))
 		}
 
 		if newDir != lastDir {