diff --git a/downloader/download_downloadr.go b/downloader/download_downloadr.go
index fc91e21..346d947 100644
--- a/downloader/download_downloadr.go
+++ b/downloader/download_downloadr.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"os"
+	"path/filepath"
 
 	"github.com/gen2brain/beeep"
 	"github.com/kkdai/youtube/v2"
@@ -43,28 +45,17 @@ func DownloadR(url string) error {
 		OutputDir: OUTPUT_DIR,
 		Client: client,
 	}
-
-	//formats := video.Formats.WithAudioChannels()
-	err = downloader.DownloadComposite(context.Background(), "", video, "hd", "mp4", "")
+	
+	videoFileRoot := filepath.Join(OUTPUT_DIR, video.Author)
+	err = os.MkdirAll(videoFileRoot, 0755)
+	if err != nil {
+		return fmt.Errorf("failed creating directory %s with %+v", videoFileRoot, err)
+	}
+	videoFile := filepath.Join(video.Author, video.Title+".mp4")
+	err = downloader.DownloadComposite(context.Background(), videoFile, video, "hd", "mp4", "")
 	if err != nil {
 		return fmt.Errorf("failed downloading %s with %+v", url, err)
 	}
-//	stream, _, err := client.GetStream(video, &formats[1])
-//	if err != nil {
-//		return fmt.Errorf("failed downloading %s with %+v", url, err)
-//	}
-//	defer stream.Close()
-//
-//	file, err := os.Create("video.mp4")
-//	if err != nil {
-//		return fmt.Errorf("failed downloading %s with %+v", url, err)
-//	}
-//	defer file.Close()
-//
-//	_, err = io.Copy(file, stream)
-//	if err != nil {
-//		return fmt.Errorf("failed downloading %s with %+v", url, err)
-//	}
 
 	log.Printf("Downloaded %s", url)
 	ongoingDownloadsMutex.Lock()