Fix S3 file key

s3/s3.go

@@ -508,7 +508,7 @@ func GetS3FileKey(fileName string, folder string) string {
 	folder = strings.Trim(folder, "/")
 
 	if folder != "" {
-		fileKey = fileName + "/" + folder
+		fileKey = folder + "/" + fileName
 	} else {
 		fileKey = fileName
 	}