diff --git a/internal/adapter/ffmpeg/ffmpeg_converter.go b/internal/adapter/converter/ffmpeg/ffmpeg.go
similarity index 100%
rename from internal/adapter/ffmpeg/ffmpeg_converter.go
rename to internal/adapter/converter/ffmpeg/ffmpeg.go
diff --git a/internal/adapter/yandex/memory.go b/internal/adapter/recognizer/memory.go
similarity index 96%
rename from internal/adapter/yandex/memory.go
rename to internal/adapter/recognizer/memory.go
index 069323a..25f5212 100644
--- a/internal/adapter/yandex/memory.go
+++ b/internal/adapter/recognizer/memory.go
@@ -1,4 +1,4 @@
-package yandex
+package recognizer
 
 import (
 	"git.vakhrushev.me/av/transcriber/internal/entity"
diff --git a/internal/adapter/yandex/recognizer.go b/internal/adapter/recognizer/yandex/recognizer.go
similarity index 100%
rename from internal/adapter/yandex/recognizer.go
rename to internal/adapter/recognizer/yandex/recognizer.go
diff --git a/internal/adapter/yandex/s3.go b/internal/adapter/recognizer/yandex/s3.go
similarity index 100%
rename from internal/adapter/yandex/s3.go
rename to internal/adapter/recognizer/yandex/s3.go
diff --git a/internal/adapter/yandex/speechkit.go b/internal/adapter/recognizer/yandex/speechkit.go
similarity index 100%
rename from internal/adapter/yandex/speechkit.go
rename to internal/adapter/recognizer/yandex/speechkit.go
diff --git a/internal/adapter/sqlite/file_repo.go b/internal/adapter/repo/sqlite/file_repo.go
similarity index 100%
rename from internal/adapter/sqlite/file_repo.go
rename to internal/adapter/repo/sqlite/file_repo.go
diff --git a/internal/adapter/sqlite/transcript_job_repo.go b/internal/adapter/repo/sqlite/transcript_job_repo.go
similarity index 100%
rename from internal/adapter/sqlite/transcript_job_repo.go
rename to internal/adapter/repo/sqlite/transcript_job_repo.go
diff --git a/internal/controller/http/transcribe_test.go b/internal/controller/http/transcribe_test.go
index a7babe3..1f2b0c5 100644
--- a/internal/controller/http/transcribe_test.go
+++ b/internal/controller/http/transcribe_test.go
@@ -15,9 +15,9 @@ import (
 	"testing"
 	"time"
 
-	"git.vakhrushev.me/av/transcriber/internal/adapter/ffmpeg"
-	"git.vakhrushev.me/av/transcriber/internal/adapter/sqlite"
-	"git.vakhrushev.me/av/transcriber/internal/adapter/yandex"
+	"git.vakhrushev.me/av/transcriber/internal/adapter/converter/ffmpeg"
+	"git.vakhrushev.me/av/transcriber/internal/adapter/recognizer"
+	"git.vakhrushev.me/av/transcriber/internal/adapter/repo/sqlite"
 	"git.vakhrushev.me/av/transcriber/internal/entity"
 	"git.vakhrushev.me/av/transcriber/internal/service"
 	"github.com/doug-martin/goqu/v9"
@@ -59,7 +59,7 @@ func setupTestRouter(t *testing.T) (*gin.Engine, *TranscribeHandler) {
 	jobRepo := sqlite.NewTranscriptJobRepository(db, gq)
 
 	converter := ffmpeg.NewFfmpegConverter()
-	recognizer := &yandex.MemoryAudioRecognizer{}
+	recognizer := &recognizer.MemoryAudioRecognizer{}
 
 	trsService := service.NewTranscribeService(jobRepo, fileRepo, converter, recognizer)
 
diff --git a/main.go b/main.go
index f0df933..e3278c5 100644
--- a/main.go
+++ b/main.go
@@ -12,9 +12,9 @@ import (
 	"syscall"
 	"time"
 
-	"git.vakhrushev.me/av/transcriber/internal/adapter/ffmpeg"
-	"git.vakhrushev.me/av/transcriber/internal/adapter/sqlite"
-	"git.vakhrushev.me/av/transcriber/internal/adapter/yandex"
+	"git.vakhrushev.me/av/transcriber/internal/adapter/converter/ffmpeg"
+	"git.vakhrushev.me/av/transcriber/internal/adapter/recognizer/yandex"
+	"git.vakhrushev.me/av/transcriber/internal/adapter/repo/sqlite"
 	httpcontroller "git.vakhrushev.me/av/transcriber/internal/controller/http"
 	"git.vakhrushev.me/av/transcriber/internal/controller/worker"
 	"git.vakhrushev.me/av/transcriber/internal/service"