diff --git a/src/main/java/io/bitsquare/msg/MessageFacade.java b/src/main/java/io/bitsquare/msg/MessageFacade.java
index 70a08b6fc8..07a6de46ac 100644
--- a/src/main/java/io/bitsquare/msg/MessageFacade.java
+++ b/src/main/java/io/bitsquare/msg/MessageFacade.java
@@ -4,6 +4,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.inject.name.Named;
 import io.bitsquare.msg.listeners.*;
 import io.bitsquare.trade.Offer;
+import io.bitsquare.trade.protocol.TradeMessage;
 import io.bitsquare.user.Arbitrator;
 import io.bitsquare.user.User;
 import java.io.IOException;
diff --git a/src/main/java/io/bitsquare/msg/listeners/IncomingTradeMessageListener.java b/src/main/java/io/bitsquare/msg/listeners/IncomingTradeMessageListener.java
index e85fee55cd..8352107be8 100644
--- a/src/main/java/io/bitsquare/msg/listeners/IncomingTradeMessageListener.java
+++ b/src/main/java/io/bitsquare/msg/listeners/IncomingTradeMessageListener.java
@@ -1,6 +1,6 @@
 package io.bitsquare.msg.listeners;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import net.tomp2p.peers.PeerAddress;
 
 public interface IncomingTradeMessageListener
diff --git a/src/main/java/io/bitsquare/trade/Trading.java b/src/main/java/io/bitsquare/trade/Trading.java
index d0b4146847..caa8cffd85 100644
--- a/src/main/java/io/bitsquare/trade/Trading.java
+++ b/src/main/java/io/bitsquare/trade/Trading.java
@@ -8,9 +8,9 @@ import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.crypto.CryptoFacade;
 import io.bitsquare.gui.popups.Popups;
 import io.bitsquare.msg.MessageFacade;
-import io.bitsquare.msg.TradeMessage;
 import io.bitsquare.msg.listeners.TakeOfferRequestListener;
 import io.bitsquare.storage.Storage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import io.bitsquare.trade.protocol.offerer.*;
 import io.bitsquare.trade.protocol.taker.*;
 import io.bitsquare.user.User;
diff --git a/src/main/java/io/bitsquare/msg/TradeMessage.java b/src/main/java/io/bitsquare/trade/protocol/TradeMessage.java
similarity index 64%
rename from src/main/java/io/bitsquare/msg/TradeMessage.java
rename to src/main/java/io/bitsquare/trade/protocol/TradeMessage.java
index 82478e605f..2920070b2e 100644
--- a/src/main/java/io/bitsquare/msg/TradeMessage.java
+++ b/src/main/java/io/bitsquare/trade/protocol/TradeMessage.java
@@ -1,4 +1,4 @@
-package io.bitsquare.msg;
+package io.bitsquare.trade.protocol;
 
 public interface TradeMessage
 {
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/BankTransferInitedMessage.java b/src/main/java/io/bitsquare/trade/protocol/offerer/BankTransferInitedMessage.java
index 346dc45bc6..8f7a530050 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/BankTransferInitedMessage.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/BankTransferInitedMessage.java
@@ -1,6 +1,6 @@
 package io.bitsquare.trade.protocol.offerer;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 import java.math.BigInteger;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/DepositTxPublishedMessage.java b/src/main/java/io/bitsquare/trade/protocol/offerer/DepositTxPublishedMessage.java
index 198cf26182..636b452375 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/DepositTxPublishedMessage.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/DepositTxPublishedMessage.java
@@ -1,6 +1,6 @@
 package io.bitsquare.trade.protocol.offerer;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 
 public class DepositTxPublishedMessage implements Serializable, TradeMessage
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPaymentMessage.java b/src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPaymentMessage.java
index 69579b1ae8..4f04f3e241 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPaymentMessage.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/RequestTakerDepositPaymentMessage.java
@@ -1,7 +1,7 @@
 package io.bitsquare.trade.protocol.offerer;
 
 import io.bitsquare.bank.BankAccount;
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 
 public class RequestTakerDepositPaymentMessage implements Serializable, TradeMessage
diff --git a/src/main/java/io/bitsquare/trade/protocol/offerer/RespondToTakeOfferRequestMessage.java b/src/main/java/io/bitsquare/trade/protocol/offerer/RespondToTakeOfferRequestMessage.java
index 3636b7c7e2..b6c644782e 100644
--- a/src/main/java/io/bitsquare/trade/protocol/offerer/RespondToTakeOfferRequestMessage.java
+++ b/src/main/java/io/bitsquare/trade/protocol/offerer/RespondToTakeOfferRequestMessage.java
@@ -1,6 +1,6 @@
 package io.bitsquare.trade.protocol.offerer;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 
 public class RespondToTakeOfferRequestMessage implements Serializable, TradeMessage
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/PayoutTxPublishedMessage.java b/src/main/java/io/bitsquare/trade/protocol/taker/PayoutTxPublishedMessage.java
index b4c0bb39a3..c2f751c033 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/PayoutTxPublishedMessage.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/PayoutTxPublishedMessage.java
@@ -1,6 +1,6 @@
 package io.bitsquare.trade.protocol.taker;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 
 public class PayoutTxPublishedMessage implements Serializable, TradeMessage
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/RequestOffererPublishDepositTxMessage.java b/src/main/java/io/bitsquare/trade/protocol/taker/RequestOffererPublishDepositTxMessage.java
index 4eb1b3bba7..4ca1a1f65f 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/RequestOffererPublishDepositTxMessage.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/RequestOffererPublishDepositTxMessage.java
@@ -1,7 +1,7 @@
 package io.bitsquare.trade.protocol.taker;
 
 import io.bitsquare.bank.BankAccount;
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 import java.security.PublicKey;
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOfferMessage.java b/src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOfferMessage.java
index 6e7884468d..1a604f2d71 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOfferMessage.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/RequestTakeOfferMessage.java
@@ -1,6 +1,6 @@
 package io.bitsquare.trade.protocol.taker;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 
 public class RequestTakeOfferMessage implements Serializable, TradeMessage
diff --git a/src/main/java/io/bitsquare/trade/protocol/taker/TakeOfferFeePayedMessage.java b/src/main/java/io/bitsquare/trade/protocol/taker/TakeOfferFeePayedMessage.java
index 44a218d3c3..28a6f19524 100644
--- a/src/main/java/io/bitsquare/trade/protocol/taker/TakeOfferFeePayedMessage.java
+++ b/src/main/java/io/bitsquare/trade/protocol/taker/TakeOfferFeePayedMessage.java
@@ -1,6 +1,6 @@
 package io.bitsquare.trade.protocol.taker;
 
-import io.bitsquare.msg.TradeMessage;
+import io.bitsquare.trade.protocol.TradeMessage;
 import java.io.Serializable;
 import java.math.BigInteger;