diff --git a/core/src/main/java/bisq/core/offer/OpenOfferManager.java b/core/src/main/java/bisq/core/offer/OpenOfferManager.java
index 9a80e1ead4..822889af2b 100644
--- a/core/src/main/java/bisq/core/offer/OpenOfferManager.java
+++ b/core/src/main/java/bisq/core/offer/OpenOfferManager.java
@@ -25,6 +25,7 @@ import bisq.core.dao.DaoFacade;
 import bisq.core.exceptions.TradePriceOutOfToleranceException;
 import bisq.core.filter.FilterManager;
 import bisq.core.locale.Res;
+import bisq.core.offer.availability.AvailabilityResult;
 import bisq.core.offer.availability.DisputeAgentSelection;
 import bisq.core.offer.bisq_v1.CreateOfferService;
 import bisq.core.offer.bisq_v1.MarketPriceNotAvailableException;
diff --git a/core/src/main/java/bisq/core/offer/AvailabilityResult.java b/core/src/main/java/bisq/core/offer/availability/AvailabilityResult.java
similarity index 98%
rename from core/src/main/java/bisq/core/offer/AvailabilityResult.java
rename to core/src/main/java/bisq/core/offer/availability/AvailabilityResult.java
index e4ad982163..abf3bd33cf 100644
--- a/core/src/main/java/bisq/core/offer/AvailabilityResult.java
+++ b/core/src/main/java/bisq/core/offer/availability/AvailabilityResult.java
@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.core.offer;
+package bisq.core.offer.availability;
 
 public enum AvailabilityResult {
     UNKNOWN_FAILURE("cannot take offer for unknown reason"),
diff --git a/core/src/main/java/bisq/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java b/core/src/main/java/bisq/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java
index f6c04fa198..df65f6e08b 100644
--- a/core/src/main/java/bisq/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java
+++ b/core/src/main/java/bisq/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java
@@ -17,8 +17,8 @@
 
 package bisq.core.offer.availability.tasks;
 
-import bisq.core.offer.AvailabilityResult;
 import bisq.core.offer.Offer;
+import bisq.core.offer.availability.AvailabilityResult;
 import bisq.core.offer.availability.DisputeAgentSelection;
 import bisq.core.offer.availability.OfferAvailabilityModel;
 import bisq.core.offer.messages.OfferAvailabilityResponse;
diff --git a/core/src/main/java/bisq/core/offer/messages/OfferAvailabilityResponse.java b/core/src/main/java/bisq/core/offer/messages/OfferAvailabilityResponse.java
index 41b5aa0fcc..e67e4bd8ba 100644
--- a/core/src/main/java/bisq/core/offer/messages/OfferAvailabilityResponse.java
+++ b/core/src/main/java/bisq/core/offer/messages/OfferAvailabilityResponse.java
@@ -18,7 +18,7 @@
 package bisq.core.offer.messages;
 
 
-import bisq.core.offer.AvailabilityResult;
+import bisq.core.offer.availability.AvailabilityResult;
 
 import bisq.network.p2p.NodeAddress;
 import bisq.network.p2p.SupportedCapabilitiesMessage;
diff --git a/core/src/main/java/bisq/core/proto/ProtoDevUtil.java b/core/src/main/java/bisq/core/proto/ProtoDevUtil.java
index 84f030c805..0be233fe9d 100644
--- a/core/src/main/java/bisq/core/proto/ProtoDevUtil.java
+++ b/core/src/main/java/bisq/core/proto/ProtoDevUtil.java
@@ -18,9 +18,9 @@
 package bisq.core.proto;
 
 import bisq.core.btc.model.AddressEntry;
-import bisq.core.offer.AvailabilityResult;
 import bisq.core.offer.Offer;
 import bisq.core.offer.OpenOffer;
+import bisq.core.offer.availability.AvailabilityResult;
 import bisq.core.offer.bisq_v1.OfferPayload;
 import bisq.core.support.dispute.DisputeResult;
 import bisq.core.trade.Trade;
diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcErrorMessageHandler.java b/daemon/src/main/java/bisq/daemon/grpc/GrpcErrorMessageHandler.java
index 4c139e1709..d5e33036ea 100644
--- a/daemon/src/main/java/bisq/daemon/grpc/GrpcErrorMessageHandler.java
+++ b/daemon/src/main/java/bisq/daemon/grpc/GrpcErrorMessageHandler.java
@@ -134,7 +134,7 @@ public class GrpcErrorMessageHandler implements ErrorMessageHandler {
     }
 
     private String getAvailabilityResultDescription(AvailabilityResult proto) {
-        return bisq.core.offer.AvailabilityResult.fromProto(proto).description();
+        return bisq.core.offer.availability.AvailabilityResult.fromProto(proto).description();
     }
 
     private boolean takeOfferWasCalled() {