diff --git a/api/redis_common/key.go b/api/redis/key.go
similarity index 93%
rename from api/redis_common/key.go
rename to api/redis/key.go
index f3b20de..657c0b1 100644
--- a/api/redis_common/key.go
+++ b/api/redis/key.go
@@ -1,4 +1,4 @@
-package redis_common
+package redis
 
 import (
 	"fmt"
diff --git a/api/redis_common/key_test.go b/api/redis/key_test.go
similarity index 97%
rename from api/redis_common/key_test.go
rename to api/redis/key_test.go
index 6c635ad..de67752 100644
--- a/api/redis_common/key_test.go
+++ b/api/redis/key_test.go
@@ -1,4 +1,4 @@
-package redis_common
+package redis
 
 import (
 	"testing"
diff --git a/api/redis_common/namespace.go b/api/redis/namespace.go
similarity index 98%
rename from api/redis_common/namespace.go
rename to api/redis/namespace.go
index 1442d0e..e2fc5ac 100644
--- a/api/redis_common/namespace.go
+++ b/api/redis/namespace.go
@@ -1,4 +1,4 @@
-package redis_common
+package redis
 
 import (
 	"strings"
diff --git a/api/redis_common/namespace_test.go b/api/redis/namespace_test.go
similarity index 97%
rename from api/redis_common/namespace_test.go
rename to api/redis/namespace_test.go
index 44edfcb..bb52b92 100644
--- a/api/redis_common/namespace_test.go
+++ b/api/redis/namespace_test.go
@@ -1,4 +1,4 @@
-package redis_common
+package redis
 
 import "testing"
 
diff --git a/api/redis_pubsub/publisher.go b/api/redis/publisher.go
similarity index 92%
rename from api/redis_pubsub/publisher.go
rename to api/redis/publisher.go
index 3f31c99..af61b74 100644
--- a/api/redis_pubsub/publisher.go
+++ b/api/redis/publisher.go
@@ -1,10 +1,9 @@
-package redis_pubsub
+package redis
 
 import (
 	"context"
 
 	"thalos/api"
-	. "thalos/api/redis_common"
 
 	"github.com/go-redis/redis/v8"
 )
diff --git a/api/redis_pubsub/publisher_test.go b/api/redis/publisher_test.go
similarity index 93%
rename from api/redis_pubsub/publisher_test.go
rename to api/redis/publisher_test.go
index 695ac5f..2ba166d 100644
--- a/api/redis_pubsub/publisher_test.go
+++ b/api/redis/publisher_test.go
@@ -1,10 +1,9 @@
-package redis_pubsub
+package redis
 
 import (
 	"testing"
 
 	"thalos/api"
-	. "thalos/api/redis_common"
 
 	"github.com/go-redis/redismock/v8"
 	"github.com/stretchr/testify/assert"
diff --git a/api/redis_pubsub/subscriber.go b/api/redis/subscriber.go
similarity index 97%
rename from api/redis_pubsub/subscriber.go
rename to api/redis/subscriber.go
index 48c6537..e4f6725 100644
--- a/api/redis_pubsub/subscriber.go
+++ b/api/redis/subscriber.go
@@ -1,4 +1,4 @@
-package redis_pubsub
+package redis
 
 import (
 	"context"
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"thalos/api"
-	. "thalos/api/redis_common"
 
 	"github.com/go-redis/redis/v8"
 )
diff --git a/api/redis_pubsub/subscriber_test.go b/api/redis/subscriber_test.go
similarity index 96%
rename from api/redis_pubsub/subscriber_test.go
rename to api/redis/subscriber_test.go
index 5e1f07d..71901d1 100644
--- a/api/redis_pubsub/subscriber_test.go
+++ b/api/redis/subscriber_test.go
@@ -1,11 +1,10 @@
-package redis_pubsub
+package redis
 
 import (
 	"testing"
 	"time"
 
 	"thalos/api"
-	. "thalos/api/redis_common"
 
 	"github.com/alicebob/miniredis/v2"
 	"github.com/go-redis/redis/v8"
diff --git a/cmd/main/main.go b/cmd/main/main.go
index d449860..f7a0bca 100644
--- a/cmd/main/main.go
+++ b/cmd/main/main.go
@@ -12,10 +12,9 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"thalos/abi"
+	api_redis "thalos/api/redis"
 	"thalos/app"
 	"thalos/config"
-	"thalos/transport/redis_common"
-	"thalos/transport/redis_pubsub"
 
 	"github.com/nikoksr/notify"
 	"github.com/nikoksr/notify/service/telegram"
@@ -190,7 +189,7 @@ func main() {
 
 	processor := app.SpawnProccessor(
 		shClient,
-		redis_pubsub.NewPublisher(rdb, redis_common.Namespace{
+		api_redis.NewPublisher(rdb, api_redis.Namespace{
 			Prefix:  conf.Redis.Prefix,
 			ChainID: chainInfo.ChainID.String(),
 		}),