diff --git a/src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java b/src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java
index a72c2aa344..36a6633c67 100644
--- a/src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java
+++ b/src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java
@@ -24,8 +24,8 @@ import bisq.desktop.util.BsqFormatter;
 import bisq.core.btc.listeners.TxConfidenceListener;
 import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.dao.state.StateService;
-import bisq.core.dao.state.blockchain.vo.BsqBlock;
-import bisq.core.dao.state.blockchain.vo.Tx;
+import bisq.core.dao.state.blockchain.BsqBlock;
+import bisq.core.dao.state.blockchain.Tx;
 import bisq.core.dao.vote.BooleanVote;
 import bisq.core.dao.vote.PeriodService;
 import bisq.core.dao.vote.Vote;
diff --git a/src/main/java/bisq/desktop/main/dao/proposal/myvotes/VoteListItem.java b/src/main/java/bisq/desktop/main/dao/proposal/myvotes/VoteListItem.java
index 5f49ed5cde..56005d28ae 100644
--- a/src/main/java/bisq/desktop/main/dao/proposal/myvotes/VoteListItem.java
+++ b/src/main/java/bisq/desktop/main/dao/proposal/myvotes/VoteListItem.java
@@ -23,9 +23,9 @@ import bisq.desktop.util.BsqFormatter;
 import bisq.core.btc.listeners.TxConfidenceListener;
 import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.dao.state.StateService;
-import bisq.core.dao.state.blockchain.vo.BsqBlock;
-import bisq.core.dao.state.blockchain.vo.Tx;
-import bisq.core.dao.state.blockchain.vo.TxOutput;
+import bisq.core.dao.state.blockchain.BsqBlock;
+import bisq.core.dao.state.blockchain.Tx;
+import bisq.core.dao.state.blockchain.TxOutput;
 import bisq.core.dao.vote.myvote.MyVote;
 import bisq.core.locale.Res;
 
diff --git a/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java b/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java
index 0b0a915941..fd06f4db7d 100644
--- a/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java
+++ b/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java
@@ -27,7 +27,7 @@ import bisq.desktop.util.GUIUtil;
 import bisq.desktop.util.Layout;
 
 import bisq.core.dao.state.StateService;
-import bisq.core.dao.state.blockchain.vo.BsqBlock;
+import bisq.core.dao.state.blockchain.BsqBlock;
 import bisq.core.locale.Res;
 import bisq.core.monetary.Altcoin;
 import bisq.core.monetary.Price;
diff --git a/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxListItem.java b/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxListItem.java
index a79bbe101f..ea3079cc0e 100644
--- a/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxListItem.java
+++ b/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxListItem.java
@@ -26,8 +26,8 @@ import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.btc.wallet.WalletService;
 import bisq.core.dao.state.StateService;
-import bisq.core.dao.state.blockchain.vo.Tx;
-import bisq.core.dao.state.blockchain.vo.TxType;
+import bisq.core.dao.state.blockchain.Tx;
+import bisq.core.dao.state.blockchain.TxType;
 import bisq.core.locale.Res;
 
 import org.bitcoinj.core.Coin;
diff --git a/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java b/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java
index b0bd32d645..74571804d4 100644
--- a/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java
+++ b/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java
@@ -33,9 +33,9 @@ import bisq.core.btc.wallet.BsqBalanceListener;
 import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.dao.state.StateService;
-import bisq.core.dao.state.blockchain.vo.BsqBlock;
-import bisq.core.dao.state.blockchain.vo.Tx;
-import bisq.core.dao.state.blockchain.vo.TxType;
+import bisq.core.dao.state.blockchain.BsqBlock;
+import bisq.core.dao.state.blockchain.Tx;
+import bisq.core.dao.state.blockchain.TxType;
 import bisq.core.locale.Res;
 import bisq.core.user.Preferences;
 
diff --git a/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java b/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java
index e950a13c97..f1bdd17577 100644
--- a/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java
+++ b/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java
@@ -27,7 +27,7 @@ import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.btc.wallet.WalletService;
 import bisq.core.dao.state.StateService;
-import bisq.core.dao.state.blockchain.vo.TxType;
+import bisq.core.dao.state.blockchain.TxType;
 import bisq.core.locale.Res;
 import bisq.core.offer.Offer;
 import bisq.core.offer.OpenOffer;