diff --git a/core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockChain.java b/core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockChain.java
index c793e10fd5..9786165eae 100644
--- a/core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockChain.java
+++ b/core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockChain.java
@@ -26,7 +26,11 @@ import io.bisq.common.util.FunctionalReadWriteLock;
 import io.bisq.common.util.Tuple2;
 import io.bisq.core.dao.DaoOptionKeys;
 import io.bisq.core.dao.blockchain.exceptions.BlockNotConnectingException;
-import io.bisq.core.dao.blockchain.vo.*;
+import io.bisq.core.dao.blockchain.vo.BsqBlock;
+import io.bisq.core.dao.blockchain.vo.Tx;
+import io.bisq.core.dao.blockchain.vo.TxOutput;
+import io.bisq.core.dao.blockchain.vo.TxType;
+import io.bisq.core.dao.blockchain.vo.util.TxIdIndexTuple;
 import io.bisq.generated.protobuffer.PB;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
diff --git a/core/src/main/java/io/bisq/core/dao/blockchain/vo/TxInput.java b/core/src/main/java/io/bisq/core/dao/blockchain/vo/TxInput.java
index e8e41c22d9..d239403a3d 100644
--- a/core/src/main/java/io/bisq/core/dao/blockchain/vo/TxInput.java
+++ b/core/src/main/java/io/bisq/core/dao/blockchain/vo/TxInput.java
@@ -18,6 +18,7 @@
 package io.bisq.core.dao.blockchain.vo;
 
 import io.bisq.common.proto.persistable.PersistablePayload;
+import io.bisq.core.dao.blockchain.vo.util.TxIdIndexTuple;
 import io.bisq.generated.protobuffer.PB;
 import lombok.Data;
 
diff --git a/core/src/main/java/io/bisq/core/dao/blockchain/vo/TxOutput.java b/core/src/main/java/io/bisq/core/dao/blockchain/vo/TxOutput.java
index cbb1fb1696..56e1d9a1f4 100644
--- a/core/src/main/java/io/bisq/core/dao/blockchain/vo/TxOutput.java
+++ b/core/src/main/java/io/bisq/core/dao/blockchain/vo/TxOutput.java
@@ -21,6 +21,7 @@ import com.google.protobuf.ByteString;
 import io.bisq.common.proto.persistable.PersistablePayload;
 import io.bisq.common.util.JsonExclude;
 import io.bisq.core.dao.blockchain.btcd.PubKeyScript;
+import io.bisq.core.dao.blockchain.vo.util.TxIdIndexTuple;
 import io.bisq.generated.protobuffer.PB;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
diff --git a/core/src/main/java/io/bisq/core/dao/blockchain/vo/TxIdIndexTuple.java b/core/src/main/java/io/bisq/core/dao/blockchain/vo/util/TxIdIndexTuple.java
similarity index 97%
rename from core/src/main/java/io/bisq/core/dao/blockchain/vo/TxIdIndexTuple.java
rename to core/src/main/java/io/bisq/core/dao/blockchain/vo/util/TxIdIndexTuple.java
index 5021188d11..8c399eac18 100644
--- a/core/src/main/java/io/bisq/core/dao/blockchain/vo/TxIdIndexTuple.java
+++ b/core/src/main/java/io/bisq/core/dao/blockchain/vo/util/TxIdIndexTuple.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bisq.core.dao.blockchain.vo;
+package io.bisq.core.dao.blockchain.vo.util;
 
 import io.bisq.common.proto.persistable.PersistablePayload;
 import io.bisq.generated.protobuffer.PB;
diff --git a/core/src/test/java/io/bisq/core/dao/node/full/FullNodeParserTest.java b/core/src/test/java/io/bisq/core/dao/node/full/FullNodeParserTest.java
index 892cb48cda..8dff5eff2a 100644
--- a/core/src/test/java/io/bisq/core/dao/node/full/FullNodeParserTest.java
+++ b/core/src/test/java/io/bisq/core/dao/node/full/FullNodeParserTest.java
@@ -8,9 +8,9 @@ import io.bisq.core.dao.blockchain.BsqBlockChain;
 import io.bisq.core.dao.blockchain.exceptions.BlockNotConnectingException;
 import io.bisq.core.dao.blockchain.exceptions.BsqBlockchainException;
 import io.bisq.core.dao.blockchain.vo.Tx;
-import io.bisq.core.dao.blockchain.vo.TxIdIndexTuple;
 import io.bisq.core.dao.blockchain.vo.TxInput;
 import io.bisq.core.dao.blockchain.vo.TxOutput;
+import io.bisq.core.dao.blockchain.vo.util.TxIdIndexTuple;
 import io.bisq.core.dao.node.consensus.BsqTxVerification;
 import io.bisq.core.dao.node.consensus.IssuanceVerification;
 import io.bisq.core.dao.node.consensus.OpReturnVerification;