diff --git a/src/main/java/bisq/desktop/main/dao/proposal/BaseProposalView.java b/src/main/java/bisq/desktop/main/dao/proposal/BaseProposalView.java
index de5a079e7a..d97a3f39b4 100644
--- a/src/main/java/bisq/desktop/main/dao/proposal/BaseProposalView.java
+++ b/src/main/java/bisq/desktop/main/dao/proposal/BaseProposalView.java
@@ -28,10 +28,10 @@ import bisq.desktop.util.BsqFormatter;
 
 import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.dao.consensus.period.Phase;
-import bisq.core.dao.consensus.vote.proposal.Ballot;
-import bisq.core.dao.consensus.vote.proposal.Proposal;
-import bisq.core.dao.consensus.vote.proposal.ProposalService;
-import bisq.core.dao.consensus.vote.proposal.param.ChangeParamService;
+import bisq.core.dao.consensus.proposal.Ballot;
+import bisq.core.dao.consensus.proposal.Proposal;
+import bisq.core.dao.consensus.proposal.ProposalService;
+import bisq.core.dao.consensus.proposal.param.ChangeParamService;
 import bisq.core.dao.presentation.period.PeriodServiceFacade;
 import bisq.core.dao.presentation.proposal.MyProposalService;
 import bisq.core.dao.presentation.proposal.ProposalListService;
diff --git a/src/main/java/bisq/desktop/main/dao/proposal/ProposalDetailsWindow.java b/src/main/java/bisq/desktop/main/dao/proposal/ProposalDetailsWindow.java
index 820449f4e3..992e582858 100644
--- a/src/main/java/bisq/desktop/main/dao/proposal/ProposalDetailsWindow.java
+++ b/src/main/java/bisq/desktop/main/dao/proposal/ProposalDetailsWindow.java
@@ -22,7 +22,7 @@ import bisq.desktop.util.BsqFormatter;
 import bisq.desktop.util.Layout;
 
 import bisq.core.btc.wallet.BsqWalletService;
-import bisq.core.dao.consensus.vote.proposal.Proposal;
+import bisq.core.dao.consensus.proposal.Proposal;
 import bisq.core.locale.Res;
 
 import javafx.geometry.Insets;
diff --git a/src/main/java/bisq/desktop/main/dao/proposal/ProposalDisplay.java b/src/main/java/bisq/desktop/main/dao/proposal/ProposalDisplay.java
index 463bca1508..00635b0dc0 100644
--- a/src/main/java/bisq/desktop/main/dao/proposal/ProposalDisplay.java
+++ b/src/main/java/bisq/desktop/main/dao/proposal/ProposalDisplay.java
@@ -28,11 +28,11 @@ import bisq.desktop.util.validation.BsqAddressValidator;
 import bisq.desktop.util.validation.BsqValidator;
 
 import bisq.core.btc.wallet.BsqWalletService;
-import bisq.core.dao.consensus.vote.proposal.Proposal;
-import bisq.core.dao.consensus.vote.proposal.ProposalConsensus;
-import bisq.core.dao.consensus.vote.proposal.ProposalType;
-import bisq.core.dao.consensus.vote.proposal.compensation.CompensationConsensus;
-import bisq.core.dao.consensus.vote.proposal.compensation.CompensationProposal;
+import bisq.core.dao.consensus.proposal.Proposal;
+import bisq.core.dao.consensus.proposal.ProposalConsensus;
+import bisq.core.dao.consensus.proposal.ProposalType;
+import bisq.core.dao.consensus.proposal.compensation.CompensationConsensus;
+import bisq.core.dao.consensus.proposal.compensation.CompensationProposal;
 import bisq.core.locale.Res;
 import bisq.core.provider.fee.FeeService;
 
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 6f390ac788..5b077546c5 100644
--- a/src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java
+++ b/src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java
@@ -24,13 +24,13 @@ import bisq.desktop.util.BsqFormatter;
 import bisq.core.btc.listeners.TxConfidenceListener;
 import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.dao.consensus.period.Phase;
+import bisq.core.dao.consensus.proposal.Ballot;
+import bisq.core.dao.consensus.proposal.ProposalService;
 import bisq.core.dao.consensus.state.Block;
 import bisq.core.dao.consensus.state.BlockListener;
 import bisq.core.dao.consensus.state.blockchain.Tx;
 import bisq.core.dao.consensus.vote.BooleanVote;
 import bisq.core.dao.consensus.vote.Vote;
-import bisq.core.dao.consensus.vote.proposal.Ballot;
-import bisq.core.dao.consensus.vote.proposal.ProposalService;
 import bisq.core.dao.presentation.period.PeriodServiceFacade;
 import bisq.core.dao.presentation.proposal.MyProposalService;
 import bisq.core.dao.presentation.state.StateServiceFacade;
diff --git a/src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java b/src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java
index 60a7f26082..40ca2068c3 100644
--- a/src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java
+++ b/src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java
@@ -33,12 +33,12 @@ import bisq.core.btc.exceptions.TransactionVerificationException;
 import bisq.core.btc.exceptions.WalletException;
 import bisq.core.btc.wallet.BsqBalanceListener;
 import bisq.core.btc.wallet.BsqWalletService;
+import bisq.core.dao.consensus.blindvote.BlindVoteConsensus;
 import bisq.core.dao.consensus.period.Phase;
+import bisq.core.dao.consensus.proposal.Ballot;
+import bisq.core.dao.consensus.proposal.ProposalService;
+import bisq.core.dao.consensus.proposal.param.ChangeParamService;
 import bisq.core.dao.consensus.vote.BooleanVote;
-import bisq.core.dao.consensus.vote.blindvote.BlindVoteConsensus;
-import bisq.core.dao.consensus.vote.proposal.Ballot;
-import bisq.core.dao.consensus.vote.proposal.ProposalService;
-import bisq.core.dao.consensus.vote.proposal.param.ChangeParamService;
 import bisq.core.dao.presentation.myvote.MyVoteService;
 import bisq.core.dao.presentation.period.PeriodServiceFacade;
 import bisq.core.dao.presentation.proposal.MyProposalService;
diff --git a/src/main/java/bisq/desktop/main/dao/proposal/closed/ClosedProposalsView.java b/src/main/java/bisq/desktop/main/dao/proposal/closed/ClosedProposalsView.java
index 29ccac0e11..e61dd72221 100644
--- a/src/main/java/bisq/desktop/main/dao/proposal/closed/ClosedProposalsView.java
+++ b/src/main/java/bisq/desktop/main/dao/proposal/closed/ClosedProposalsView.java
@@ -23,8 +23,8 @@ import bisq.desktop.util.BSFormatter;
 import bisq.desktop.util.BsqFormatter;
 
 import bisq.core.btc.wallet.BsqWalletService;
-import bisq.core.dao.consensus.vote.proposal.ProposalService;
-import bisq.core.dao.consensus.vote.proposal.param.ChangeParamService;
+import bisq.core.dao.consensus.proposal.ProposalService;
+import bisq.core.dao.consensus.proposal.param.ChangeParamService;
 import bisq.core.dao.presentation.period.PeriodServiceFacade;
 import bisq.core.dao.presentation.proposal.MyProposalService;
 import bisq.core.dao.presentation.proposal.ProposalListService;
diff --git a/src/main/java/bisq/desktop/main/dao/proposal/make/MakeProposalView.java b/src/main/java/bisq/desktop/main/dao/proposal/make/MakeProposalView.java
index af0847db5e..a1940b8e15 100644
--- a/src/main/java/bisq/desktop/main/dao/proposal/make/MakeProposalView.java
+++ b/src/main/java/bisq/desktop/main/dao/proposal/make/MakeProposalView.java
@@ -32,12 +32,12 @@ import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.btc.wallet.InsufficientBsqException;
 import bisq.core.btc.wallet.WalletsSetup;
 import bisq.core.dao.ValidationException;
-import bisq.core.dao.consensus.vote.proposal.Ballot;
-import bisq.core.dao.consensus.vote.proposal.ProposalConsensus;
-import bisq.core.dao.consensus.vote.proposal.ProposalType;
-import bisq.core.dao.consensus.vote.proposal.compensation.CompensationService;
-import bisq.core.dao.consensus.vote.proposal.generic.GenericProposalService;
-import bisq.core.dao.consensus.vote.proposal.param.ChangeParamService;
+import bisq.core.dao.consensus.proposal.Ballot;
+import bisq.core.dao.consensus.proposal.ProposalConsensus;
+import bisq.core.dao.consensus.proposal.ProposalType;
+import bisq.core.dao.consensus.proposal.compensation.CompensationService;
+import bisq.core.dao.consensus.proposal.generic.GenericProposalService;
+import bisq.core.dao.consensus.proposal.param.ChangeParamService;
 import bisq.core.dao.presentation.proposal.MyProposalService;
 import bisq.core.dao.presentation.state.StateServiceFacade;
 import bisq.core.locale.Res;
diff --git a/src/main/java/bisq/desktop/main/dao/proposal/myvotes/MyVotesView.java b/src/main/java/bisq/desktop/main/dao/proposal/myvotes/MyVotesView.java
index 62f3363814..d322615d32 100644
--- a/src/main/java/bisq/desktop/main/dao/proposal/myvotes/MyVotesView.java
+++ b/src/main/java/bisq/desktop/main/dao/proposal/myvotes/MyVotesView.java
@@ -30,11 +30,11 @@ import bisq.desktop.util.GUIUtil;
 import bisq.desktop.util.Layout;
 
 import bisq.core.btc.wallet.BsqWalletService;
+import bisq.core.dao.consensus.proposal.BallotList;
+import bisq.core.dao.consensus.proposal.ProposalService;
+import bisq.core.dao.consensus.proposal.param.ChangeParamService;
 import bisq.core.dao.consensus.vote.BooleanVote;
 import bisq.core.dao.consensus.vote.Vote;
-import bisq.core.dao.consensus.vote.proposal.BallotList;
-import bisq.core.dao.consensus.vote.proposal.ProposalService;
-import bisq.core.dao.consensus.vote.proposal.param.ChangeParamService;
 import bisq.core.dao.presentation.myvote.MyVoteService;
 import bisq.core.dao.presentation.period.PeriodServiceFacade;
 import bisq.core.dao.presentation.proposal.MyProposalService;