diff --git a/cmd/anon3anon/main.go b/cmd/anon3anon/main.go
index 74fb5e4..9d2d252 100644
--- a/cmd/anon3anon/main.go
+++ b/cmd/anon3anon/main.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/nightnoryu/anon3anon/pkg/anon3anon/infrastructure/jsonlog"
-	"github.com/nightnoryu/anon3anon/pkg/anon3anon/infrastructure/telegram/handler"
-	"github.com/nightnoryu/anon3anon/pkg/anon3anon/infrastructure/telegram/middleware"
+	"github.com/nightnoryu/anon3anon/pkg/infrastructure/jsonlog"
+	"github.com/nightnoryu/anon3anon/pkg/infrastructure/telegram/handler"
+	"github.com/nightnoryu/anon3anon/pkg/infrastructure/telegram/middleware"
 
 	"github.com/go-telegram/bot"
 )
diff --git a/pkg/anon3anon/infrastructure/jsonlog/level.go b/pkg/infrastructure/jsonlog/level.go
similarity index 100%
rename from pkg/anon3anon/infrastructure/jsonlog/level.go
rename to pkg/infrastructure/jsonlog/level.go
diff --git a/pkg/anon3anon/infrastructure/jsonlog/logger.go b/pkg/infrastructure/jsonlog/logger.go
similarity index 66%
rename from pkg/anon3anon/infrastructure/jsonlog/logger.go
rename to pkg/infrastructure/jsonlog/logger.go
index d100964..07ce931 100644
--- a/pkg/anon3anon/infrastructure/jsonlog/logger.go
+++ b/pkg/infrastructure/jsonlog/logger.go
@@ -14,11 +14,11 @@ var fieldMap = logrus.FieldMap{
 }
 
 type Logger interface {
-	WithField(key string, value interface{}) Logger
+	WithField(key string, value any) Logger
 
-	Info(...interface{})
-	Error(error, ...interface{})
-	FatalError(error, ...interface{})
+	Info(...any)
+	Error(error, ...any)
+	FatalError(error, ...any)
 }
 
 type Config struct {
@@ -42,14 +42,14 @@ type logger struct {
 	logrus.FieldLogger
 }
 
-func (l *logger) WithField(key string, value interface{}) Logger {
+func (l *logger) WithField(key string, value any) Logger {
 	return &logger{l.FieldLogger.WithField(key, value)}
 }
 
-func (l *logger) Error(err error, args ...interface{}) {
-	l.FieldLogger.WithError(err).Error(args)
+func (l *logger) Error(err error, args ...any) {
+	l.FieldLogger.WithError(err).Error(args...)
 }
 
-func (l *logger) FatalError(err error, args ...interface{}) {
+func (l *logger) FatalError(err error, args ...any) {
 	l.FieldLogger.WithError(err).Fatal(args...)
 }
diff --git a/pkg/anon3anon/infrastructure/telegram/handler/anonymousmessages.go b/pkg/infrastructure/telegram/handler/anonymousmessages.go
similarity index 77%
rename from pkg/anon3anon/infrastructure/telegram/handler/anonymousmessages.go
rename to pkg/infrastructure/telegram/handler/anonymousmessages.go
index e7f6911..37706ab 100644
--- a/pkg/anon3anon/infrastructure/telegram/handler/anonymousmessages.go
+++ b/pkg/infrastructure/telegram/handler/anonymousmessages.go
@@ -2,8 +2,9 @@ package handler
 
 import (
 	"context"
+	"fmt"
 
-	"github.com/nightnoryu/anon3anon/pkg/anon3anon/infrastructure/jsonlog"
+	"github.com/nightnoryu/anon3anon/pkg/infrastructure/jsonlog"
 
 	"github.com/go-telegram/bot"
 	"github.com/go-telegram/bot/models"
@@ -15,6 +16,11 @@ func NewAnonymousMessagesHandler(logger jsonlog.Logger, ownerChatId int) bot.Han
 			return
 		}
 
+		if ownerChatId == 0 {
+			logger.Info(fmt.Sprintf("owner chat ID not set. set to %d to use the last chat", update.Message.Chat.ID))
+			return
+		}
+
 		params := &bot.CopyMessageParams{
 			ChatID:     ownerChatId,
 			FromChatID: update.Message.Chat.ID,
diff --git a/pkg/anon3anon/infrastructure/telegram/handler/messages.go b/pkg/infrastructure/telegram/handler/messages.go
similarity index 100%
rename from pkg/anon3anon/infrastructure/telegram/handler/messages.go
rename to pkg/infrastructure/telegram/handler/messages.go
diff --git a/pkg/anon3anon/infrastructure/telegram/handler/startcommand.go b/pkg/infrastructure/telegram/handler/startcommand.go
similarity index 87%
rename from pkg/anon3anon/infrastructure/telegram/handler/startcommand.go
rename to pkg/infrastructure/telegram/handler/startcommand.go
index ce6f8d2..33984bc 100644
--- a/pkg/anon3anon/infrastructure/telegram/handler/startcommand.go
+++ b/pkg/infrastructure/telegram/handler/startcommand.go
@@ -3,7 +3,7 @@ package handler
 import (
 	"context"
 
-	"github.com/nightnoryu/anon3anon/pkg/anon3anon/infrastructure/jsonlog"
+	"github.com/nightnoryu/anon3anon/pkg/infrastructure/jsonlog"
 
 	"github.com/go-telegram/bot"
 	"github.com/go-telegram/bot/models"
diff --git a/pkg/anon3anon/infrastructure/telegram/middleware/loggingmiddleware.go b/pkg/infrastructure/telegram/middleware/loggingmiddleware.go
similarity index 91%
rename from pkg/anon3anon/infrastructure/telegram/middleware/loggingmiddleware.go
rename to pkg/infrastructure/telegram/middleware/loggingmiddleware.go
index 5b0e9d7..1eac382 100644
--- a/pkg/anon3anon/infrastructure/telegram/middleware/loggingmiddleware.go
+++ b/pkg/infrastructure/telegram/middleware/loggingmiddleware.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/nightnoryu/anon3anon/pkg/anon3anon/infrastructure/jsonlog"
+	"github.com/nightnoryu/anon3anon/pkg/infrastructure/jsonlog"
 
 	"github.com/go-telegram/bot"
 	"github.com/go-telegram/bot/models"