diff --git a/backend/internal/repository/gemini_oauth_client.go b/backend/internal/repository/gemini_oauth_client.go
index 7814c976..c13cfda6 100644
--- a/backend/internal/repository/gemini_oauth_client.go
+++ b/backend/internal/repository/gemini_oauth_client.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Wei-Shaw/sub2api/internal/config"
 	"github.com/Wei-Shaw/sub2api/internal/pkg/geminicli"
-	"github.com/Wei-Shaw/sub2api/internal/service/ports"
+	"github.com/Wei-Shaw/sub2api/internal/service"
 
 	"github.com/imroc/req/v3"
 )
@@ -18,7 +18,7 @@ type geminiOAuthClient struct {
 	cfg      *config.Config
 }
 
-func NewGeminiOAuthClient(cfg *config.Config) ports.GeminiOAuthClient {
+func NewGeminiOAuthClient(cfg *config.Config) service.GeminiOAuthClient {
 	return &geminiOAuthClient{
 		tokenURL: geminicli.TokenURL,
 		cfg:      cfg,
diff --git a/backend/internal/repository/gemini_token_cache.go b/backend/internal/repository/gemini_token_cache.go
index 9d294605..a7270556 100644
--- a/backend/internal/repository/gemini_token_cache.go
+++ b/backend/internal/repository/gemini_token_cache.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Wei-Shaw/sub2api/internal/service/ports"
+	"github.com/Wei-Shaw/sub2api/internal/service"
 
 	"github.com/redis/go-redis/v9"
 )
@@ -19,7 +19,7 @@ type geminiTokenCache struct {
 	rdb *redis.Client
 }
 
-func NewGeminiTokenCache(rdb *redis.Client) ports.GeminiTokenCache {
+func NewGeminiTokenCache(rdb *redis.Client) service.GeminiTokenCache {
 	return &geminiTokenCache{rdb: rdb}
 }
 
diff --git a/backend/internal/repository/geminicli_codeassist_client.go b/backend/internal/repository/geminicli_codeassist_client.go
index 6bae36e2..0a5d813c 100644
--- a/backend/internal/repository/geminicli_codeassist_client.go
+++ b/backend/internal/repository/geminicli_codeassist_client.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/Wei-Shaw/sub2api/internal/pkg/geminicli"
-	"github.com/Wei-Shaw/sub2api/internal/service/ports"
+	"github.com/Wei-Shaw/sub2api/internal/service"
 
 	"github.com/imroc/req/v3"
 )
@@ -15,7 +15,7 @@ type geminiCliCodeAssistClient struct {
 	baseURL string
 }
 
-func NewGeminiCliCodeAssistClient() ports.GeminiCliCodeAssistClient {
+func NewGeminiCliCodeAssistClient() service.GeminiCliCodeAssistClient {
 	return &geminiCliCodeAssistClient{baseURL: geminicli.GeminiCliBaseURL}
 }
 
diff --git a/backend/internal/service/gemini_messages_compat_service.go b/backend/internal/service/gemini_messages_compat_service.go
index cfecb9ef..8dab9e9e 100644
--- a/backend/internal/service/gemini_messages_compat_service.go
+++ b/backend/internal/service/gemini_messages_compat_service.go
@@ -21,7 +21,6 @@ import (
 	"github.com/Wei-Shaw/sub2api/internal/model"
 	"github.com/Wei-Shaw/sub2api/internal/pkg/geminicli"
 	"github.com/Wei-Shaw/sub2api/internal/pkg/googleapi"
-	"github.com/Wei-Shaw/sub2api/internal/service/ports"
 
 	"github.com/gin-gonic/gin"
 )
@@ -35,19 +34,19 @@ const (
 )
 
 type GeminiMessagesCompatService struct {
-	accountRepo      ports.AccountRepository
-	cache            ports.GatewayCache
+	accountRepo      AccountRepository
+	cache            GatewayCache
 	tokenProvider    *GeminiTokenProvider
 	rateLimitService *RateLimitService
-	httpUpstream     ports.HTTPUpstream
+	httpUpstream     HTTPUpstream
 }
 
 func NewGeminiMessagesCompatService(
-	accountRepo ports.AccountRepository,
-	cache ports.GatewayCache,
+	accountRepo AccountRepository,
+	cache GatewayCache,
 	tokenProvider *GeminiTokenProvider,
 	rateLimitService *RateLimitService,
-	httpUpstream ports.HTTPUpstream,
+	httpUpstream HTTPUpstream,
 ) *GeminiMessagesCompatService {
 	return &GeminiMessagesCompatService{
 		accountRepo:      accountRepo,
diff --git a/backend/internal/service/gemini_oauth.go b/backend/internal/service/gemini_oauth.go
index 185d6c55..f8fb2106 100644
--- a/backend/internal/service/gemini_oauth.go
+++ b/backend/internal/service/gemini_oauth.go
@@ -1,4 +1,4 @@
-package ports
+package service
 
 import (
 	"context"
diff --git a/backend/internal/service/gemini_oauth_service.go b/backend/internal/service/gemini_oauth_service.go
index fe602fc0..3b997d81 100644
--- a/backend/internal/service/gemini_oauth_service.go
+++ b/backend/internal/service/gemini_oauth_service.go
@@ -15,21 +15,20 @@ import (
 	"github.com/Wei-Shaw/sub2api/internal/config"
 	"github.com/Wei-Shaw/sub2api/internal/model"
 	"github.com/Wei-Shaw/sub2api/internal/pkg/geminicli"
-	"github.com/Wei-Shaw/sub2api/internal/service/ports"
 )
 
 type GeminiOAuthService struct {
 	sessionStore *geminicli.SessionStore
-	proxyRepo    ports.ProxyRepository
-	oauthClient  ports.GeminiOAuthClient
-	codeAssist   ports.GeminiCliCodeAssistClient
+	proxyRepo    ProxyRepository
+	oauthClient  GeminiOAuthClient
+	codeAssist   GeminiCliCodeAssistClient
 	cfg          *config.Config
 }
 
 func NewGeminiOAuthService(
-	proxyRepo ports.ProxyRepository,
-	oauthClient ports.GeminiOAuthClient,
-	codeAssist ports.GeminiCliCodeAssistClient,
+	proxyRepo ProxyRepository,
+	oauthClient GeminiOAuthClient,
+	codeAssist GeminiCliCodeAssistClient,
 	cfg *config.Config,
 ) *GeminiOAuthService {
 	return &GeminiOAuthService{
diff --git a/backend/internal/service/gemini_token_cache.go b/backend/internal/service/gemini_token_cache.go
index 79a5f948..d5e64f9a 100644
--- a/backend/internal/service/gemini_token_cache.go
+++ b/backend/internal/service/gemini_token_cache.go
@@ -1,4 +1,4 @@
-package ports
+package service
 
 import (
 	"context"
diff --git a/backend/internal/service/gemini_token_provider.go b/backend/internal/service/gemini_token_provider.go
index 8ed7133e..c75198ad 100644
--- a/backend/internal/service/gemini_token_provider.go
+++ b/backend/internal/service/gemini_token_provider.go
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/Wei-Shaw/sub2api/internal/model"
-	"github.com/Wei-Shaw/sub2api/internal/service/ports"
 )
 
 const (
@@ -18,14 +17,14 @@ const (
 )
 
 type GeminiTokenProvider struct {
-	accountRepo        ports.AccountRepository
-	tokenCache         ports.GeminiTokenCache
+	accountRepo        AccountRepository
+	tokenCache         GeminiTokenCache
 	geminiOAuthService *GeminiOAuthService
 }
 
 func NewGeminiTokenProvider(
-	accountRepo ports.AccountRepository,
-	tokenCache ports.GeminiTokenCache,
+	accountRepo AccountRepository,
+	tokenCache GeminiTokenCache,
 	geminiOAuthService *GeminiOAuthService,
 ) *GeminiTokenProvider {
 	return &GeminiTokenProvider{
diff --git a/backend/internal/service/geminicli_codeassist.go b/backend/internal/service/geminicli_codeassist.go
index 2d742b24..0fe7f1cf 100644
--- a/backend/internal/service/geminicli_codeassist.go
+++ b/backend/internal/service/geminicli_codeassist.go
@@ -1,4 +1,4 @@
-package ports
+package service
 
 import (
 	"context"