diff --git a/CLAUDE.md b/CLAUDE.md
deleted file mode 100644
index ae91a1c..0000000
--- a/CLAUDE.md
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- SYMPHONY:START -->
-# Symphony Code Conventions
-
-**This project uses Symphony MCP for automated code convention management.**
-
-## Critical Requirements
-
-### 1. Before Writing Code
-
-**Check MCP Status**: Verify Symphony MCP server is active. If unavailable, warn the user and do not proceed.
-
-**Query Conventions**: Use `mcp__symphony__query_conventions` to retrieve relevant rules.
-- Select appropriate category: security, style, documentation, error_handling, architecture, performance, testing
-- Filter by languages as needed
-
-### 2. After Writing Code
-
-**Validate Changes**: Always run `mcp__symphony__validate_code` to check all changes against project conventions.
-
-**Fix Violations**: Address any issues found before committing.
-
-## Workflow
-
-1. Verify Symphony MCP is active
-2. Query conventions for your task
-3. Write code
-4. Validate with Symphony
-5. Fix violations
-6. Commit
-<!-- SYMPHONY:END -->
diff --git a/internal/bootstrap/linters.go b/cmd/sym/bootstrap.go
similarity index 68%
rename from internal/bootstrap/linters.go
rename to cmd/sym/bootstrap.go
index 0eb4567..c4477a9 100644
--- a/internal/bootstrap/linters.go
+++ b/cmd/sym/bootstrap.go
@@ -1,4 +1,4 @@
-package bootstrap
+package main
 
 import (
 	// Import linters for registration side-effects.
@@ -10,7 +10,9 @@ import (
 	_ "github.com/DevSymphony/sym-cli/internal/linter/prettier"
 	_ "github.com/DevSymphony/sym-cli/internal/linter/pylint"
 	_ "github.com/DevSymphony/sym-cli/internal/linter/tsc"
-)
 
-// This package only imports linter packages for their init() side-effects.
-// Import this package from main.go to ensure all linters are registered.
+	// Import LLM providers for registration side-effects.
+	_ "github.com/DevSymphony/sym-cli/internal/llm/claudecode"
+	_ "github.com/DevSymphony/sym-cli/internal/llm/geminicli"
+	_ "github.com/DevSymphony/sym-cli/internal/llm/openaiapi"
+)
diff --git a/cmd/sym/main.go b/cmd/sym/main.go
index c85d24b..2102c20 100644
--- a/cmd/sym/main.go
+++ b/cmd/sym/main.go
@@ -2,9 +2,6 @@ package main
 
 import (
 	"github.com/DevSymphony/sym-cli/internal/cmd"
-
-	// Bootstrap: register all adapters
-	_ "github.com/DevSymphony/sym-cli/internal/bootstrap"
 )
 
 // Version is set by build -ldflags "-X main.Version=x.y.z"
diff --git a/cmd/test-linter/main.go b/cmd/test-linter/main.go
deleted file mode 100644
index 28d5cd6..0000000
--- a/cmd/test-linter/main.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/DevSymphony/sym-cli/internal/linter"
-	"github.com/DevSymphony/sym-cli/internal/linter/eslint"
-)
-
-func main() {
-	fmt.Println("=== Testing ESLint Adapter ===")
-	fmt.Println()
-
-	// 1. Create ESLint adapter
-	homeDir, _ := os.UserHomeDir()
-	toolsDir := filepath.Join(homeDir, ".sym", "tools")
-	workDir, _ := os.Getwd()
-
-	adp := eslint.New(toolsDir)
-	fmt.Printf("✓ Created ESLint adapter\n")
-	fmt.Printf("  Tools directory: %s\n", adp.ToolsDir)
-
-	// 2. Check availability
-	ctx := context.Background()
-	fmt.Println("Checking ESLint availability...")
-	err := adp.CheckAvailability(ctx)
-	if err != nil {
-		fmt.Printf("⚠️  ESLint not available: %v\n", err)
-		fmt.Println("\nInstalling ESLint...")
-		// Try to install
-		installConfig := linter.InstallConfig{
-			ToolsDir: toolsDir,
-		}
-		installErr := adp.Install(ctx, installConfig)
-		if installErr != nil {
-			fmt.Printf("❌ Failed to install: %v\n", installErr)
-			os.Exit(1)
-		}
-		fmt.Println("✓ ESLint installed successfully")
-		fmt.Println()
-	} else {
-		fmt.Println("✓ ESLint is available")
-		fmt.Println()
-	}
-
-	// 3. Create a simple ESLint config
-	config := []byte(`{
-		"env": {
-			"node": true,
-			"es2021": true
-		},
-		"extends": "eslint:recommended",
-		"parserOptions": {
-			"ecmaVersion": 12
-		},
-		"rules": {
-			"semi": ["error", "always"],
-			"quotes": ["error", "single"],
-			"no-unused-vars": "error",
-			"no-console": "warn"
-		}
-	}`)
-
-	// 4. Find test file
-	testFile := filepath.Join(workDir, "test_file.js")
-	if _, err := os.Stat(testFile); os.IsNotExist(err) {
-		fmt.Printf("❌ Test file not found: %s\n", testFile)
-		os.Exit(1)
-	}
-	fmt.Printf("Test file: %s\n\n", testFile)
-
-	// 5. Execute ESLint
-	fmt.Println("Running ESLint...")
-	output, err := adp.Execute(ctx, config, []string{testFile})
-	if err != nil {
-		fmt.Printf("⚠️  ESLint execution error: %v\n", err)
-		// Continue to parse output even if there's an error (violations cause non-zero exit)
-	}
-
-	// 6. Show raw output
-	fmt.Println("\n--- Raw ESLint Output ---")
-	if output.Stdout != "" {
-		fmt.Printf("STDOUT:\n%s\n", output.Stdout)
-	}
-	if output.Stderr != "" {
-		fmt.Printf("STDERR:\n%s\n", output.Stderr)
-	}
-	fmt.Printf("Exit Code: %d\n", output.ExitCode)
-	fmt.Printf("Duration: %s\n", output.Duration)
-
-	// 7. Parse violations
-	fmt.Println("\n--- Parsed Violations ---")
-	violations, parseErr := adp.ParseOutput(output)
-	if parseErr != nil {
-		fmt.Printf("❌ Failed to parse output: %v\n", parseErr)
-		os.Exit(1)
-	}
-
-	if len(violations) == 0 {
-		fmt.Println("✅ No violations found!")
-	} else {
-		fmt.Printf("Found %d violation(s):\n\n", len(violations))
-		for i, v := range violations {
-			fmt.Printf("%d. [%s] %s\n", i+1, v.Severity, v.RuleID)
-			fmt.Printf("   File: %s:%d:%d\n", v.File, v.Line, v.Column)
-			fmt.Printf("   Message: %s\n", v.Message)
-
-			// Show that we have the raw output stored
-			if len(output.Stdout) > 0 {
-				fmt.Printf("   ✓ Raw output captured: %d bytes\n", len(output.Stdout))
-			}
-			if len(output.Stderr) > 0 {
-				fmt.Printf("   ✓ Raw error captured: %d bytes\n", len(output.Stderr))
-			}
-			fmt.Printf("   ✓ Execution time: %s\n\n", output.Duration)
-		}
-	}
-
-	fmt.Println("=== Test Complete ===")
-}
diff --git a/internal/bootstrap/providers.go b/internal/bootstrap/providers.go
deleted file mode 100644
index 7287aa2..0000000
--- a/internal/bootstrap/providers.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package bootstrap
-
-import (
-	// Import LLM providers for registration side-effects.
-	_ "github.com/DevSymphony/sym-cli/internal/llm/claudecode"
-	_ "github.com/DevSymphony/sym-cli/internal/llm/geminicli"
-	_ "github.com/DevSymphony/sym-cli/internal/llm/openaiapi"
-)
diff --git a/internal/cmd/convert.go b/internal/cmd/convert.go
index 7936d4b..4ea6286 100644
--- a/internal/cmd/convert.go
+++ b/internal/cmd/convert.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/DevSymphony/sym-cli/internal/config"
 	"github.com/DevSymphony/sym-cli/internal/converter"
 	"github.com/DevSymphony/sym-cli/internal/llm"
+	"github.com/DevSymphony/sym-cli/internal/util/config"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
 	"github.com/spf13/cobra"
 )
diff --git a/internal/cmd/init.go b/internal/cmd/init.go
index aa52ae2..a083cfd 100644
--- a/internal/cmd/init.go
+++ b/internal/cmd/init.go
@@ -5,11 +5,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/DevSymphony/sym-cli/internal/config"
-	"github.com/DevSymphony/sym-cli/internal/git"
 	"github.com/DevSymphony/sym-cli/internal/linter"
 	"github.com/DevSymphony/sym-cli/internal/policy"
 	"github.com/DevSymphony/sym-cli/internal/roles"
+	"github.com/DevSymphony/sym-cli/internal/util/config"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
 
 	"github.com/spf13/cobra"
diff --git a/internal/cmd/llm.go b/internal/cmd/llm.go
index 52d6dc2..05130ca 100644
--- a/internal/cmd/llm.go
+++ b/internal/cmd/llm.go
@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/DevSymphony/sym-cli/internal/config"
-	"github.com/DevSymphony/sym-cli/internal/envutil"
 	"github.com/DevSymphony/sym-cli/internal/llm"
+	"github.com/DevSymphony/sym-cli/internal/util/config"
+	"github.com/DevSymphony/sym-cli/internal/util/env"
 	"github.com/spf13/cobra"
 )
 
@@ -300,7 +300,7 @@ func promptAndSaveAPIKey(providerName string) error {
 
 	// Save to .env file
 	envPath := config.GetProjectEnvPath()
-	if err := envutil.SaveKeyToEnvFile(envPath, envVarName, apiKey); err != nil {
+	if err := env.SaveKeyToEnvFile(envPath, envVarName, apiKey); err != nil {
 		return err
 	}
 
diff --git a/internal/cmd/mcp.go b/internal/cmd/mcp.go
index 82d709a..2a61666 100644
--- a/internal/cmd/mcp.go
+++ b/internal/cmd/mcp.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
 	"github.com/DevSymphony/sym-cli/internal/mcp"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/cmd/policy.go b/internal/cmd/policy.go
index 7bc63a9..104d9aa 100644
--- a/internal/cmd/policy.go
+++ b/internal/cmd/policy.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/DevSymphony/sym-cli/internal/config"
 	"github.com/DevSymphony/sym-cli/internal/policy"
+	"github.com/DevSymphony/sym-cli/internal/util/config"
 
 	"github.com/spf13/cobra"
 )
diff --git a/internal/cmd/validate.go b/internal/cmd/validate.go
index 22c567d..135ad46 100644
--- a/internal/cmd/validate.go
+++ b/internal/cmd/validate.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
 	"github.com/DevSymphony/sym-cli/internal/llm"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/internal/validator"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
 	"github.com/spf13/cobra"
diff --git a/internal/config/README.md b/internal/config/README.md
deleted file mode 100644
index cd57d9d..0000000
--- a/internal/config/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# config
-
-전역 설정 및 인증 토큰을 관리합니다.
-
-`~/.config/sym/` 디렉토리에 설정 파일과 GitHub 액세스 토큰을 저장하고 로드합니다.
-
-**사용자**: auth, cmd, server
-**의존성**: 없음
diff --git a/internal/git/README.md b/internal/git/README.md
deleted file mode 100644
index 28ca0e3..0000000
--- a/internal/git/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# git
-
-Git 저장소의 변경 사항 조회 및 저장소 정보를 제공하는 패키지.
-
-## 패키지 구조
-
-```
-git/
-├── changes.go       # 변경 사항 조회 및 diff 처리
-├── changes_test.go  # 테스트
-├── repo.go          # 저장소 정보 조회
-└── README.md
-```
-
-## 의존성
-
-### 패키지 사용자
-
-| 패키지 | 용도 |
-|--------|------|
-| `internal/validator` | 검증 대상 파일 및 diff 획득 |
-| `internal/cmd/validate.go` | CLI validate 명령어 |
-| `internal/mcp/server.go` | MCP validate_code 도구 |
-| `internal/roles` | RBAC 권한 검증 |
-| `internal/policy` | 정책 관리 |
-
-### 패키지 의존성
-
-없음.
-
-## Public/Private API
-
-### Public API
-
-**Types**
-
-| 타입 | 파일 | 설명 |
-|------|------|------|
-| `Change` | changes.go:10 | 파일 변경 정보 (FilePath, Status, Diff) |
-
-**Functions**
-
-| 함수 | 파일 | 설명 |
-|------|------|------|
-| `GetChanges()` | changes.go:18 | 모든 변경 사항 (staged + unstaged + untracked) |
-| `GetStagedChanges()` | changes.go:146 | staged 변경만 |
-| `ExtractAddedLines(diff)` | changes.go:185 | diff에서 추가된 줄 추출 |
-| `GetRepoRoot()` | repo.go:10 | 저장소 루트 경로 |
-| `GetCurrentUser()` | repo.go:21 | Git user.name |
-
-### Private API
-
-없음.
diff --git a/internal/linter/README.md b/internal/linter/README.md
index b6fc343..607c893 100644
--- a/internal/linter/README.md
+++ b/internal/linter/README.md
@@ -241,7 +241,7 @@ func init() {
 ### Step 5: Add Import to Bootstrap
 
 ```go
-// internal/bootstrap/linters.go
+// cmd/sym/bootstrap.go
 import (
     _ "github.com/DevSymphony/sym-cli/internal/linter/mylinter"
 )
diff --git a/internal/llm/README.md b/internal/llm/README.md
index c4bfdb8..b865732 100644
--- a/internal/llm/README.md
+++ b/internal/llm/README.md
@@ -164,7 +164,7 @@ func newProvider(cfg llm.Config) (llm.RawProvider, error) {
 ### Step 4: Add Import to Bootstrap
 
 ```go
-// internal/bootstrap/providers.go
+// cmd/sym/bootstrap.go
 import (
     _ "github.com/DevSymphony/sym-cli/internal/llm/myprovider"
 )
diff --git a/internal/llm/config.go b/internal/llm/config.go
index 1967d13..c2dc2c7 100644
--- a/internal/llm/config.go
+++ b/internal/llm/config.go
@@ -3,7 +3,7 @@ package llm
 import (
 	"fmt"
 
-	"github.com/DevSymphony/sym-cli/internal/config"
+	"github.com/DevSymphony/sym-cli/internal/util/config"
 )
 
 // Validate checks if the configuration is valid.
diff --git a/internal/llm/openaiapi/provider.go b/internal/llm/openaiapi/provider.go
index 788cf1c..1c0d31f 100644
--- a/internal/llm/openaiapi/provider.go
+++ b/internal/llm/openaiapi/provider.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/DevSymphony/sym-cli/internal/envutil"
 	"github.com/DevSymphony/sym-cli/internal/llm"
+	"github.com/DevSymphony/sym-cli/internal/util/env"
 )
 
 const (
@@ -36,7 +36,7 @@ func init() {
 		Name:         providerName,
 		DisplayName:  displayName,
 		DefaultModel: defaultModel,
-		Available:    envutil.GetAPIKey("OPENAI_API_KEY") != "",
+		Available:    env.GetAPIKey("OPENAI_API_KEY") != "",
 		Path:         "",
 		Models: []llm.ModelInfo{
 			{ID: "gpt-4o-mini", DisplayName: "gpt-4o-mini", Description: "Fast and efficient", Recommended: true},
@@ -67,7 +67,7 @@ var _ llm.RawProvider = (*Provider)(nil)
 // Returns ErrAPIKeyRequired if API key is not provided.
 func newProvider(cfg llm.Config) (llm.RawProvider, error) {
 	// Provider handles its own API key loading from env vars and .sym/.env
-	apiKey := envutil.GetAPIKey("OPENAI_API_KEY")
+	apiKey := env.GetAPIKey("OPENAI_API_KEY")
 	if apiKey == "" {
 		return nil, ErrAPIKeyRequired
 	}
diff --git a/internal/mcp/server.go b/internal/mcp/server.go
index 492ea5a..ecc4cc7 100644
--- a/internal/mcp/server.go
+++ b/internal/mcp/server.go
@@ -9,12 +9,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/DevSymphony/sym-cli/internal/config"
 	"github.com/DevSymphony/sym-cli/internal/converter"
-	"github.com/DevSymphony/sym-cli/internal/git"
 	"github.com/DevSymphony/sym-cli/internal/llm"
 	"github.com/DevSymphony/sym-cli/internal/policy"
 	"github.com/DevSymphony/sym-cli/internal/roles"
+	"github.com/DevSymphony/sym-cli/internal/util/config"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/internal/validator"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
 	sdkmcp "github.com/modelcontextprotocol/go-sdk/mcp"
diff --git a/internal/policy/manager.go b/internal/policy/manager.go
index 7e86feb..4d27911 100644
--- a/internal/policy/manager.go
+++ b/internal/policy/manager.go
@@ -5,7 +5,8 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"github.com/DevSymphony/sym-cli/internal/git"
+
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
 )
 
diff --git a/internal/roles/README.md b/internal/roles/README.md
index b933f36..e856c5e 100644
--- a/internal/roles/README.md
+++ b/internal/roles/README.md
@@ -36,7 +36,7 @@ roles/
      ┌─────┼─────┐
      ▼     ▼     ▼
 ┌────────┐ ┌────────┐ ┌────────────┐
-│ envutil│ │  git   │ │   policy   │
+│util/env│ │util/git│ │   policy   │
 └────────┘ └────────┘ └────────────┘
                            │
                            ▼
diff --git a/internal/roles/rbac.go b/internal/roles/rbac.go
index 67d48cc..60a52c0 100644
--- a/internal/roles/rbac.go
+++ b/internal/roles/rbac.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
 	"github.com/DevSymphony/sym-cli/internal/policy"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
 )
 
diff --git a/internal/roles/roles.go b/internal/roles/roles.go
index 17d8c4b..2a30d80 100644
--- a/internal/roles/roles.go
+++ b/internal/roles/roles.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"sort"
 
-	"github.com/DevSymphony/sym-cli/internal/envutil"
+	"github.com/DevSymphony/sym-cli/internal/util/env"
 )
 
 // Roles represents a map of role names to lists of usernames
@@ -132,7 +132,7 @@ func GetCurrentRole() (string, error) {
 		return "", err
 	}
 
-	role := envutil.LoadKeyFromEnvFile(envPath, currentRoleKey)
+	role := env.LoadKeyFromEnvFile(envPath, currentRoleKey)
 	return role, nil
 }
 
@@ -143,7 +143,7 @@ func SetCurrentRole(role string) error {
 		return err
 	}
 
-	return envutil.SaveKeyToEnvFile(envPath, currentRoleKey, role)
+	return env.SaveKeyToEnvFile(envPath, currentRoleKey, role)
 }
 
 // GetAvailableRoles returns all role names defined in roles.json
diff --git a/internal/server/server.go b/internal/server/server.go
index e77d87c..8f760a8 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -13,11 +13,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/DevSymphony/sym-cli/internal/config"
 	"github.com/DevSymphony/sym-cli/internal/converter"
 	"github.com/DevSymphony/sym-cli/internal/llm"
 	"github.com/DevSymphony/sym-cli/internal/policy"
 	"github.com/DevSymphony/sym-cli/internal/roles"
+	"github.com/DevSymphony/sym-cli/internal/util/config"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
 
 	"github.com/pkg/browser"
diff --git a/internal/config/config.go b/internal/util/config/config.go
similarity index 100%
rename from internal/config/config.go
rename to internal/util/config/config.go
diff --git a/internal/config/project.go b/internal/util/config/project.go
similarity index 100%
rename from internal/config/project.go
rename to internal/util/config/project.go
diff --git a/internal/envutil/env.go b/internal/util/env/env.go
similarity index 99%
rename from internal/envutil/env.go
rename to internal/util/env/env.go
index f82e0e1..4610793 100644
--- a/internal/envutil/env.go
+++ b/internal/util/env/env.go
@@ -1,4 +1,4 @@
-package envutil
+package env
 
 import (
 	"bufio"
diff --git a/internal/git/changes.go b/internal/util/git/changes.go
similarity index 100%
rename from internal/git/changes.go
rename to internal/util/git/changes.go
diff --git a/internal/git/changes_test.go b/internal/util/git/changes_test.go
similarity index 100%
rename from internal/git/changes_test.go
rename to internal/util/git/changes_test.go
diff --git a/internal/git/repo.go b/internal/util/git/repo.go
similarity index 100%
rename from internal/git/repo.go
rename to internal/util/git/repo.go
diff --git a/internal/validator/execution_unit.go b/internal/validator/execution_unit.go
index 65bfe96..8681fb9 100644
--- a/internal/validator/execution_unit.go
+++ b/internal/validator/execution_unit.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
 	"github.com/DevSymphony/sym-cli/internal/linter"
 	"github.com/DevSymphony/sym-cli/internal/llm"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
 )
 
diff --git a/internal/validator/llm_validator.go b/internal/validator/llm_validator.go
index 13a0433..65d9c80 100644
--- a/internal/validator/llm_validator.go
+++ b/internal/validator/llm_validator.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
 	"github.com/DevSymphony/sym-cli/internal/llm"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
 )
 
diff --git a/internal/validator/validator.go b/internal/validator/validator.go
index a17c842..3bc2c76 100644
--- a/internal/validator/validator.go
+++ b/internal/validator/validator.go
@@ -10,10 +10,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
 	"github.com/DevSymphony/sym-cli/internal/linter"
 	"github.com/DevSymphony/sym-cli/internal/llm"
 	"github.com/DevSymphony/sym-cli/internal/roles"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
 )
 
diff --git a/internal/validator/validator_test.go b/internal/validator/validator_test.go
index 6604e0d..60f9532 100644
--- a/internal/validator/validator_test.go
+++ b/internal/validator/validator_test.go
@@ -3,7 +3,7 @@ package validator
 import (
 	"testing"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/internal/linter"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
 	"github.com/stretchr/testify/assert"
diff --git a/tests/e2e/full_workflow_test.go b/tests/e2e/full_workflow_test.go
index ff74177..7449f25 100644
--- a/tests/e2e/full_workflow_test.go
+++ b/tests/e2e/full_workflow_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/DevSymphony/sym-cli/internal/converter"
-	"github.com/DevSymphony/sym-cli/internal/git"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/internal/llm"
 	"github.com/DevSymphony/sym-cli/internal/validator"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
diff --git a/tests/e2e/mcp_integration_test.go b/tests/e2e/mcp_integration_test.go
index b7ebfa2..c103f80 100644
--- a/tests/e2e/mcp_integration_test.go
+++ b/tests/e2e/mcp_integration_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/internal/llm"
 	"github.com/DevSymphony/sym-cli/internal/validator"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
diff --git a/tests/e2e/validator_test.go b/tests/e2e/validator_test.go
index b659be0..5e93562 100644
--- a/tests/e2e/validator_test.go
+++ b/tests/e2e/validator_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/internal/llm"
 	"github.com/DevSymphony/sym-cli/internal/validator"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
diff --git a/tests/integration/checkstyle_test.go b/tests/integration/checkstyle_test.go
index b9955e3..8604dcc 100644
--- a/tests/integration/checkstyle_test.go
+++ b/tests/integration/checkstyle_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/internal/linter"
 	"github.com/DevSymphony/sym-cli/internal/validator"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
diff --git a/tests/integration/eslint_test.go b/tests/integration/eslint_test.go
index ebdb3ee..211d577 100644
--- a/tests/integration/eslint_test.go
+++ b/tests/integration/eslint_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/internal/linter"
 	"github.com/DevSymphony/sym-cli/internal/validator"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
diff --git a/tests/integration/pmd_test.go b/tests/integration/pmd_test.go
index 79f6af0..d198157 100644
--- a/tests/integration/pmd_test.go
+++ b/tests/integration/pmd_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/internal/linter"
 	"github.com/DevSymphony/sym-cli/internal/validator"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
diff --git a/tests/integration/prettier_test.go b/tests/integration/prettier_test.go
index a00e178..23dc00b 100644
--- a/tests/integration/prettier_test.go
+++ b/tests/integration/prettier_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/internal/linter"
 	"github.com/DevSymphony/sym-cli/internal/validator"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
diff --git a/tests/integration/pylint_test.go b/tests/integration/pylint_test.go
index ebd3f2e..7dea824 100644
--- a/tests/integration/pylint_test.go
+++ b/tests/integration/pylint_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/internal/linter"
 	"github.com/DevSymphony/sym-cli/internal/validator"
 	"github.com/DevSymphony/sym-cli/pkg/schema"
diff --git a/tests/integration/tsc_test.go b/tests/integration/tsc_test.go
index 28629e7..8f6c4e3 100644
--- a/tests/integration/tsc_test.go
+++ b/tests/integration/tsc_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/DevSymphony/sym-cli/internal/git"
+	"github.com/DevSymphony/sym-cli/internal/util/git"
 	"github.com/DevSymphony/sym-cli/internal/linter"
 	"github.com/DevSymphony/sym-cli/internal/validator"
 	"github.com/DevSymphony/sym-cli/pkg/schema"