diff --git a/blockbuster/abci/abci_test.go b/blockbuster/abci/abci_test.go
index 3724523..668a5fd 100644
--- a/blockbuster/abci/abci_test.go
+++ b/blockbuster/abci/abci_test.go
@@ -14,10 +14,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/testutil"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/skip-mev/pob/blockbuster"
+	"github.com/skip-mev/pob/blockbuster/abci"
 	"github.com/skip-mev/pob/blockbuster/lanes/auction"
 	"github.com/skip-mev/pob/blockbuster/lanes/base"
 	"github.com/skip-mev/pob/blockbuster/lanes/free"
-	"github.com/skip-mev/pob/blockbuster/proposals"
 	testutils "github.com/skip-mev/pob/testutils"
 	"github.com/stretchr/testify/suite"
 )
@@ -449,7 +449,7 @@ func (s *ProposalsTestSuite) TestPrepareProposalEdgeCases() {
 		})
 		s.Require().NoError(defaultLane.Insert(sdk.Context{}, tx))
 
-		proposalHandler := proposals.NewProposalHandler(
+		proposalHandler := abci.NewProposalHandler(
 			log.NewTestLogger(s.T()),
 			s.encodingConfig.TxConfig.TxDecoder(),
 			[]blockbuster.Lane{panicLane, defaultLane},
@@ -482,7 +482,7 @@ func (s *ProposalsTestSuite) TestPrepareProposalEdgeCases() {
 		})
 		s.Require().NoError(defaultLane.Insert(sdk.Context{}, tx))
 
-		proposalHandler := proposals.NewProposalHandler(
+		proposalHandler := abci.NewProposalHandler(
 			log.NewTestLogger(s.T()),
 			s.encodingConfig.TxConfig.TxDecoder(),
 			[]blockbuster.Lane{defaultLane, panicLane},
@@ -516,7 +516,7 @@ func (s *ProposalsTestSuite) TestPrepareProposalEdgeCases() {
 		})
 		s.Require().NoError(defaultLane.Insert(sdk.Context{}, tx))
 
-		proposalHandler := proposals.NewProposalHandler(
+		proposalHandler := abci.NewProposalHandler(
 			log.NewTestLogger(s.T()),
 			s.encodingConfig.TxConfig.TxDecoder(),
 			[]blockbuster.Lane{panicLane, panicLane2, defaultLane},
@@ -550,7 +550,7 @@ func (s *ProposalsTestSuite) TestPrepareProposalEdgeCases() {
 		})
 		s.Require().NoError(defaultLane.Insert(sdk.Context{}, tx))
 
-		proposalHandler := proposals.NewProposalHandler(
+		proposalHandler := abci.NewProposalHandler(
 			log.NewTestLogger(s.T()),
 			s.encodingConfig.TxConfig.TxDecoder(),
 			[]blockbuster.Lane{defaultLane, panicLane, panicLane2},
@@ -780,10 +780,10 @@ func (s *ProposalsTestSuite) setUpPanicLane(maxBlockSpace math.LegacyDec) *block
 	return lane
 }
 
-func (s *ProposalsTestSuite) setUpProposalHandlers(lanes []blockbuster.Lane) *proposals.ProposalHandler {
+func (s *ProposalsTestSuite) setUpProposalHandlers(lanes []blockbuster.Lane) *abci.ProposalHandler {
 	mempool := blockbuster.NewMempool(log.NewTestLogger(s.T()), true, lanes...)
 
-	return proposals.NewProposalHandler(
+	return abci.NewProposalHandler(
 		log.NewTestLogger(s.T()),
 		s.encodingConfig.TxConfig.TxDecoder(),
 		mempool.Registry(),
diff --git a/tests/app/app.go b/tests/app/app.go
index 774d592..ad83577 100644
--- a/tests/app/app.go
+++ b/tests/app/app.go
@@ -62,10 +62,10 @@ import (
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 
 	"github.com/skip-mev/pob/blockbuster"
+	"github.com/skip-mev/pob/blockbuster/abci"
 	"github.com/skip-mev/pob/blockbuster/lanes/auction"
 	"github.com/skip-mev/pob/blockbuster/lanes/base"
 	"github.com/skip-mev/pob/blockbuster/lanes/free"
-	"github.com/skip-mev/pob/blockbuster/proposals"
 	buildermodule "github.com/skip-mev/pob/x/builder"
 	builderkeeper "github.com/skip-mev/pob/x/builder/keeper"
 )
@@ -139,7 +139,7 @@ type TestApp struct {
 	FeeGrantKeeper        feegrantkeeper.Keeper
 
 	// custom checkTx handler
-	checkTxHandler proposals.CheckTx
+	checkTxHandler abci.CheckTx
 }
 
 func init() {
@@ -333,8 +333,8 @@ func New(
 	}
 	app.App.SetAnteHandler(anteHandler)
 
-	// Set the proposal handlers on base app
-	proposalHandler := proposals.NewProposalHandler(
+	// Set the abci handlers on base app
+	proposalHandler := abci.NewProposalHandler(
 		app.Logger(),
 		app.TxConfig().TxDecoder(),
 		lanes,
@@ -343,7 +343,7 @@ func New(
 	app.App.SetProcessProposal(proposalHandler.ProcessProposalHandler())
 
 	// Set the custom CheckTx handler on BaseApp.
-	checkTxHandler := proposals.NewCheckTxHandler(
+	checkTxHandler := abci.NewCheckTxHandler(
 		app.App,
 		app.txConfig.TxDecoder(),
 		tobLane,
@@ -392,7 +392,7 @@ func (app *TestApp) CheckTx(req *cometabci.RequestCheckTx) (*cometabci.ResponseC
 }
 
 // SetCheckTx sets the checkTxHandler for the app.
-func (app *TestApp) SetCheckTx(handler proposals.CheckTx) {
+func (app *TestApp) SetCheckTx(handler abci.CheckTx) {
 	app.checkTxHandler = handler
 }