diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java
index 200a240db..ca8517661 100644
--- a/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java
+++ b/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java
@@ -13,7 +13,7 @@ import java.io.File;
 
 import ru.vtosters.lite.downloaders.notifications.NotificationChannels;
 import ru.vtosters.lite.music.Callback;
-import ru.vtosters.lite.music.FFMpeg;
+import ru.vtosters.lite.music.converter.FFMpeg;
 import ru.vtosters.lite.music.M3UDownloader;
 import ru.vtosters.lite.music.MP3Downloader;
 import ru.vtosters.lite.utils.AndroidUtils;
diff --git a/app/src/main/java/ru/vtosters/lite/music/FFMpeg.java b/app/src/main/java/ru/vtosters/lite/music/converter/FFMpeg.java
similarity index 64%
rename from app/src/main/java/ru/vtosters/lite/music/FFMpeg.java
rename to app/src/main/java/ru/vtosters/lite/music/converter/FFMpeg.java
index ade05b86b..d71075d9e 100644
--- a/app/src/main/java/ru/vtosters/lite/music/FFMpeg.java
+++ b/app/src/main/java/ru/vtosters/lite/music/converter/FFMpeg.java
@@ -1,6 +1,5 @@
-package ru.vtosters.lite.music;
+package ru.vtosters.lite.music.converter;
 
-import android.os.Build;
 import android.util.Log;
 
 import com.arthenica.ffmpegkit.FFmpegKit;
@@ -8,13 +7,10 @@ import com.arthenica.ffmpegkit.ReturnCode;
 import com.vk.core.util.ToastUtils;
 import com.vk.dto.music.MusicTrack;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.Arrays;
 
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.IOUtils;
@@ -51,55 +47,26 @@ public class FFMpeg {
         }
     }
 
+    /**
+     * @param in    Directory with .ts files
+     * @param out   Output .mp3 file
+     * @param track Track to be converted
+     * @return True if success, else false
+     */
     public static boolean convert(String in, String out, MusicTrack track) {
         checkFFMpegLibs();
 
-        var tsesList = new File(in).listFiles();
+        var tsesDir = new File(in);
+        var mergedTsFile = new File(tsesDir, "all.ts");
 
-        if (tsesList == null) {
-            return false;
-        }
-
-        var mergedTsFile = new File(in, "all.ts");
-        var mergedByteArrayStream = new ByteArrayOutputStream();
-
-        Arrays.sort(tsesList, (o1, o2) -> {
-            var index1 = Integer.parseInt(o1.getName().split("-")[1]);
-            var index2 = Integer.parseInt(o2.getName().split("-")[1]);
-            return index1 - index2;
-        });
-
-        for (var file : tsesList) {
-            if (file.getName().endsWith(".ts")) {
-                try {
-                    mergedByteArrayStream.write(IOUtils.readAllBytes(file));
-                } catch (IOException e) {
-                    e.printStackTrace();
-                    return false;
-                }
-            }
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            try {
-                Files.write(mergedTsFile.toPath(), mergedByteArrayStream.toByteArray());
-            } catch (IOException e) {
-                e.printStackTrace();
-                return false;
-            }
-        } else {
-            try (FileOutputStream fos = new FileOutputStream(mergedTsFile)) {
-                fos.write(mergedByteArrayStream.toByteArray());
-            } catch (IOException e) {
-                e.printStackTrace();
-                return false;
-            }
-        }
+        var mergeResult = TSMerger.merge(tsesDir, mergedTsFile);
+        if (!mergeResult) return false;
 
 
         // convert .ts file to .mp3 file via ffmpeg
         var sb = new StringBuilder();
-        sb.append("-y -i ").append(in).append("/all.ts -map 0 -dn ");
+        sb.append("-y -i ").append(mergedTsFile.getAbsolutePath());
+        sb.append(" -map 0 -dn ");
         sb.append(" -loglevel error");
         sb.append(" -hide_banner");
         if (track.f != null) {
diff --git a/app/src/main/java/ru/vtosters/lite/music/converter/TSMerger.java b/app/src/main/java/ru/vtosters/lite/music/converter/TSMerger.java
new file mode 100644
index 000000000..b8d292393
--- /dev/null
+++ b/app/src/main/java/ru/vtosters/lite/music/converter/TSMerger.java
@@ -0,0 +1,64 @@
+package ru.vtosters.lite.music.converter;
+
+import android.os.Build;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Arrays;
+
+import ru.vtosters.lite.utils.IOUtils;
+
+public class TSMerger {
+    /**
+     * Merge multiple .ts files into one .ts file
+     * @param in Directory with .ts files
+     * @return True if success, else false
+     */
+    public static boolean merge(File in, File out) {
+        var tsesList = in.listFiles();
+
+        if (tsesList == null) {
+            return false;
+        }
+
+        var mergedByteArrayStream = new ByteArrayOutputStream();
+
+        Arrays.sort(tsesList, (o1, o2) -> {
+            var index1 = Integer.parseInt(o1.getName().split("-")[1]);
+            var index2 = Integer.parseInt(o2.getName().split("-")[1]);
+            return index1 - index2;
+        });
+
+        for (var file : tsesList) {
+            if (file.getName().endsWith(".ts")) {
+                try {
+                    mergedByteArrayStream.write(IOUtils.readAllBytes(file));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    return false;
+                }
+            }
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            try {
+                Files.write(out.toPath(), mergedByteArrayStream.toByteArray());
+            } catch (IOException e) {
+                e.printStackTrace();
+                return false;
+            }
+        } else {
+            try (FileOutputStream fos = new FileOutputStream(out)) {
+                fos.write(mergedByteArrayStream.toByteArray());
+            } catch (IOException e) {
+                e.printStackTrace();
+                return false;
+            }
+        }
+
+        return true;
+    }
+}