diff --git a/hbs2-git/git-hbs2/Main.hs b/hbs2-git/git-hbs2/Main.hs
index 65a4d950..456058e1 100644
--- a/hbs2-git/git-hbs2/Main.hs
+++ b/hbs2-git/git-hbs2/Main.hs
@@ -9,8 +9,8 @@ import HBS2.Git.Client.State
 
 import HBS2.Git.Data.RefLog
 import HBS2.Git.Local.CLI qualified as Git
-import HBS2.Git.Data.Tx qualified as TX
-import HBS2.Git.Data.Tx (RepoHead(..))
+import HBS2.Git.Data.Tx.Git qualified as TX
+import HBS2.Git.Data.Tx.Git (RepoHead(..))
 import HBS2.Git.Data.LWWBlock
 import HBS2.Git.Data.GK
 
diff --git a/hbs2-git/git-remote-hbs2/Main.hs b/hbs2-git/git-remote-hbs2/Main.hs
index 7bd78504..d5e8f28a 100644
--- a/hbs2-git/git-remote-hbs2/Main.hs
+++ b/hbs2-git/git-remote-hbs2/Main.hs
@@ -10,8 +10,8 @@ import HBS2.Git.Client.State
 import HBS2.Git.Client.Progress
 import HBS2.Git.Client.Config
 import HBS2.Git.Data.RefLog
-import HBS2.Git.Data.Tx qualified as TX
-import HBS2.Git.Data.Tx (RepoHead(..))
+import HBS2.Git.Data.Tx.Git qualified as TX
+import HBS2.Git.Data.Tx.Git (RepoHead(..))
 import HBS2.Git.Data.LWWBlock
 
 import HBS2.System.Dir
diff --git a/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/App.hs b/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/App.hs
index adb2382c..26609664 100644
--- a/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/App.hs
+++ b/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/App.hs
@@ -9,7 +9,7 @@ import HBS2.Git.Client.Config
 import HBS2.Git.Client.Progress
 import HBS2.Git.Client.State
 
-import HBS2.Git.Data.Tx
+import HBS2.Git.Data.Tx.Git
 
 import HBS2.Git.Local.CLI
 
diff --git a/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/App/Types.hs b/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/App/Types.hs
index 60dfa627..0fbcbbff 100644
--- a/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/App/Types.hs
+++ b/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/App/Types.hs
@@ -13,7 +13,7 @@ import HBS2.Git.Client.Progress
 import HBS2.Git.Local
 import HBS2.Git.Client.App.Types.GitEnv
 
-import HBS2.Git.Data.Tx
+import HBS2.Git.Data.Tx.Git
 import HBS2.Git.Data.GK
 
 import HBS2.KeyMan.Keys.Direct
diff --git a/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/Export.hs b/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/Export.hs
index c48ee7b1..69421bc2 100644
--- a/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/Export.hs
+++ b/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/Export.hs
@@ -9,7 +9,7 @@ import HBS2.Git.Client.State
 import HBS2.Git.Client.Progress
 
 import HBS2.Git.Data.RefLog
-import HBS2.Git.Data.Tx
+import HBS2.Git.Data.Tx.Git
 import HBS2.Git.Data.LWWBlock
 import HBS2.Git.Data.GK
 
diff --git a/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/Import.hs b/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/Import.hs
index 1d150d23..efcf4688 100644
--- a/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/Import.hs
+++ b/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/Import.hs
@@ -7,7 +7,7 @@ import HBS2.Git.Client.RefLog
 import HBS2.Git.Client.Progress
 
 import HBS2.Git.Data.RefLog
-import HBS2.Git.Data.Tx
+import HBS2.Git.Data.Tx.Git
 import HBS2.Git.Data.LWWBlock
 
 import Data.ByteString.Lazy qualified as LBS
diff --git a/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/Progress.hs b/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/Progress.hs
index f865db30..1e404a7e 100644
--- a/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/Progress.hs
+++ b/hbs2-git/hbs2-git-client-lib/HBS2/Git/Client/Progress.hs
@@ -6,7 +6,7 @@ import HBS2.Git.Client.Prelude
 import HBS2.Git.Data.RefLog
 import HBS2.Git.Data.LWWBlock
 
-import HBS2.Git.Data.Tx
+import HBS2.Git.Data.Tx.Git
 
 data Progress a =
   Progress
diff --git a/hbs2-git/hbs2-git-client-lib/HBS2/Git/Data/Tx.hs b/hbs2-git/hbs2-git-client-lib/HBS2/Git/Data/Tx/Git.hs
similarity index 99%
rename from hbs2-git/hbs2-git-client-lib/HBS2/Git/Data/Tx.hs
rename to hbs2-git/hbs2-git-client-lib/HBS2/Git/Data/Tx/Git.hs
index 75172dd3..1f003495 100644
--- a/hbs2-git/hbs2-git-client-lib/HBS2/Git/Data/Tx.hs
+++ b/hbs2-git/hbs2-git-client-lib/HBS2/Git/Data/Tx/Git.hs
@@ -1,5 +1,5 @@
-module HBS2.Git.Data.Tx
-  ( module HBS2.Git.Data.Tx
+module HBS2.Git.Data.Tx.Git
+  ( module HBS2.Git.Data.Tx.Git
   , OperationError(..)
   ) where
 
diff --git a/hbs2-git/hbs2-git.cabal b/hbs2-git/hbs2-git.cabal
index fd93d4d3..547321ff 100644
--- a/hbs2-git/hbs2-git.cabal
+++ b/hbs2-git/hbs2-git.cabal
@@ -100,7 +100,7 @@ library
       HBS2.Git.Local
       HBS2.Git.Local.CLI
 
-      HBS2.Git.Data.Tx
+      HBS2.Git.Data.Tx.Git
       HBS2.Git.Data.GK
       HBS2.Git.Data.RefLog
       HBS2.Git.Data.LWWBlock