diff --git a/cmdHandlers.go b/cmdHandlers.go
index f125aef..c43f638 100644
--- a/cmdHandlers.go
+++ b/cmdHandlers.go
@@ -75,7 +75,7 @@ func find(filePath string) {
 }
 
 func download(spotifyURL string) {
-	err := spotify.CreateFolder(SONGS_DIR)
+	err := utils.CreateFolder(SONGS_DIR)
 	if err != nil {
 		err := xerrors.New(err)
 		logger := utils.GetLogger()
@@ -112,15 +112,6 @@ func serve(protocol, port string) {
 		return true
 	}
 
-	err := spotify.CreateFolder(SONGS_DIR)
-	if err != nil {
-		err := xerrors.New(err)
-		logger := utils.GetLogger()
-		ctx := context.Background()
-		logMsg := fmt.Sprintf("failed to create directory %v", SONGS_DIR)
-		logger.ErrorContext(ctx, logMsg, slog.Any("error", err))
-	}
-
 	server := socketio.NewServer(&engineio.Options{
 		Transports: []transport.Transport{
 			&polling.Transport{
diff --git a/main.go b/main.go
index 5e8a822..e415643 100644
--- a/main.go
+++ b/main.go
@@ -1,12 +1,34 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
+	"log/slog"
 	"os"
+	"song-recognition/utils"
+
+	"github.com/mdobak/go-xerrors"
 )
 
 func main() {
+	err := utils.CreateFolder("tmp")
+	if err != nil {
+		logger := utils.GetLogger()
+		err := xerrors.New(err)
+		ctx := context.Background()
+		logger.ErrorContext(ctx, "Failed create tmp dir.", slog.Any("error", err))
+	}
+
+	err = utils.CreateFolder(SONGS_DIR)
+	if err != nil {
+		err := xerrors.New(err)
+		logger := utils.GetLogger()
+		ctx := context.Background()
+		logMsg := fmt.Sprintf("failed to create directory %v", SONGS_DIR)
+		logger.ErrorContext(ctx, logMsg, slog.Any("error", err))
+	}
+
 	if len(os.Args) < 2 {
 		fmt.Println("Expected 'find', 'download', 'erase', or 'serve' subcommands")
 		os.Exit(1)