diff --git a/api/redis/publisher.go b/app/driver/redis/publisher.go
similarity index 93%
rename from api/redis/publisher.go
rename to app/driver/redis/publisher.go
index f37d02b..623d67b 100644
--- a/api/redis/publisher.go
+++ b/app/driver/redis/publisher.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/eosswedenorg/thalos/api"
+	. "github.com/eosswedenorg/thalos/api/redis"
 
 	"github.com/redis/go-redis/v9"
 )
diff --git a/api/redis/publisher_test.go b/app/driver/redis/publisher_test.go
similarity index 94%
rename from api/redis/publisher_test.go
rename to app/driver/redis/publisher_test.go
index fa8e4ab..460daaf 100644
--- a/api/redis/publisher_test.go
+++ b/app/driver/redis/publisher_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/eosswedenorg/thalos/api"
+	. "github.com/eosswedenorg/thalos/api/redis"
 
 	"github.com/go-redis/redismock/v9"
 	"github.com/stretchr/testify/assert"
diff --git a/api/writer.go b/app/driver/writer.go
similarity index 83%
rename from api/writer.go
rename to app/driver/writer.go
index 4cfc8b2..e9c2f73 100644
--- a/api/writer.go
+++ b/app/driver/writer.go
@@ -1,4 +1,6 @@
-package api
+package driver
+
+import "github.com/eosswedenorg/thalos/api"
 
 // Writer interface defines the required methods
 // to send messages over an channel.
@@ -7,7 +9,7 @@ package api
 type Writer interface {
 	// Write writes a message over a channel.
 	// The message may or may not be buffered depending on the implementation.
-	Write(channel Channel, payload []byte) error
+	Write(channel api.Channel, payload []byte) error
 
 	// Flush writes any buffered messages to the channel.
 	// If the implementation does not support buffering. this is a noop.
diff --git a/app/ship_processor.go b/app/ship_processor.go
index 7d2fe39..a0d8fc4 100644
--- a/app/ship_processor.go
+++ b/app/ship_processor.go
@@ -7,6 +7,7 @@ import (
 	"github.com/eosswedenorg/thalos/api"
 	"github.com/eosswedenorg/thalos/api/message"
 	"github.com/eosswedenorg/thalos/app/abi"
+	"github.com/eosswedenorg/thalos/app/driver"
 
 	log "github.com/sirupsen/logrus"
 
@@ -38,7 +39,7 @@ type ShipProcessor struct {
 	abi *abi.AbiManager
 
 	// Writer to send messages to.
-	writer api.Writer
+	writer driver.Writer
 
 	// Encoder used to encode messages
 	encode message.Encoder
@@ -51,7 +52,7 @@ type ShipProcessor struct {
 }
 
 // SpawnProcessor creates a new ShipProccessor that consumes the shipclient.Stream passed to it.
-func SpawnProccessor(shipStream *shipclient.Stream, writer api.Writer, abi *abi.AbiManager, codec message.Codec) *ShipProcessor {
+func SpawnProccessor(shipStream *shipclient.Stream, writer driver.Writer, abi *abi.AbiManager, codec message.Codec) *ShipProcessor {
 	processor := &ShipProcessor{
 		abi:           abi,
 		writer:        writer,
diff --git a/cmd/thalos/main.go b/cmd/thalos/main.go
index 5c6cf4d..431d75d 100644
--- a/cmd/thalos/main.go
+++ b/cmd/thalos/main.go
@@ -22,6 +22,7 @@ import (
 	"github.com/eosswedenorg/thalos/app"
 	"github.com/eosswedenorg/thalos/app/abi"
 	"github.com/eosswedenorg/thalos/app/config"
+	driver "github.com/eosswedenorg/thalos/app/driver/redis"
 	. "github.com/eosswedenorg/thalos/app/log"
 	"github.com/nikoksr/notify"
 	"github.com/nikoksr/notify/service/telegram"
@@ -314,7 +315,7 @@ func main() {
 
 	processor := app.SpawnProccessor(
 		shClient,
-		api_redis.NewPublisher(context.Background(), rdb, api_redis.Namespace{
+		driver.NewPublisher(context.Background(), rdb, api_redis.Namespace{
 			Prefix:  conf.Redis.Prefix,
 			ChainID: chain_id,
 		}),