diff --git a/pkg/commands/git.go b/pkg/commands/git.go
index 2d75330e6..5c3e423db 100644
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -1120,7 +1120,7 @@ func (c *GitCommand) CherryPickCommits(commits []*models.Commit) error {
 }
 
 // GetFilesInDiff get the specified commit files
-func (c *GitCommand) GetFilesInDiff(from string, to string, reverse bool, patchManager *patch.PatchManager) ([]*CommitFile, error) {
+func (c *GitCommand) GetFilesInDiff(from string, to string, reverse bool, patchManager *patch.PatchManager) ([]*models.CommitFile, error) {
 	reverseFlag := ""
 	if reverse {
 		reverseFlag = " -R "
@@ -1135,8 +1135,8 @@ func (c *GitCommand) GetFilesInDiff(from string, to string, reverse bool, patchM
 }
 
 // filenames string is something like "file1\nfile2\nfile3"
-func (c *GitCommand) GetCommitFilesFromFilenames(filenames string, parent string, patchManager *patch.PatchManager) []*CommitFile {
-	commitFiles := make([]*CommitFile, 0)
+func (c *GitCommand) GetCommitFilesFromFilenames(filenames string, parent string, patchManager *patch.PatchManager) []*models.CommitFile {
+	commitFiles := make([]*models.CommitFile, 0)
 
 	for _, line := range strings.Split(strings.TrimRight(filenames, "\n"), "\n") {
 		// typical result looks like 'A my_file' meaning my_file was added
@@ -1150,7 +1150,7 @@ func (c *GitCommand) GetCommitFilesFromFilenames(filenames string, parent string
 			status = patchManager.GetFileStatus(name)
 		}
 
-		commitFiles = append(commitFiles, &CommitFile{
+		commitFiles = append(commitFiles, &models.CommitFile{
 			Parent:       parent,
 			Name:         name,
 			ChangeStatus: changeStatus,
diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go
index 5b244ba31..84356a833 100644
--- a/pkg/gui/commit_files_panel.go
+++ b/pkg/gui/commit_files_panel.go
@@ -2,10 +2,10 @@ package gui
 
 import (
 	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/commands"
+	"github.com/jesseduffield/lazygit/pkg/models"
 )
 
-func (gui *Gui) getSelectedCommitFile() *commands.CommitFile {
+func (gui *Gui) getSelectedCommitFile() *models.CommitFile {
 	selectedLine := gui.State.Panels.CommitFiles.SelectedLineIdx
 	if selectedLine == -1 || selectedLine > len(gui.State.CommitFiles)-1 {
 		return nil
diff --git a/pkg/gui/custom_commands.go b/pkg/gui/custom_commands.go
index 9d2483587..c15052fb3 100644
--- a/pkg/gui/custom_commands.go
+++ b/pkg/gui/custom_commands.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/jesseduffield/gocui"
-	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/models"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
@@ -23,7 +22,7 @@ type CustomCommandObjects struct {
 	SelectedRemote       *models.Remote
 	SelectedTag          *models.Tag
 	SelectedStashEntry   *models.StashEntry
-	SelectedCommitFile   *commands.CommitFile
+	SelectedCommitFile   *models.CommitFile
 	CheckedOutBranch     *models.Branch
 	PromptResponses      []string
 }
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 02bb27a65..6dc3bf12c 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -277,7 +277,7 @@ type guiState struct {
 	Branches         []*models.Branch
 	Commits          []*models.Commit
 	StashEntries     []*models.StashEntry
-	CommitFiles      []*commands.CommitFile
+	CommitFiles      []*models.CommitFile
 	// FilteredReflogCommits are the ones that appear in the reflog panel.
 	// when in filtering mode we only include the ones that match the given path
 	FilteredReflogCommits []*models.Commit
diff --git a/pkg/gui/presentation/commit_files.go b/pkg/gui/presentation/commit_files.go
index 51107bb83..01e56a1f3 100644
--- a/pkg/gui/presentation/commit_files.go
+++ b/pkg/gui/presentation/commit_files.go
@@ -2,13 +2,13 @@ package presentation
 
 import (
 	"github.com/fatih/color"
-	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/patch"
+	"github.com/jesseduffield/lazygit/pkg/models"
 	"github.com/jesseduffield/lazygit/pkg/theme"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
 
-func GetCommitFileListDisplayStrings(commitFiles []*commands.CommitFile, diffName string) [][]string {
+func GetCommitFileListDisplayStrings(commitFiles []*models.CommitFile, diffName string) [][]string {
 	if len(commitFiles) == 0 {
 		return [][]string{{utils.ColoredString("(none)", color.FgRed)}}
 	}
@@ -24,7 +24,7 @@ func GetCommitFileListDisplayStrings(commitFiles []*commands.CommitFile, diffNam
 }
 
 // getCommitFileDisplayStrings returns the display string of branch
-func getCommitFileDisplayStrings(f *commands.CommitFile, diffed bool) []string {
+func getCommitFileDisplayStrings(f *models.CommitFile, diffed bool) []string {
 	yellow := color.New(color.FgYellow)
 	green := color.New(color.FgGreen)
 	defaultColor := color.New(theme.DefaultTextColor)
diff --git a/pkg/commands/commit_file.go b/pkg/models/commit_file.go
similarity index 97%
rename from pkg/commands/commit_file.go
rename to pkg/models/commit_file.go
index c2131ace1..17faf0142 100644
--- a/pkg/commands/commit_file.go
+++ b/pkg/models/commit_file.go
@@ -1,4 +1,4 @@
-package commands
+package models
 
 // CommitFile : A git commit file
 type CommitFile struct {