diff --git a/core/src/main/java/bisq/core/offer/OpenOfferManager.java b/core/src/main/java/bisq/core/offer/OpenOfferManager.java
index 60a14a3d5b..7f3ae7a021 100644
--- a/core/src/main/java/bisq/core/offer/OpenOfferManager.java
+++ b/core/src/main/java/bisq/core/offer/OpenOfferManager.java
@@ -32,8 +32,8 @@ import bisq.core.offer.availability.messages.OfferAvailabilityResponse;
 import bisq.core.offer.bisq_v1.CreateOfferService;
 import bisq.core.offer.bisq_v1.MarketPriceNotAvailableException;
 import bisq.core.offer.bisq_v1.OfferPayload;
-import bisq.core.offer.placeoffer.PlaceOfferModel;
-import bisq.core.offer.placeoffer.PlaceOfferProtocol;
+import bisq.core.offer.placeoffer.bisq_v1.PlaceOfferModel;
+import bisq.core.offer.placeoffer.bisq_v1.PlaceOfferProtocol;
 import bisq.core.provider.price.PriceFeedService;
 import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
 import bisq.core.support.dispute.mediation.mediator.MediatorManager;
diff --git a/core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferModel.java b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/PlaceOfferModel.java
similarity index 98%
rename from core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferModel.java
rename to core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/PlaceOfferModel.java
index 0c54d733ed..e90e4dcc00 100644
--- a/core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferModel.java
+++ b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/PlaceOfferModel.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.core.offer.placeoffer;
+package bisq.core.offer.placeoffer.bisq_v1;
 
 import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.btc.wallet.BtcWalletService;
diff --git a/core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferProtocol.java b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/PlaceOfferProtocol.java
similarity index 91%
rename from core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferProtocol.java
rename to core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/PlaceOfferProtocol.java
index cdf394435f..8850d36078 100644
--- a/core/src/main/java/bisq/core/offer/placeoffer/PlaceOfferProtocol.java
+++ b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/PlaceOfferProtocol.java
@@ -15,12 +15,12 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.core.offer.placeoffer;
+package bisq.core.offer.placeoffer.bisq_v1;
 
-import bisq.core.offer.placeoffer.tasks.AddToOfferBook;
-import bisq.core.offer.placeoffer.tasks.CheckNumberOfUnconfirmedTransactions;
-import bisq.core.offer.placeoffer.tasks.CreateMakerFeeTx;
-import bisq.core.offer.placeoffer.tasks.ValidateOffer;
+import bisq.core.offer.placeoffer.bisq_v1.tasks.AddToOfferBook;
+import bisq.core.offer.placeoffer.bisq_v1.tasks.CheckNumberOfUnconfirmedTransactions;
+import bisq.core.offer.placeoffer.bisq_v1.tasks.CreateMakerFeeTx;
+import bisq.core.offer.placeoffer.bisq_v1.tasks.ValidateOffer;
 import bisq.core.trade.handlers.TransactionResultHandler;
 
 import bisq.common.handlers.ErrorMessageHandler;
diff --git a/core/src/main/java/bisq/core/offer/placeoffer/tasks/AddToOfferBook.java b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/AddToOfferBook.java
similarity index 94%
rename from core/src/main/java/bisq/core/offer/placeoffer/tasks/AddToOfferBook.java
rename to core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/AddToOfferBook.java
index 16def612ba..f9314ef31b 100644
--- a/core/src/main/java/bisq/core/offer/placeoffer/tasks/AddToOfferBook.java
+++ b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/AddToOfferBook.java
@@ -15,9 +15,9 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.core.offer.placeoffer.tasks;
+package bisq.core.offer.placeoffer.bisq_v1.tasks;
 
-import bisq.core.offer.placeoffer.PlaceOfferModel;
+import bisq.core.offer.placeoffer.bisq_v1.PlaceOfferModel;
 
 import bisq.common.taskrunner.Task;
 import bisq.common.taskrunner.TaskRunner;
diff --git a/core/src/main/java/bisq/core/offer/placeoffer/tasks/CheckNumberOfUnconfirmedTransactions.java b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/CheckNumberOfUnconfirmedTransactions.java
similarity index 85%
rename from core/src/main/java/bisq/core/offer/placeoffer/tasks/CheckNumberOfUnconfirmedTransactions.java
rename to core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/CheckNumberOfUnconfirmedTransactions.java
index 31e8d30003..689ad265c1 100644
--- a/core/src/main/java/bisq/core/offer/placeoffer/tasks/CheckNumberOfUnconfirmedTransactions.java
+++ b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/CheckNumberOfUnconfirmedTransactions.java
@@ -1,7 +1,7 @@
-package bisq.core.offer.placeoffer.tasks;
+package bisq.core.offer.placeoffer.bisq_v1.tasks;
 
 import bisq.core.locale.Res;
-import bisq.core.offer.placeoffer.PlaceOfferModel;
+import bisq.core.offer.placeoffer.bisq_v1.PlaceOfferModel;
 
 import bisq.common.taskrunner.Task;
 import bisq.common.taskrunner.TaskRunner;
diff --git a/core/src/main/java/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/CreateMakerFeeTx.java
similarity index 98%
rename from core/src/main/java/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java
rename to core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/CreateMakerFeeTx.java
index df69713431..3f7639550a 100644
--- a/core/src/main/java/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java
+++ b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/CreateMakerFeeTx.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.core.offer.placeoffer.tasks;
+package bisq.core.offer.placeoffer.bisq_v1.tasks;
 
 import bisq.core.btc.exceptions.TxBroadcastException;
 import bisq.core.btc.model.AddressEntry;
@@ -27,7 +27,7 @@ import bisq.core.btc.wallet.WalletService;
 import bisq.core.dao.exceptions.DaoDisabledException;
 import bisq.core.dao.state.model.blockchain.TxType;
 import bisq.core.offer.Offer;
-import bisq.core.offer.placeoffer.PlaceOfferModel;
+import bisq.core.offer.placeoffer.bisq_v1.PlaceOfferModel;
 import bisq.core.util.FeeReceiverSelector;
 
 import bisq.common.UserThread;
diff --git a/core/src/main/java/bisq/core/offer/placeoffer/tasks/ValidateOffer.java b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/ValidateOffer.java
similarity index 98%
rename from core/src/main/java/bisq/core/offer/placeoffer/tasks/ValidateOffer.java
rename to core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/ValidateOffer.java
index 35d619feb4..defa4c4811 100644
--- a/core/src/main/java/bisq/core/offer/placeoffer/tasks/ValidateOffer.java
+++ b/core/src/main/java/bisq/core/offer/placeoffer/bisq_v1/tasks/ValidateOffer.java
@@ -15,10 +15,10 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.core.offer.placeoffer.tasks;
+package bisq.core.offer.placeoffer.bisq_v1.tasks;
 
 import bisq.core.offer.Offer;
-import bisq.core.offer.placeoffer.PlaceOfferModel;
+import bisq.core.offer.placeoffer.bisq_v1.PlaceOfferModel;
 import bisq.core.trade.messages.TradeMessage;
 
 import bisq.common.taskrunner.Task;
diff --git a/desktop/src/main/java/bisq/desktop/main/debug/DebugView.java b/desktop/src/main/java/bisq/desktop/main/debug/DebugView.java
index 89d0acbf09..09744ac208 100644
--- a/desktop/src/main/java/bisq/desktop/main/debug/DebugView.java
+++ b/desktop/src/main/java/bisq/desktop/main/debug/DebugView.java
@@ -23,9 +23,9 @@ import bisq.desktop.components.TitledGroupBg;
 
 import bisq.core.offer.availability.tasks.ProcessOfferAvailabilityResponse;
 import bisq.core.offer.availability.tasks.SendOfferAvailabilityRequest;
-import bisq.core.offer.placeoffer.tasks.AddToOfferBook;
-import bisq.core.offer.placeoffer.tasks.CreateMakerFeeTx;
-import bisq.core.offer.placeoffer.tasks.ValidateOffer;
+import bisq.core.offer.placeoffer.bisq_v1.tasks.AddToOfferBook;
+import bisq.core.offer.placeoffer.bisq_v1.tasks.CreateMakerFeeTx;
+import bisq.core.offer.placeoffer.bisq_v1.tasks.ValidateOffer;
 import bisq.core.trade.protocol.tasks.ApplyFilter;
 import bisq.core.trade.protocol.tasks.VerifyPeersAccountAgeWitness;
 import bisq.core.trade.protocol.tasks.buyer.BuyerProcessDelayedPayoutTxSignatureRequest;