diff --git a/crates/gitbutler-branch/src/controller.rs b/crates/gitbutler-branch/src/controller.rs
index 7f0bb57ee..e5697c971 100644
--- a/crates/gitbutler-branch/src/controller.rs
+++ b/crates/gitbutler-branch/src/controller.rs
@@ -21,9 +21,10 @@ use crate::base::{
 use super::r#virtual as branch;
 use gitbutler_core::virtual_branches;
 
+use crate::files::RemoteBranchFile;
 use gitbutler_core::virtual_branches::{
     branch::{BranchId, BranchOwnershipClaims},
-    target, RemoteBranchFile, VirtualBranchesHandle,
+    target, VirtualBranchesHandle,
 };
 use gitbutler_core::{
     git,
@@ -127,7 +128,7 @@ impl Controller {
         commit_oid: git2::Oid,
     ) -> Result<Vec<RemoteBranchFile>> {
         let project_repository = Repository::open(project)?;
-        virtual_branches::list_remote_commit_files(project_repository.repo(), commit_oid)
+        crate::files::list_remote_commit_files(project_repository.repo(), commit_oid)
             .map_err(Into::into)
     }
 
diff --git a/crates/gitbutler-core/src/virtual_branches/files.rs b/crates/gitbutler-branch/src/files.rs
similarity index 97%
rename from crates/gitbutler-core/src/virtual_branches/files.rs
rename to crates/gitbutler-branch/src/files.rs
index ba4be1067..8deb7ca36 100644
--- a/crates/gitbutler-core/src/virtual_branches/files.rs
+++ b/crates/gitbutler-branch/src/files.rs
@@ -3,7 +3,7 @@ use std::path;
 use anyhow::{anyhow, Context, Result};
 use serde::Serialize;
 
-use crate::git::diff;
+use gitbutler_core::git::diff;
 
 #[derive(Debug, PartialEq, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
diff --git a/crates/gitbutler-branch/src/lib.rs b/crates/gitbutler-branch/src/lib.rs
index 6537d35d6..70f24e551 100644
--- a/crates/gitbutler-branch/src/lib.rs
+++ b/crates/gitbutler-branch/src/lib.rs
@@ -10,3 +10,5 @@ pub mod assets;
 pub mod base;
 
 pub mod integration;
+
+pub mod files;
diff --git a/crates/gitbutler-core/src/virtual_branches/mod.rs b/crates/gitbutler-core/src/virtual_branches/mod.rs
index 912494049..456ec804e 100644
--- a/crates/gitbutler-core/src/virtual_branches/mod.rs
+++ b/crates/gitbutler-core/src/virtual_branches/mod.rs
@@ -2,9 +2,6 @@ pub mod branch;
 pub use branch::{Branch, BranchId};
 pub mod target;
 
-mod files;
-pub use files::*;
-
 mod remote;
 pub use remote::*;
 
diff --git a/crates/gitbutler-tauri/src/virtual_branches.rs b/crates/gitbutler-tauri/src/virtual_branches.rs
index 89cecb0f4..e0167b694 100644
--- a/crates/gitbutler-tauri/src/virtual_branches.rs
+++ b/crates/gitbutler-tauri/src/virtual_branches.rs
@@ -2,6 +2,7 @@ pub mod commands {
     use crate::error::Error;
     use anyhow::{anyhow, Context};
     use gitbutler_branch::base::BaseBranch;
+    use gitbutler_branch::files::RemoteBranchFile;
     use gitbutler_branch::{Controller, NameConflitResolution, VirtualBranches};
     use gitbutler_core::{
         assets,
@@ -11,7 +12,7 @@ pub mod commands {
         types::ReferenceName,
         virtual_branches::{
             branch::{self, BranchId, BranchOwnershipClaims},
-            RemoteBranch, RemoteBranchData, RemoteBranchFile,
+            RemoteBranch, RemoteBranchData,
         },
     };
     use tauri::{AppHandle, Manager};