diff --git a/Makefile b/Makefile
index 18d5230..caa845b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,5 @@
-GEN_DIR=pkg/go/gen
-
 gen:
-	@buf generate proto/tester -o ${GEN_DIR}/tester
-	@buf generate proto/session -o ${GEN_DIR}/session
+	@buf generate
 dev:
 	@make gen
 	@go run main.go
diff --git a/buf.gen.yaml b/buf.gen.yaml
index e62a9a9..651a0a1 100644
--- a/buf.gen.yaml
+++ b/buf.gen.yaml
@@ -2,11 +2,11 @@ version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: git.sch9.ru/new_gate/ms-tester/pkg/go/gen/
+    default: git.sch9.ru/new_gate/ms-tester/pkg/go/gen
 plugins:
   - name: go
-    out: /
+    out: pkg/go/gen
     opt: paths=source_relative
   - name: go-grpc
-    out: /
+    out: pkg/go/gen
     opt: paths=source_relative
diff --git a/internal/transport/interceptors.go b/internal/transport/interceptors.go
index bbb2f3f..5dd2b75 100644
--- a/internal/transport/interceptors.go
+++ b/internal/transport/interceptors.go
@@ -2,7 +2,7 @@ package transport
 
 import (
 	"context"
-	sessionv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/session/v1"
+	sessionv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/proto/session/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/internal/transport/server.go b/internal/transport/server.go
index 323a320..9993385 100644
--- a/internal/transport/server.go
+++ b/internal/transport/server.go
@@ -3,8 +3,8 @@ package transport
 import (
 	"context"
 	"git.sch9.ru/new_gate/ms-tester/internal/models"
-	sessionv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/session/v1"
-	testerv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/tester/v1"
+	sessionv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/proto/session/v1"
+	testerv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/proto/tester/v1"
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/types/known/timestamppb"
 	"time"
diff --git a/internal/transport/tester.go b/internal/transport/tester.go
index 837fb63..07a01bd 100644
--- a/internal/transport/tester.go
+++ b/internal/transport/tester.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"git.sch9.ru/new_gate/ms-tester/internal/lib"
 	"git.sch9.ru/new_gate/ms-tester/internal/models"
-	testerv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/tester/v1"
+	testerv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/proto/tester/v1"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"