diff --git a/internal/calendar/option.go b/internal/driver/calendar/option.go
similarity index 100%
rename from internal/calendar/option.go
rename to internal/driver/calendar/option.go
diff --git a/internal/calendar/service.go b/internal/driver/calendar/service.go
similarity index 100%
rename from internal/calendar/service.go
rename to internal/driver/calendar/service.go
diff --git a/internal/server/handle_bookings.go b/internal/server/handle_bookings.go
index 68c219f..02fceb8 100644
--- a/internal/server/handle_bookings.go
+++ b/internal/server/handle_bookings.go
@@ -14,9 +14,9 @@ import (
 	u "github.com/rjNemo/underscore"
 
 	"github.com/rjNemo/rentease/internal/booking"
-	"github.com/rjNemo/rentease/internal/calendar"
 	"github.com/rjNemo/rentease/internal/config"
 	"github.com/rjNemo/rentease/internal/constant"
+	"github.com/rjNemo/rentease/internal/driver/calendar"
 	"github.com/rjNemo/rentease/internal/view"
 	myTime "github.com/rjNemo/rentease/pkg/time"
 )
diff --git a/internal/server/handle_health.go b/internal/server/handle_healthz.go
similarity index 100%
rename from internal/server/handle_health.go
rename to internal/server/handle_healthz.go
diff --git a/internal/server/server.go b/internal/server/server.go
index 4b5d13e..07c1a18 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/rjNemo/rentease/internal/auth"
 	"github.com/rjNemo/rentease/internal/booking"
-	"github.com/rjNemo/rentease/internal/calendar"
 	"github.com/rjNemo/rentease/internal/config"
+	"github.com/rjNemo/rentease/internal/driver/calendar"
 	"github.com/rjNemo/rentease/internal/pdf"
 )
 
diff --git a/main.go b/main.go
index f3b0aee..0c16c0d 100644
--- a/main.go
+++ b/main.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/rjNemo/rentease/internal/auth"
 	"github.com/rjNemo/rentease/internal/booking"
-	"github.com/rjNemo/rentease/internal/calendar"
 	"github.com/rjNemo/rentease/internal/config"
 	"github.com/rjNemo/rentease/internal/database"
+	"github.com/rjNemo/rentease/internal/driver/calendar"
 	"github.com/rjNemo/rentease/internal/pdf"
 	"github.com/rjNemo/rentease/internal/server"
 )